refactor(dsp-api): created api-entity-helper

apps/dsp-app/src/app/project/ontology-classes/ontology-class-instance/ontology-class-instance.component.ts

@@ -2,7 +2,8 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnIni
 import { Title } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ResourceClassDefinition, StoredProject } from '@dasch-swiss/dsp-js';
-import { AppConfigService, RouteConstants, getAllEntityDefinitionsAsArray } from '@dasch-swiss/vre/shared/app-config';
+import { getAllEntityDefinitionsAsArray } from '@dasch-swiss/vre/shared/app-api';
+import { AppConfigService, RouteConstants } from '@dasch-swiss/vre/shared/app-config';
 import { OntologyService, ProjectService } from '@dasch-swiss/vre/shared/app-helper-services';
 import { IProjectOntologiesKeyValuePairs, OntologiesSelectors, UserSelectors } from '@dasch-swiss/vre/shared/app-state';
 import { Actions, Select, Store } from '@ngxs/store';

apps/dsp-app/src/app/project/ontology/ontology.component.ts

@@ -26,11 +26,8 @@ import {
   ReadUser,
   UpdateOntology,
 } from '@dasch-swiss/dsp-js';
-import {
-  DspApiConnectionToken,
-  RouteConstants,
-  getAllEntityDefinitionsAsArray,
-} from '@dasch-swiss/vre/shared/app-config';
+import { getAllEntityDefinitionsAsArray } from '@dasch-swiss/vre/shared/app-api';
+import { DspApiConnectionToken, RouteConstants } from '@dasch-swiss/vre/shared/app-config';
 import { AppErrorHandler } from '@dasch-swiss/vre/shared/app-error-handler';
 import {
   DefaultClass,

apps/dsp-app/src/app/project/ontology/property-form/property-form.component.ts

@@ -22,15 +22,16 @@ import {
   UpdateResourcePropertyGuiElement,
   UpdateResourcePropertyLabel,
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, getAllEntityDefinitionsAsArray } from '@dasch-swiss/vre/shared/app-config';
+import { getAllEntityDefinitionsAsArray } from '@dasch-swiss/vre/shared/app-api';
+import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
 import { AppErrorHandler } from '@dasch-swiss/vre/shared/app-error-handler';
 import {
-  OntologyService,
-  SortingService,
   DefaultProperties,
   DefaultProperty,
+  OntologyService,
   PropertyCategory,
   PropertyInfoObject,
+  SortingService,
 } from '@dasch-swiss/vre/shared/app-helper-services';
 import { NotificationService } from '@dasch-swiss/vre/shared/app-notification';
 import {

apps/dsp-app/src/app/project/ontology/property-info/property-info.component.ts

@@ -8,15 +8,16 @@ import {
   ReadProject,
   ResourcePropertyDefinitionWithAllLanguages,
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, getAllEntityDefinitionsAsArray } from '@dasch-swiss/vre/shared/app-config';
+import { getAllEntityDefinitionsAsArray } from '@dasch-swiss/vre/shared/app-api';
+import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
 import { AppErrorHandler } from '@dasch-swiss/vre/shared/app-error-handler';
 import {
   DefaultClass,
   DefaultProperties,
   DefaultProperty,
+  OntologyService,
   PropertyCategory,
   PropertyInfoObject,
-  OntologyService,
 } from '@dasch-swiss/vre/shared/app-helper-services';
 import { ListsSelectors, OntologiesSelectors } from '@dasch-swiss/vre/shared/app-state';
 import { Store } from '@ngxs/store';

apps/dsp-app/src/app/project/ontology/resource-class-form/resource-class-form.component.ts

@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { ClassDefinition, PropertyDefinition } from '@dasch-swiss/dsp-js';
-import { getAllEntityDefinitionsAsArray } from '@dasch-swiss/vre/shared/app-config';
+import { getAllEntityDefinitionsAsArray } from '@dasch-swiss/vre/shared/app-api';
 import { OntologyService } from '@dasch-swiss/vre/shared/app-helper-services';
 import { OntologiesSelectors } from '@dasch-swiss/vre/shared/app-state';
 import { Store } from '@ngxs/store';

apps/dsp-app/src/app/project/project.component.ts

@@ -12,7 +12,8 @@ import { Title } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ReadOntology, ReadProject, ReadUser } from '@dasch-swiss/dsp-js';
 import { ClassAndPropertyDefinitions } from '@dasch-swiss/dsp-js/src/models/v2/ontologies/ClassAndPropertyDefinitions';
-import { MaterialColor, RouteConstants, getAllEntityDefinitionsAsArray } from '@dasch-swiss/vre/shared/app-config';
+import { getAllEntityDefinitionsAsArray } from '@dasch-swiss/vre/shared/app-api';
+import { MaterialColor, RouteConstants } from '@dasch-swiss/vre/shared/app-config';
 import { ProjectService } from '@dasch-swiss/vre/shared/app-helper-services';
 import { OntologiesSelectors, ProjectsSelectors, UserSelectors } from '@dasch-swiss/vre/shared/app-state';
 import { Actions, Select, Store } from '@ngxs/store';

libs/vre/shared/app-api/src/index.ts

@@ -8,5 +8,6 @@ export * from './lib/services/admin/user-api.service';
 export * from './lib/services/health-api.service';
 export * from './lib/services/version-api.service';
 
-export * from './lib/services/v2/ontology/ontology-v2-api.service';
+export * from './lib/services/v2/api-entity-helper';
 export * from './lib/services/v2/list/list-v2-api.service';
+export * from './lib/services/v2/ontology/ontology-v2-api.service';

libs/vre/shared/app-api/src/lib/services/v2/api-entity-helper.ts

@@ -0,0 +1,7 @@
+import { EntityDefinition } from '@dasch-swiss/dsp-js/src/models/v2/ontologies/EntityDefinition';
+
+export const getAllEntityDefinitionsAsArray = <T extends EntityDefinition>(entityDefs: { [index: string]: T }): T[] => {
+  const entityIndexes = Object.keys(entityDefs);
+
+  return entityIndexes.map((entityIndex: string) => entityDefs[entityIndex]);
+};

libs/vre/shared/app-config/src/lib/app-config/dsp-api-tokens.ts

@@ -1,6 +1,5 @@
 import { InjectionToken } from '@angular/core';
 import { KnoraApiConfig, KnoraApiConnection } from '@dasch-swiss/dsp-js';
-import { EntityDefinition } from '@dasch-swiss/dsp-js/src/models/v2/ontologies/EntityDefinition';
 import { DspAppConfig } from './dsp-app-config';
 import { DspInstrumentationConfig } from './dsp-instrumentation-config';
 
@@ -24,10 +23,3 @@ export const DspAppConfigToken = new InjectionToken<DspAppConfig>('DSP app speci
 export const DspInstrumentationToken = new InjectionToken<DspInstrumentationConfig>(
   'DSP instrumentation configuration'
 );
-
-// TODO make this method accessible from api. All object methods is lost when it is stored to the state
-export const getAllEntityDefinitionsAsArray = <T extends EntityDefinition>(entityDefs: { [index: string]: T }): T[] => {
-  const entityIndexes = Object.keys(entityDefs);
-
-  return entityIndexes.map((entityIndex: string) => entityDefs[entityIndex]);
-};

libs/vre/shared/app-state/src/lib/ontologies/ontologies.state.ts

@@ -13,11 +13,12 @@ import {
   UpdateOntology,
   UpdateResourceClassCardinality,
 } from '@dasch-swiss/dsp-js';
-import { DspApiConnectionToken, getAllEntityDefinitionsAsArray } from '@dasch-swiss/vre/shared/app-config';
+import { getAllEntityDefinitionsAsArray } from '@dasch-swiss/vre/shared/app-api';
+import { DspApiConnectionToken } from '@dasch-swiss/vre/shared/app-config';
 import { AppErrorHandler } from '@dasch-swiss/vre/shared/app-error-handler';
 import { ProjectService, SortingService } from '@dasch-swiss/vre/shared/app-helper-services';
 import { NotificationService } from '@dasch-swiss/vre/shared/app-notification';
-import { Action, Actions, ofActionSuccessful, State, StateContext } from '@ngxs/store';
+import { Action, Actions, State, StateContext, ofActionSuccessful } from '@ngxs/store';
 import { of } from 'rxjs';
 import { map, take, tap } from 'rxjs/operators';
 import { LoadListsInProjectAction } from '../lists/lists.actions';