DigitaleBibliothek / Frontend / 200b29f6f8a

Commits

lotte authored 200b29f6f8a Merge 19 Jul 2019

Merge branch 'master' into object-factory-refactoring

Conflicts:
	src/app/submission/sections/upload/section-upload.component.spec.ts

src/app/core/data/metadata-schema-data.service.ts

Modified

-5
+import { CoreState } from '../core.reducers';
-6
-7
+import { DataService } from './data.service';
-8
+import { RequestService } from './request.service';
-9
+import { HALEndpointService } from '../shared/hal-endpoint.service';
-10
+import { FindAllOptions } from './request.models';
-11
+import { ObjectCacheService } from '../cache/object-cache.service';
-12
+import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
-13
+import { HttpClient } from '@angular/common/http';
-14
+import { NotificationsService } from '../../shared/notifications/notifications.service';
-+
+import { ChangeAnalyzer } from './change-analyzer';
-16
+import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
-17
+import { MetadataSchema } from '../metadata/metadata-schema.model';
-18
-+
+/* tslint:disable:max-classes-per-file */
-+
+class DataServiceImpl extends DataService<MetadataSchema> {
-+
+  protected linkPath = 'metadataschemas';
-+
+  protected forceBypassCache = false;
-+
-+
+  constructor(
-+
+    protected requestService: RequestService,
-+
+    protected rdbService: RemoteDataBuildService,
-+
+    protected dataBuildService: NormalizedObjectBuildService,
-+
+    protected store: Store<CoreState>,
-+
+    protected objectCache: ObjectCacheService,
-+
+    protected halService: HALEndpointService,
-+
+    protected notificationsService: NotificationsService,
-+
+    protected http: HttpClient,
-+
+    protected comparator: ChangeAnalyzer<MetadataSchema>) {
-+
+    super();
-+
+  }
-+
-+
+  getBrowseEndpoint(options: FindAllOptions = {}, linkPath: string = this.linkPath): Observable<string> {
-+
+    return this.halService.getEndpoint(linkPath);
-+
+  }
-+
+}
-+
-42
+/**
-43
+ * A service responsible for fetching/sending data from/to the REST API on the metadataschemas endpoint
-44
+ */
-45
+@Injectable()
--
+export class MetadataSchemaDataService extends DataService<MetadataSchema> {
--
+  protected linkPath = 'metadataschemas';
--
+  protected forceBypassCache = false;
-+
+export class MetadataSchemaDataService {
-+
+  private dataService: DataServiceImpl;
-48
-49
+  constructor(
-50
+    protected requestService: RequestService,
-51
+    protected rdbService: RemoteDataBuildService,
-52
+    protected store: Store<CoreState>,
-53
+    protected halService: HALEndpointService,
-54
+    protected objectCache: ObjectCacheService,
-55
+    protected comparator: DefaultChangeAnalyzer<MetadataSchema>,
-56
+    protected dataBuildService: NormalizedObjectBuildService,
-57
+    protected http: HttpClient,
-58
+    protected notificationsService: NotificationsService) {
--
+    super();
--
+  }
--
--
+  /**
--
+   * Get the endpoint for browsing metadataschemas
--
+   * @param {FindAllOptions} options
--
+   * @returns {Observable<string>}
--
+   */
--
+  public getBrowseEndpoint(options: FindAllOptions = {}, linkPath: string = this.linkPath): Observable<string> {
--
--
+    return null;
-+
+    this.dataService = new DataServiceImpl(requestService, rdbService, dataBuildService, null, objectCache, halService, notificationsService, http, comparator);
-60
+  }
--
-61
+}

Frontend

Commits

Jira Issues

Add shortcut