[DSC-648] Fix wrong import path and start to fix menu entries creation

atarix83 · atarix83 · commit 06a021073a73 · 2022-07-29T18:04:58.000+02:00
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -1,5 +1,5 @@
 import { APP_BASE_HREF, CommonModule, DOCUMENT } from '@angular/common';
-import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
+import { HTTP_INTERCEPTORS, HttpClientJsonpModule, HttpClientModule } from '@angular/common/http';
 import { APP_INITIALIZER, NgModule } from '@angular/core';
 import { AbstractControl } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
@@ -37,8 +37,8 @@ import { APP_CONFIG, AppConfig } from '../config/app-config.interface';
 import { NgxMaskModule } from 'ngx-mask';
 import { StoreDevModules } from '../config/store/devtools';
 import { RootModule } from './root.module';
-import { SocialComponent } from './social/social.component';
 import { NuMarkdownModule } from '@ng-util/markdown';
+import { FooterModule } from './footer/footer.module';
 
 export function getConfig() {
   return environment;
diff --git a/src/app/core/audit/audit-data.service.ts b/src/app/core/audit/audit-data.service.ts
@@ -12,14 +12,14 @@ import { dataService } from '../cache/builders/build-decorators';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { CoreState } from '../core.reducers';
+import { CoreState } from '../core-state.model';
 import { EPerson } from '../eperson/models/eperson.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { DataService } from '../data/data.service';
 import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
-import { FindListOptions } from '../data/request.models';
+import { FindListOptions } from '../data/find-list-options.model';
 import { RequestService } from '../data/request.service';
 import {
   getFirstSucceededRemoteDataPayload,
diff --git a/src/app/core/audit/model/audit.model.ts b/src/app/core/audit/model/audit.model.ts
@@ -1,4 +1,4 @@
-import { CacheableObject } from '../../cache/object-cache.reducer';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { HALLink } from '../../shared/hal-link.model';
 import { autoserialize, deserialize } from 'cerialize';
 import { AUDIT } from './audit.resource-type';
diff --git a/src/app/core/config/config.service.ts b/src/app/core/config/config.service.ts
@@ -15,7 +15,7 @@ import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { map } from 'rxjs/operators';
 import { CoreState } from '../core-state.model';
-import { FindListOptions } from '../data/request.models';
+import { FindListOptions } from '../data/find-list-options.model';
 import { PaginatedList } from '../data/paginated-list.model';
 
 class DataServiceImpl extends DataService<ConfigObject> {
diff --git a/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/attachment.component.spec.ts b/src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/rendering-types/attachment/attachment.component.spec.ts
@@ -9,7 +9,7 @@ import { BitstreamDataService } from '../../../../../../../core/data/bitstream-d
 import { RemoteData } from '../../../../../../../core/data/remote-data';
 import { Bitstream } from '../../../../../../../core/shared/bitstream.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../../../shared/remote-data.utils';
-import { FindListOptions } from '../../../../../../../core/data/request.models';
+import { FindListOptions } from '../../../../../../../core/data/find-list-options.model';
 import { FollowLinkConfig } from '../../../../../../../shared/utils/follow-link-config.model';
 import { PaginatedList } from '../../../../../../../core/data/paginated-list.model';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { combineLatest as observableCombineLatest, combineLatest, Observable } from 'rxjs';
+import { ActivatedRoute, ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { MenuID } from './shared/menu/menu-id.model';
 import { MenuState } from './shared/menu/menu-state.model';
 import { MenuItemType } from './shared/menu/menu-item-type.model';
@@ -12,7 +12,7 @@ import { RemoteData } from './core/data/remote-data';
 import { TextMenuItemModel } from './shared/menu/menu-item/models/text.model';
 import { BrowseService } from './core/browse/browse.service';
 import { MenuService } from './shared/menu/menu.service';
-import { filter, find, map, take } from 'rxjs/operators';
+import { filter, find, map, switchMap, take } from 'rxjs/operators';
 import { hasValue } from './shared/empty.util';
 import { FeatureID } from './core/data/feature-authorization/feature-id';
 import {
@@ -44,6 +44,7 @@ import {
   METADATA_IMPORT_SCRIPT_NAME,
   ScriptDataService
 } from './core/data/processes/script-data.service';
+import { environment } from '../environments/environment';
 
 /**
  * Creates all of the app's menus
@@ -52,7 +53,11 @@ import {
   providedIn: 'root'
 })
 export class MenuResolver implements Resolve<boolean> {
+
+  private activatedRouteLastChild: ActivatedRoute;
+
   constructor(
+    protected route: ActivatedRoute,
     protected menuService: MenuService,
     protected browseService: BrowseService,
     protected authorizationService: AuthorizationDataService,
@@ -65,7 +70,7 @@ export class MenuResolver implements Resolve<boolean> {
    * Initialize all menus
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
-    return combineLatest([
+    return observableCombineLatest([
       this.createPublicMenu$(),
       this.createAdminMenu$(),
     ]).pipe(
@@ -89,20 +94,25 @@ export class MenuResolver implements Resolve<boolean> {
    * Initialize all menu sections and items for {@link MenuID.PUBLIC}
    */
   createPublicMenu$(): Observable<boolean> {
-    const menuList: any[] = [
-      /* Communities & Collections tree */
-      {
-        id: `browse_global_communities_and_collections`,
-        active: false,
-        visible: true,
-        index: 0,
-        model: {
-          type: MenuItemType.LINK,
-          text: `menu.section.browse_global_communities_and_collections`,
-          link: `/community-list`
-        } as LinkMenuItemModel
-      }
-    ];
+    const menuList: any[] = [];
+
+    /* Communities & Collections tree */
+    const CommunityCollectionMenuItem = {
+      id: `browse_global_communities_and_collections`,
+      active: false,
+      visible: environment.layout.navbar.showCommunityCollection,
+      index: 0,
+      model: {
+        type: MenuItemType.LINK,
+        text: `menu.section.communities_and_collections`,
+        link: `/community-list`
+      } as LinkMenuItemModel
+    };
+
+    if (environment.layout.navbar.showCommunityCollection) {
+      menuList.push(CommunityCollectionMenuItem);
+    }
+
     // Read the different Browse-By types from config and add them to the browse menu
     this.browseService.getBrowseDefinitions()
       .pipe(getFirstCompletedRemoteData<PaginatedList<BrowseDefinition>>())
@@ -140,9 +150,79 @@ export class MenuResolver implements Resolve<boolean> {
         })));
       });
 
+    this.createStatisticsMenu();
     return this.waitForMenu$(MenuID.PUBLIC);
   }
 
