@dative-gpi/foundation-core-domain 1.1.13 → 1.1.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/models/chartOrganisationTypes/chartOrganisationTypeInfos.ts +5 -5
  2. package/models/chartOrganisations/chartOrganisationInfos.ts +5 -5
  3. package/models/charts/chartInfos.ts +0 -5
  4. package/models/charts/chartOperand.ts +1 -8
  5. package/models/charts/index.ts +0 -1
  6. package/models/dataCategories/dataCategoryInfos.ts +10 -4
  7. package/models/dataDefinitions/dataDefinitionInfos.ts +0 -3
  8. package/package.json +4 -4
  9. package/models/charts/chartModelLabel.ts +0 -14
package/models/chartOrganisationTypes/chartOrganisationTypeInfos.ts CHANGED
@@ -1,5 +1,5 @@
1
- import type { ChartModelLabelDTO } from "../charts/chartModelLabel";
2
- import { ChartModelLabel } from "../charts/chartModelLabel";
1
+ import type { ModelInfosDTO } from "../models/modelInfos";
2
+ import { ModelInfos } from "../models/modelInfos";
3
3
  import type { ApplicationScope } from "@dative-gpi/foundation-shared-domain/enums";
4
4
  import type { ChartType, PlotPer } from "@dative-gpi/foundation-shared-domain/enums";
5
5
 
