Merge pull request #697 from atmire/Refactor-registry-service-and-ass…

…ociated-models Refactor registry service and associated models
DSpace · Jun 25, 2020 · bb70591 · bb70591
2 parents 5cef15e + 4c1b589
commit bb70591
Show file tree

Hide file tree

Showing 36 changed files with 684 additions and 1,093 deletions.
diff --git a/src/app/+admin/admin-registries/admin-registries-routing.module.ts b/src/app/+admin/admin-registries/admin-registries-routing.module.ts
@@ -4,6 +4,7 @@ import { NgModule } from '@angular/core';
 import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
 import { URLCombiner } from '../../core/url-combiner/url-combiner';
 import { getRegistriesModulePath } from '../admin-routing.module';
+import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
 
 const BITSTREAMFORMATS_MODULE_PATH = 'bitstream-formats';
 
@@ -14,16 +15,28 @@ export function getBitstreamFormatsModulePath() {
 @NgModule({
   imports: [
     RouterModule.forChild([
-      {path: 'metadata', component: MetadataRegistryComponent, data: {title: 'admin.registries.metadata.title'}},
       {
-        path: 'metadata/:schemaName',
-        component: MetadataSchemaComponent,
-        data: {title: 'admin.registries.schema.title'}
+        path: 'metadata',
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        data: {title: 'admin.registries.metadata.title', breadcrumbKey: 'admin.registries.metadata'},
+        children: [
+          {
+            path: '',
+            component: MetadataRegistryComponent
+          },
+          {
+            path: ':schemaName',
+            resolve: { breadcrumb: I18nBreadcrumbResolver },
+            component: MetadataSchemaComponent,
+            data: {title: 'admin.registries.schema.title', breadcrumbKey: 'admin.registries.schema'}
+          }
+        ]
       },
       {
         path: BITSTREAMFORMATS_MODULE_PATH,
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
         loadChildren: './bitstream-formats/bitstream-formats.module#BitstreamFormatsModule',
-        data: {title: 'admin.registries.bitstream-formats.title'}
+        data: {title: 'admin.registries.bitstream-formats.title', breadcrumbKey: 'admin.registries.bitstream-formats'}
       },
     ])
   ]

diff --git a/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts b/src/app/+admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts
@@ -4,6 +4,7 @@ import { BitstreamFormatsResolver } from './bitstream-formats.resolver';
 import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component';
 import { BitstreamFormatsComponent } from './bitstream-formats.component';
 import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component';
+import { I18nBreadcrumbResolver } from '../../../core/breadcrumbs/i18n-breadcrumb.resolver';
 
 const BITSTREAMFORMAT_EDIT_PATH = ':id/edit';
 const BITSTREAMFORMAT_ADD_PATH = 'add';
@@ -17,14 +18,18 @@ const BITSTREAMFORMAT_ADD_PATH = 'add';
       },
       {
         path: BITSTREAMFORMAT_ADD_PATH,
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
         component: AddBitstreamFormatComponent,
+        data: {breadcrumbKey: 'admin.registries.bitstream-formats.create'}
       },
       {
         path: BITSTREAMFORMAT_EDIT_PATH,
         component: EditBitstreamFormatComponent,
         resolve: {
-          bitstreamFormat: BitstreamFormatsResolver
-        }
+          bitstreamFormat: BitstreamFormatsResolver,
+          breadcrumb: I18nBreadcrumbResolver
+        },
+        data: {breadcrumbKey: 'admin.registries.bitstream-formats.edit'}
       },
     ])
   ],

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -11,7 +11,6 @@ <h2 id="header" class="border-bottom pb-2">{{'admin.registries.metadata.head' |
             <ds-pagination
                     *ngIf="(metadataSchemas | async)?.payload?.totalElements > 0"
                     [paginationOptions]="config"
-                    [pageInfoState]="(metadataSchemas | async)?.payload"
                     [collectionSize]="(metadataSchemas | async)?.payload?.totalElements"
                     [hideGear]="true"
                     [hidePagerWhenSinglePage]="true"

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -4,14 +4,16 @@ import { Observable, combineLatest as observableCombineLatest } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { map, take } from 'rxjs/operators';
+import { filter, map, switchMap, take } from 'rxjs/operators';
 import { hasValue } from '../../../shared/empty.util';
 import { RestResponse } from '../../../core/cache/response.models';
 import { zip } from 'rxjs/internal/observable/zip';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { Route, Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
+import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 
 @Component({
   selector: 'ds-metadata-registry',
@@ -37,6 +39,11 @@ export class MetadataRegistryComponent {
     pageSize: 25
   });
 
+  /**
+   * Whether or not the list of MetadataSchemas needs an update
+   */
+  needsUpdate$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
+
   constructor(private registryService: RegistryService,
               private notificationsService: NotificationsService,
               private router: Router,
@@ -50,23 +57,25 @@ export class MetadataRegistryComponent {
    */
   onPageChange(event) {
     this.config.currentPage = event;
-    this.updateSchemas();
+    this.forceUpdateSchemas();
   }
 
   /**
    * Update the list of schemas by fetching it from the rest api or cache
    */
   private updateSchemas() {
-    this.metadataSchemas = this.registryService.getMetadataSchemas(this.config);
+    this.metadataSchemas = this.needsUpdate$.pipe(
+      filter((update) => update === true),
+      switchMap(() => this.registryService.getMetadataSchemas(toFindListOptions(this.config)))
+    );
   }
 
   /**
    * Force-update the list of schemas by first clearing the cache related to metadata schemas, then performing
    * a new REST call
    */
   public forceUpdateSchemas() {
-    this.registryService.clearMetadataSchemaRequests().subscribe();
-    this.updateSchemas();
+    this.needsUpdate$.next(true);
   }
 
   /**
@@ -125,6 +134,7 @@ export class MetadataRegistryComponent {
    * Delete all the selected metadata schemas
    */
   deleteSchemas() {
+    this.registryService.clearMetadataSchemaRequests().subscribe();
     this.registryService.getSelectedMetadataSchemas().pipe(take(1)).subscribe(
       (schemas) => {
         const tasks$ = [];

diff --git a/...-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts b/...-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
@@ -21,7 +21,8 @@ describe('MetadataSchemaFormComponent', () => {
   const registryServiceStub = {
     getActiveMetadataSchema: () => observableOf(undefined),
     createOrUpdateMetadataSchema: (schema: MetadataSchema) => observableOf(schema),
-    cancelEditMetadataSchema: () => {}
+    cancelEditMetadataSchema: () => {},
+    clearMetadataSchemaRequests: () => observableOf(undefined)
   };
   const formBuilderServiceStub = {
     createFormGroup: () => {

diff --git a/...admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/...admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -128,6 +128,7 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
    * Emit the updated/created schema using the EventEmitter submitForm
    */
   onSubmit() {
+    this.registryService.clearMetadataSchemaRequests().subscribe();
     this.registryService.getActiveMetadataSchema().pipe(take(1)).subscribe(
       (schema) => {
         const values = {
@@ -139,7 +140,7 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
             this.submitForm.emit(newSchema);
           });
         } else {
-          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), {
+          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), schema, {
             id: schema.id,
             prefix: (values.prefix ? values.prefix : schema.prefix),
             namespace: (values.namespace ? values.namespace : schema.namespace)
@@ -148,6 +149,7 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
           });
         }
         this.clearFields();
+        this.registryService.cancelEditMetadataSchema();
       }
     );
   }

diff --git a/...dmin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts b/...dmin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
@@ -30,6 +30,7 @@ describe('MetadataFieldFormComponent', () => {
     createOrUpdateMetadataField: (field: MetadataField) => observableOf(field),
     cancelEditMetadataField: () => {},
     cancelEditMetadataSchema: () => {},
+    clearMetadataFieldRequests: () => observableOf(undefined)
   };
   const formBuilderServiceStub = {
     createFormGroup: () => {

diff --git a/...min/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/...min/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -153,6 +153,7 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
    * Emit the updated/created field using the EventEmitter submitForm
    */
   onSubmit() {
+    this.registryService.clearMetadataFieldRequests().subscribe();
     this.registryService.getActiveMetadataField().pipe(take(1)).subscribe(
       (field) => {
         const values = {
@@ -166,7 +167,7 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
             this.submitForm.emit(newField);
           });
         } else {
-          this.registryService.createOrUpdateMetadataField(Object.assign(new MetadataField(), {
+          this.registryService.createOrUpdateMetadataField(Object.assign(new MetadataField(), field, {
             id: field.id,
             schema: this.metadataSchema,
             element: (values.element ? values.element : field.element),
@@ -177,6 +178,7 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
           });
         }
         this.clearFields();
+        this.registryService.cancelEditMetadataField();
       }
     );
   }

diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -1,36 +1,37 @@
 <div class="container">
   <div class="metadata-schema row">
-    <div class="col-12">
+    <div class="col-12" *ngVar="(metadataSchema$ | async) as schema">
 
-      <h2 id="header" class="border-bottom pb-2">{{'admin.registries.schema.head' | translate}}: "{{(metadataSchema | async)?.payload?.prefix}}"</h2>
+      <h2 id="header" class="border-bottom pb-2">{{'admin.registries.schema.head' | translate}}: "{{schema?.prefix}}"</h2>
 
-      <p id="description" class="pb-2">{{'admin.registries.schema.description' | translate:namespace }}</p>
+      <p id="description" class="pb-2">{{'admin.registries.schema.description' | translate:{ namespace: schema?.namespace } }}</p>
 
       <ds-metadata-field-form
-        [metadataSchema]="(metadataSchema | async)?.payload"
+        [metadataSchema]="schema"
         (submitForm)="forceUpdateFields()"></ds-metadata-field-form>
 
       <h3>{{'admin.registries.schema.fields.head' | translate}}</h3>
 
-      <ds-pagination
-        *ngIf="(metadataFields | async)?.payload?.totalElements > 0"
-        [paginationOptions]="config"
-        [pageInfoState]="(metadataFields | async)?.payload"
-        [collectionSize]="(metadataFields | async)?.payload?.totalElements"
-        [hideGear]="false"
-        [hidePagerWhenSinglePage]="true"
-        (pageChange)="onPageChange($event)">
-        <div class="table-responsive">
-          <table id="metadata-fields" class="table table-striped table-hover">
-            <thead>
+      <ng-container *ngVar="(metadataFields$ | async)?.payload as fields">
+        <ds-pagination
+          *ngIf="fields?.totalElements > 0"
+          [paginationOptions]="config"
+          [pageInfoState]="fields"
+          [collectionSize]="fields?.totalElements"
+          [hideGear]="false"
+          [hidePagerWhenSinglePage]="true"
+          (pageChange)="onPageChange($event)">
+          <div class="table-responsive">
+            <table id="metadata-fields" class="table table-striped table-hover">
+              <thead>
               <tr>
                 <th></th>
                 <th scope="col">{{'admin.registries.schema.fields.table.field' | translate}}</th>
                 <th scope="col">{{'admin.registries.schema.fields.table.scopenote' | translate}}</th>
               </tr>
-            </thead>
-            <tbody>
-              <tr *ngFor="let field of (metadataFields | async)?.payload?.page"
+              </thead>
+              <tbody>
+              <tr *ngFor="let field of fields?.page"
                   [ngClass]="{'table-primary' : isActive(field) | async}">
                 <td>
                   <label>
@@ -39,22 +40,23 @@ <h3>{{'admin.registries.schema.fields.head' | translate}}</h3>
                            (change)="selectMetadataField(field, $event)">
                   </label>
                 </td>
-                <td class="selectable-row" (click)="editField(field)">{{(metadataSchema | async)?.payload?.prefix}}.{{field.element}}<label *ngIf="field.qualifier">.</label>{{field.qualifier}}</td>
+                <td class="selectable-row" (click)="editField(field)">{{schema?.prefix}}.{{field.element}}<label *ngIf="field.qualifier">.</label>{{field.qualifier}}</td>
                 <td class="selectable-row" (click)="editField(field)">{{field.scopeNote}}</td>
               </tr>
-            </tbody>
-          </table>
-        </div>
-      </ds-pagination>
+              </tbody>
+            </table>
+          </div>
+        </ds-pagination>
 
-      <div *ngIf="(metadataFields | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
-        {{'admin.registries.schema.fields.no-items' | translate}}
-      </div>
+        <div *ngIf="fields?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+          {{'admin.registries.schema.fields.no-items' | translate}}
+        </div>
 
-      <div>
-        <button [routerLink]="['/admin/registries/metadata']" class="btn btn-primary">{{'admin.registries.schema.return' | translate}}</button>
-        <button *ngIf="(metadataFields | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}</button>
-      </div>
+        <div>
+          <button [routerLink]="['/admin/registries/metadata']" class="btn btn-primary">{{'admin.registries.schema.return' | translate}}</button>
+          <button *ngIf="fields?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}</button>
+        </div>
+      </ng-container>
 
     </div>
   </div>

diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
@@ -22,6 +22,7 @@ import { RestResponse } from '../../../core/cache/response.models';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { VarDirective } from '../../../shared/utils/var.directive';
 
 describe('MetadataSchemaComponent', () => {
   let comp: MetadataSchemaComponent;
@@ -124,7 +125,7 @@ describe('MetadataSchemaComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-      declarations: [MetadataSchemaComponent, PaginationComponent, EnumKeysPipe],
+      declarations: [MetadataSchemaComponent, PaginationComponent, EnumKeysPipe, VarDirective],
       providers: [
         { provide: RegistryService, useValue: registryServiceStub },
         { provide: ActivatedRoute, useValue: activatedRouteStub },