+  createStatisticsMenu() {
+    this.activatedRouteLastChild = this.getActivatedRoute(this.route);
+    observableCombineLatest([
+      this.getAuthorizedUsageStatistics(),
+      this.getAuthorizedLoginStatistics(),
+      this.getAuthorizedWorkflowStatistics()
+    ]).pipe(take(1)).subscribe(([canViewUsage, canViewLogin, canViewWorkflow]) => {
+      const menuList = [];
+      if (canViewUsage || canViewLogin || canViewWorkflow) {
+        menuList.push(
+          {
+            id: 'statistics',
+            active: false,
+            visible: true,
+            index: 1,
+            model: {
+              type: MenuItemType.TEXT,
+              text: 'menu.section.statistics'
+            } as TextMenuItemModel,
+          }
+        );
+
+        if (canViewUsage) {
+          menuList.push({
+            id: 'statistics_site',
+            parentID: 'statistics',
+            active: false,
+            visible: true,
+            model: {
+              type: MenuItemType.LINK,
+              text: 'menu.section.statistics.site',
+              link: '/statistics'
+            } as LinkMenuItemModel
+          });
+        }
+
+        if (canViewLogin) {
+          menuList.push({
+            id: 'statistics_login',
+            parentID: 'statistics',
+            active: false,
+            visible: true,
+            model: {
+              type: MenuItemType.LINK,
+              text: 'menu.section.statistics.login',
+              link: '/statistics/login'
+            } as LinkMenuItemModel
+          });
+        }
+
+        if (canViewWorkflow) {
+          menuList.push({
+            id: 'statistics_workflow',
+            parentID: 'statistics',
+            active: false,
+            visible: true,
+            model: {
+              type: MenuItemType.LINK,
+              text: 'menu.section.statistics.workflow',
+              link: '/statistics/workflow'
+            } as LinkMenuItemModel
+          });
+        }
+      }
+      menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, Object.assign(menuSection, {
+        shouldPersistOnRouteChange: true
+      })));
+    });
+  }
   /**
    * Initialize all menu sections and items for {@link MenuID.ADMIN}
    */
