@dative-gpi/foundation-core-domain 0.0.67 → 0.0.69

package/models/deviceOrganisations/deviceOrganisationInfos.ts

@@ -2,7 +2,6 @@ import { DeviceConnectivityDetails, DeviceConnectivityDetailsDTO } from "../devi
 import { DeviceStatusDetails, DeviceStatusDetailsDTO } from "../deviceStatuses/deviceStatusDetails";
 import { DeviceOrganisationAlert, DeviceOrganisationAlertDTO } from "./deviceOrganisationAlert";
 import { ModelStatusInfos, ModelStatusInfosDTO } from "../modelStatuses/modelStatusInfos";
-import { DeviceStatusDTO } from "../deviceStatuses/deviceStatusInfos";
 
 export class DeviceOrganisationInfos {
     id: string;
@@ -35,8 +34,8 @@ export class DeviceOrganisationInfos {
     online: number;
     meta: { [key: string]: string };
     modelStatuses: ModelStatusInfos[];
-    status?: DeviceStatusDetails;
-    connectivity?: DeviceConnectivityDetails;
+    status: DeviceStatusDetails;
+    connectivity: DeviceConnectivityDetails;
     alerts: DeviceOrganisationAlert[];
     worstAlert?: DeviceOrganisationAlert;
 
@@ -75,8 +74,8 @@ export class DeviceOrganisationInfos {
         this.online = params.online;
         this.meta = { ...params.meta };
         this.modelStatuses = params.modelStatuses.map(dto => new ModelStatusInfos(dto));
-        this.status = params.status != null ? new DeviceStatusDetails({ statuses: params.status, id: params.id }) : undefined; //new DeviceStatusDetails(params.status);
-        this.connectivity = params.connectivity != null ? new DeviceConnectivityDetails({ ...params.connectivity, id: params.id }) : undefined; //new DeviceConnectivityDetails(params.connectivity);
+        this.status = new DeviceStatusDetails(params.status);
+        this.connectivity = new DeviceConnectivityDetails(params.connectivity);
         this.alerts = params.alerts.map(dto => new DeviceOrganisationAlert(dto));
         this.worstAlert = params.worstAlert != null ? new DeviceOrganisationAlert(params.worstAlert) : undefined;
     }
@@ -113,7 +112,7 @@ export interface DeviceOrganisationInfosDTO {
     online: number;
     meta: { [key: string]: string };
     modelStatuses: ModelStatusInfosDTO[];
-    status: DeviceStatusDTO[];
+    status: DeviceStatusDetailsDTO;
     connectivity: DeviceConnectivityDetailsDTO;
     alerts: DeviceOrganisationAlertDTO[];
     worstAlert?: DeviceOrganisationAlertDTO;

package/models/tables/columnInfos.ts

@@ -1,15 +1,13 @@
-import { TranslationColumnInfos, TranslationColumnInfosDTO } from "./translationColumnInfos";
-
 export class ColumnInfos {
     columnId: string;
     text: string;
     value: string;
     sortable: boolean;
     filterable: boolean;
+    
     // Depends on [OrganisationType, UserOrganisation]
     index: number;
     hidden: boolean;
-    translations?: TranslationColumnInfos[]
 
     constructor(dto: ColumnInfosDTO) {
         this.columnId = dto.columnId;
@@ -19,7 +17,6 @@ export class ColumnInfos {
         this.filterable = dto.filterable;
         this.index = dto.index;
         this.hidden = dto.hidden;
-        this.translations = dto.translations?.map(dto => new TranslationColumnInfos(dto));
     }
 }
 
@@ -31,5 +28,4 @@ export interface ColumnInfosDTO {
     filterable: boolean;
     index: number;
     hidden: boolean;
-    translations?: TranslationColumnInfosDTO[]
 }

package/models/tables/index.ts

@@ -3,5 +3,4 @@ export * from "./columnInfos";
 export * from "./tableDetails";
 export * from "./tableFilter";
 export * from "./tableInfos";
-export * from "./tableOrder";
-export * from "./translationColumnInfos";
+export * from "./tableOrder";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-domain",
   "sideEffects": false,
-  "version": "0.0.67",
+  "version": "0.0.69",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -9,5 +9,5 @@
   "main": "index.ts",
   "author": "",
   "license": "ISC",
-  "gitHead": "6cc34e046f8f86c6b13d67d8e11f8870bc073d15"
+  "gitHead": "f42750502e3f9499a2df817d41a2e89847c83cdd"
 }

package/models/tables/translationColumnInfos.ts

@@ -1,15 +0,0 @@
-export class TranslationColumnInfos {
-    languageCode: string;
-    label: string;
-
-
-    constructor(dto: TranslationColumnInfosDTO) {
-        this.languageCode = dto.languageCode;
-        this.label = dto.label;
-    }
-}
-
-export interface TranslationColumnInfosDTO {
-    languageCode: string;
-    label: string;
-}