@@ -21,7 +21,7 @@ export class ChartOrganisationTypeInfos {
21
21
  tags: string[];
22
22
  multiple: boolean;
23
23
  chartType: ChartType;
24
- modelsLabels: ChartModelLabel[];
24
+ models: ModelInfos[];
25
25
 
26
26
  constructor(params: ChartOrganisationTypeInfosDTO) {
27
27
  this.id = params.id;
@@ -41,7 +41,7 @@ export class ChartOrganisationTypeInfos {
41
41
  this.tags = params.tags.slice();
42
42
  this.multiple = params.multiple;
43
43
  this.chartType = params.chartType;
44
- this.modelsLabels = params.modelsLabels.map((modelLabel) => new ChartModelLabel(modelLabel));
44
+ this.models = params.models?.map((m) => new ModelInfos(m)) ?? [];
45
45
  }
46
46
  }
47
47
 
@@ -63,7 +63,7 @@ export interface ChartOrganisationTypeInfosDTO {
63
63
  tags: string[];
64
64
  multiple: boolean;
65
65
  chartType: ChartType;
66
- modelsLabels: ChartModelLabelDTO[];
66
+ models?: ModelInfosDTO[];
67
67
  }
68
68
 
69
69
  export interface ChartOrganisationTypeFilters {
package/models/chartOrganisations/chartOrganisationInfos.ts CHANGED
@@ -1,5 +1,5 @@
1
- import type { ChartModelLabelDTO } from "../charts/chartModelLabel";
2
- import { ChartModelLabel } from "../charts/chartModelLabel";
1
+ import type { ModelInfosDTO } from "../models/modelInfos";
2
+ import { ModelInfos } from "../models/modelInfos";
3
3
  import type { ApplicationScope } from "@dative-gpi/foundation-shared-domain/enums";
4
4
  import type { ChartType, PlotPer } from "@dative-gpi/foundation-shared-domain/enums";
5
5
 
@@ -20,7 +20,7 @@ export class ChartOrganisationInfos {
20
20
  tags: string[];
21
21
  multiple: boolean;
22
22
  chartType: ChartType;
23
- modelsLabels: ChartModelLabel[];
23
+ models: ModelInfos[];
24
24
 
25
25
  constructor(params: ChartOrganisationInfosDTO) {
26
26
  this.id = params.id;
@@ -39,7 +39,7 @@ export class ChartOrganisationInfos {
39
39
  this.tags = params.tags.slice();
40
40
  this.multiple = params.multiple;
41
41
  this.chartType = params.chartType;
42
- this.modelsLabels = params.modelsLabels.map((modelLabel) => new ChartModelLabel(modelLabel));
42
+ this.models = params.models?.map((m) => new ModelInfos(m)) ?? [];
43
43
  }
44
44
  }
45
45
 
@@ -60,7 +60,7 @@ export interface ChartOrganisationInfosDTO {
60
60
  tags: string[];
61
61
  multiple: boolean;
62
62
  chartType: ChartType;
63
- modelsLabels: ChartModelLabelDTO[];
63
+ models?: ModelInfosDTO[];
64
64
  }
65
65
 
66
66
  export interface ChartOrganisationFilters {
package/models/charts/chartInfos.ts CHANGED
@@ -1,5 +1,3 @@
1
- import type { ChartModelLabelDTO } from "./chartModelLabel";
2
- import { ChartModelLabel } from "./chartModelLabel";
3
1
  import type { ApplicationScope } from "@dative-gpi/foundation-shared-domain/enums";
4
2
  import type { ChartType } from "@dative-gpi/foundation-shared-domain/enums";
5
3
 
@@ -18,7 +16,6 @@ export class ChartInfos {
18
16
  tags: string[];
19
17
  multiple: boolean;
20
18
  chartType: ChartType;
21
- modelsLabels: ChartModelLabel[];
22
19
 
23
20
  constructor(params: ChartInfosDTO) {
24
21
  this.id = params.id;
@@ -35,7 +32,6 @@ export class ChartInfos {
35
32
  this.tags = params.tags.slice();
36
33
  this.multiple = params.multiple;
37
34
  this.chartType = params.chartType;
38
- this.modelsLabels = params.modelsLabels.map((modelLabel) => new ChartModelLabel(modelLabel));
39
35
  }
40
36
  }
41
37
 
@@ -54,5 +50,4 @@ export interface ChartInfosDTO {
54
50
  tags: string[];
55
51
  multiple: boolean;
56
52
  chartType: ChartType;
57
- modelsLabels: ChartModelLabelDTO[];
58
53
  }
package/models/charts/chartOperand.ts CHANGED
@@ -7,8 +7,6 @@ export class ChartOperand {
7
7
  chartSerieHiddenCode: string;
8
8
  name: string;
9
9
  aggregation?: AggregationType;
10
- modelId: string;
11
- modelLabel: string;
12
10
  dataCategoryId: string;
13
11
  dataDefinitionId?: string;
14
12
  xAxisModifierHiddenCode?: string;
@@ -22,10 +20,8 @@ export class ChartOperand {
22
20
  this.chartId = params.chartId;
23
21
  this.hiddenCode = params.hiddenCode;
24
22
  this.chartSerieHiddenCode = params.chartSerieHiddenCode;
25
- this.name = params.name
23
+ this.name = params.name;
26
24
  this.aggregation = (params.aggregation as AggregationType) ?? undefined;
27
- this.modelId = params.modelId;
28
- this.modelLabel = params.modelLabel;
29
25
  this.dataCategoryId = params.dataCategoryId;
30
26
  this.dataDefinitionId = params.dataDefinitionId;
31
27
  this.xAxisModifierHiddenCode = params.xAxisModifierHiddenCode;
@@ -43,8 +39,6 @@ export interface ChartOperandDTO {
43
39
  chartSerieHiddenCode: string;
44
40
  name: string;
45
41
  aggregation?: number;
46
- modelId: string;
47
- modelLabel: string;
48
42
  dataCategoryId: string;
49
43
  dataDefinitionId?: string;
50
44
  xAxisModifierHiddenCode?: string;
@@ -59,7 +53,6 @@ export interface CreateChartOperandDTO {
59
53
  chartSerieHiddenCode: string;
60
54
  name: string;
61
55
  aggregation?: number;
62
- modelId: string;
63
56
  dataCategoryId: string;
64
57
  dataDefinitionId?: string;
65
58
  xAxisModifierHiddenCode?: string;
package/models/charts/index.ts CHANGED
@@ -6,7 +6,6 @@ export * from "./chartFilter";
6
6
  export * from "./chartFilterTranslation";
7
7
  export * from "./chartFilterValue";
8
8
  export * from "./chartInfos";
9
- export * from "./chartModelLabel";
10
9
  export * from "./chartModifier";
11
10
  export * from "./chartOperand";
12
11
  export * from "./chartPlot";
package/models/dataCategories/dataCategoryInfos.ts CHANGED
@@ -1,29 +1,35 @@
1
+ import type { ModelInfosDTO } from "../models/modelInfos";
2
+ import { ModelInfos } from "../models/modelInfos";
3
+
1
4
  export class DataCategoryInfos {
2
5
  id: string;
3
- modelId: string;
6
+ applicationId: string;
4
7
  code: string;
5
8
  label: string;
6
9
  correlated: boolean;
10
+ models: ModelInfos[];
7
11
 
8
12
  constructor(params: DataCategoryInfosDTO) {
9
13
  this.id = params.id;
10
- this.modelId = params.modelId;
14
+ this.applicationId = params.applicationId;
11
15
  this.code = params.code;
12
16
  this.label = params.label;
13
17
  this.correlated = params.correlated;
18
+ this.models = params.models?.map((m) => new ModelInfos(m)) ?? [];
14
19
  }
15
20
  }
16
21
 
17
22
  export interface DataCategoryInfosDTO {
18
23
  id: string;
19
- modelId: string;
24
+ applicationId: string;
20
25
  code: string;
21
26
  label: string;
22
27
  correlated: boolean;
28
+ models?: ModelInfosDTO[];
23
29
  }
24
30
 
25
31
  export interface DataCategoryFilters {
26
- modelId?: string | null;
32
+ modelsIds?: string[] | null;
27
33
  correlated?: boolean | null;
28
34
  search?: string | null;
29
35
  }
package/models/dataDefinitions/dataDefinitionInfos.ts CHANGED
@@ -4,7 +4,6 @@ import type { DataTable } from "@dative-gpi/foundation-shared-domain/enums";
4
4
 
5
5
  export class DataDefinitionInfos {
6
6
  id: string;
7
- modelId: string;
8
7
  dataCategoryId: string;
9
8
  dataCategoryCode: string;
10
9
  dataCategoryLabel: string;
@@ -19,7 +18,6 @@ export class DataDefinitionInfos {
19
18
 
20
19
  constructor(params: DataDefinitionInfosDTO) {
21
20
  this.id = params.id;
22
- this.modelId = params.modelId;
23
21
  this.dataCategoryId = params.dataCategoryId;
24
22
  this.dataCategoryCode = params.dataCategoryCode;
25
23
  this.dataCategoryLabel = params.dataCategoryLabel;
@@ -36,7 +34,6 @@ export class DataDefinitionInfos {
36
34
 
37
35
  export interface DataDefinitionInfosDTO {
38
36
  id: string;
39
- modelId: string;
40
37
  dataCategoryId: string;
41
38
  dataCategoryCode: string;
42
39
  dataCategoryLabel: string;
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "url": "https://github.com/Dative-GPI/foundation-shared-ui.git"
5
5
  },
6
6
  "sideEffects": false,
7
- "version": "1.1.13",
7
+ "version": "1.1.14",
8
8
  "description": "",
9
9
  "publishConfig": {
10
10
  "access": "public"
@@ -13,8 +13,8 @@
13
13
  "author": "",
14
14
  "license": "ISC",
15
15
  "dependencies": {
16
- "@dative-gpi/foundation-shared-domain": "1.1.13",
17
- "@dative-gpi/foundation-shared-services": "1.1.13"
16
+ "@dative-gpi/foundation-shared-domain": "1.1.14",
17
+ "@dative-gpi/foundation-shared-services": "1.1.14"
18
18
  },
19
- "gitHead": "808ff91c2715ee0c9201227529471b0a428861c1"
19
+ "gitHead": "efb541c500519dde8bc68c2c5719595986701947"
20
20
  }
package/models/charts/chartModelLabel.ts DELETED
@@ -1,14 +0,0 @@
1
- export class ChartModelLabel {
2
- id: string;
3
- label: string;
4
-
5
- constructor(params: ChartModelLabelDTO) {
6
- this.id = params.id;
7
- this.label = params.label;
8
- }
9
- }
10
-
11
- export interface ChartModelLabelDTO {
12
- id: string;
13
- label: string;
14
- }