@@ -161,7 +241,7 @@ export class MenuResolver implements Resolve<boolean> {
    * edit_community / edit_collection is only included if the current user is a Community or Collection admin
    */
   createMainMenuSections() {
-    combineLatest([
+    observableCombineLatest([
       this.authorizationService.isAuthorized(FeatureID.IsCollectionAdmin),
       this.authorizationService.isAuthorized(FeatureID.IsCommunityAdmin),
       this.authorizationService.isAuthorized(FeatureID.AdministratorOf)
@@ -652,4 +732,65 @@ export class MenuResolver implements Resolve<boolean> {
       })));
     });
   }
+
+  /**
+   *  Get activated route of the deepest activated route
+   */
+  getActivatedRoute(route) {
+    if (route.children.length > 0) {
+      return this.getActivatedRoute(route.firstChild);
+    } else {
+      return route;
+    }
+  }
+
+  /**
+   *  Checking authorization for Usage
+   */
+  getAuthorizedUsageStatistics() {
+    return this.activatedRouteLastChild.data.pipe(
+      switchMap((data) => {
+        return this.authorizationService.isAuthorized(FeatureID.CanViewUsageStatistics, this.getObjectUrl(data)).pipe(
+          map((canViewUsageStatistics: boolean) => {
+            return canViewUsageStatistics;
+          }));
+      })
+    );
+  }
+
+  /**
+   *  Checking authorization for Login
+   */
+  getAuthorizedLoginStatistics() {
+    return this.activatedRouteLastChild.data.pipe(
+      switchMap((data) => {
+        return this.authorizationService.isAuthorized(FeatureID.CanViewLoginStatistics, this.getObjectUrl(data)).pipe(
+          map((canViewLoginStatistics: boolean) => {
+            return canViewLoginStatistics;
+          }));
+      })
+    );
+  }
+
+  /**
+   *  Checking authorization for Workflow
+   */
+  getAuthorizedWorkflowStatistics() {
+    return this.activatedRouteLastChild.data.pipe(
+      switchMap((data) => {
+        return this.authorizationService.isAuthorized(FeatureID.CanViewWorkflowStatistics, this.getObjectUrl(data)).pipe(
+          map((canViewWorkflowStatistics: boolean) => {
+            return canViewWorkflowStatistics;
+          }));
+      })
+    );
+  }
+
+  /**
+   *  Get statistics route dso data
+   */
+  getObjectUrl(data) {
+    const object = data.site ? data.site : data.dso?.payload;
+    return object?._links?.self?.href;
+  }
 }
diff --git a/src/app/root.module.ts b/src/app/root.module.ts
@@ -42,6 +42,9 @@ import {
 } from './page-internal-server-error/page-internal-server-error.component';
 import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
 import { PageErrorComponent } from './page-error/page-error.component';
+import {
+  ProcessNotificationComponent
+} from './shared/notifications/process-notification/process-notification.component';
 
 const IMPORTS = [
   CommonModule,
@@ -70,6 +73,7 @@ const DECLARATIONS = [
   ThemedPageNotFoundComponent,
   NotificationComponent,
   NotificationsBoardComponent,
+  ProcessNotificationComponent,
   BreadcrumbsComponent,
   ThemedBreadcrumbsComponent,
   ForbiddenComponent,
diff --git a/src/app/shared/dso-selector/dso-selector/administered-collection-selector/administered-collection-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/administered-collection-selector/administered-collection-selector.component.spec.ts
@@ -11,7 +11,7 @@ import { createPaginatedList } from '../../../testing/utils.test';
 import { VarDirective } from '../../../utils/var.directive';
 import { AdministeredCollectionSelectorComponent } from './administered-collection-selector.component';
 import { NotificationsService } from '../../../notifications/notifications.service';
-import { FindListOptions } from '../../../../core/data/request.models';
+import { FindListOptions } from '../../../../core/data/find-list-options.model';
 
 describe('AdministeredCollectionSelectorComponent', () => {
   let component: AdministeredCollectionSelectorComponent;
diff --git a/src/app/shared/dso-selector/dso-selector/administered-collection-selector/administered-collection-selector.component.ts b/src/app/shared/dso-selector/dso-selector/administered-collection-selector/administered-collection-selector.component.ts
@@ -6,7 +6,7 @@ import { TranslateService } from '@ngx-translate/core';
 
 import { CollectionDataService } from '../../../../core/data/collection-data.service';
 import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model';
-import { FindListOptions } from '../../../../core/data/request.models';
+import { FindListOptions } from '../../../../core/data/find-list-options.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 import { SearchService } from '../../../../core/shared/search/search.service';
diff --git a/src/app/shared/dso-selector/modal-wrappers/claim-item-selector/claim-item-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/claim-item-selector/claim-item-selector.component.spec.ts
@@ -13,7 +13,7 @@ describe('ClaimItemSelectorComponent', () => {
   let fixture: ComponentFixture<ClaimItemSelectorComponent>;
 
   const profileClaimService = jasmine.createSpyObj('profileClaimService', {
-    search: of({ payload: {page: []}})
+    searchForSuggestions: of({ payload: {page: []}})
   });
 
   beforeEach(waitForAsync(() => {
diff --git a/src/app/shared/dso-selector/modal-wrappers/claim-item-selector/claim-item-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/claim-item-selector/claim-item-selector.component.ts
@@ -41,7 +41,7 @@ export class ClaimItemSelectorComponent extends DSOSelectorModalWrapperComponent
   }
 
   ngOnInit(): void {
-    this.profileClaimService.search(this.dso as EPerson).subscribe(
+    this.profileClaimService.searchForSuggestions(this.dso as EPerson).subscribe(
       (result) => this.listEntries$.next(result)
     );
   }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.spec.ts
@@ -67,7 +67,7 @@ import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic
 import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
 import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
 import { RelationshipService } from '../../../../core/data/relationship.service';
-import { DsDynamicRelationInlineGroupComponent } from './models/relation-inline-group/dynamic-relation-inline-group.components';import { RelationshipService } from '../../../../core/data/relationship.service';
+import { DsDynamicRelationInlineGroupComponent } from './models/relation-inline-group/dynamic-relation-inline-group.components';
 import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
 import { Store } from '@ngrx/store';
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker/date-picker.model.ts
@@ -6,12 +6,7 @@ import {
   DynamicFormControlRelation,
   serializable
 } from '@ng-dynamic-forms/core';
-import {BehaviorSubject, Subject} from 'rxjs';
-import {isEmpty, isNotUndefined} from '../../../../../empty.util';
-import {MetadataValue} from '../../../../../../core/shared/metadata.models';
-
 import { BehaviorSubject, Subject } from 'rxjs';
-
 import { isEmpty, isNotEmpty, isNotUndefined } from '../../../../../empty.util';
 import { MetadataValue } from '../../../../../../core/shared/metadata.models';
 
diff --git a/src/app/shared/form/builder/parsers/date-field-parser.ts b/src/app/shared/form/builder/parsers/date-field-parser.ts
@@ -1,6 +1,5 @@
 import { FieldParser } from './field-parser';
 import {
-  DynamicDsDateControlModelConfig,
   DynamicDsDatePickerModel,
   DynamicDsDatePickerModelConfig
 } from '../ds-dynamic-form-ui/models/date-picker/date-picker.model';
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -1,7 +1,7 @@
 import {Inject, InjectionToken} from '@angular/core';
 
 import { uniqueId } from 'lodash';
-import {DynamicFormControlLayout, DynamicFormControlRelation, MATCH_VISIBLE, OR_OPERATOR} from '@ng-dynamic-forms/core';
+import { DynamicFormControlLayout, DynamicFormControlRelation, MATCH_VISIBLE, OR_OPERATOR } from '@ng-dynamic-forms/core';
 
 import { hasValue, isEmpty, isNotEmpty, isNotNull, isNotUndefined } from '../../../empty.util';
 import { FormFieldModel } from '../models/form-field.model';
diff --git a/src/app/submission/objects/submission-section-object.model.ts b/src/app/submission/objects/submission-section-object.model.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { CacheableObject } from '../../cache/object-cache.reducer';`
	`1`	`+import { CacheableObject } from '../../cache/cacheable-object.model';`
`2`	`2`	`import { HALLink } from '../../shared/hal-link.model';`
`3`	`3`	`import { autoserialize, deserialize } from 'cerialize';`
`4`	`4`	`import { AUDIT } from './audit.resource-type';`