@dative-gpi/foundation-core-components 1.0.84 → 1.0.85

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 (3) hide show
  1. package/components/lists/chartOrganisationTypes/FSBaseChartOrganisationTypesList.vue +5 -15
  2. package/components/lists/chartOrganisations/FSBaseChartOrganisationsList.vue +2 -13
  3. package/package.json +7 -7
package/components/lists/chartOrganisationTypes/FSBaseChartOrganisationTypesList.vue CHANGED
@@ -80,8 +80,7 @@ import type { RouteLocation } from "vue-router";
80
80
 
81
81
  import {ColorEnum} from "@dative-gpi/foundation-shared-components/models";
82
82
 
83
- import type { ChartOrganisationFilters, ChartOrganisationTypeInfos } from "@dative-gpi/foundation-core-domain/models";
84
- import { PlotPer } from "@dative-gpi/foundation-shared-domain/enums";
83
+ import type { ChartOrganisationTypeFilters, ChartOrganisationTypeInfos } from "@dative-gpi/foundation-core-domain/models";
85
84
 
86
85
  import { useChartOrganisationTypes } from "@dative-gpi/foundation-core-services/composables";
87
86
 
@@ -106,16 +105,11 @@ export default defineComponent({
106
105
  required: false,
107
106
  default: null
108
107
  },
109
- chartOrganisationFilters: {
110
- type: Object as PropType<ChartOrganisationFilters>,
108
+ chartOrganisationTypeFilters: {
109
+ type: Object as PropType<ChartOrganisationTypeFilters>,
111
110
  required: false,
112
111
  default: null
113
112
  },
114
- plotPer: {
115
- type: Number as PropType<PlotPer>,
116
- required: false,
117
- default: PlotPer.None
118
- },
119
113
  itemTo: {
120
114
  type: Function as PropType<(item: ChartOrganisationTypeInfos) => Partial<RouteLocation>>,
121
115
  required: false
@@ -136,14 +130,10 @@ export default defineComponent({
136
130
  };
137
131
 
138
132
  const fetch = () =>{
139
- if(props.plotPer === PlotPer.None) {
140
- getManyChartOrganisationTypes(props.chartOrganisationFilters);
141
- } else {
142
- getManyChartOrganisationTypes({ ...props.chartOrganisationFilters, plotPer: props.plotPer });
143
- }
133
+ getManyChartOrganisationTypes(props.chartOrganisationTypeFilters);
144
134
  };
145
135
 
146
- watch(() => [props.chartOrganisationFilters, props.plotPer], (next, previous) => {
136
+ watch(() => [props.chartOrganisationTypeFilters], (next, previous) => {
147
137
  if ((!next && !previous) || !_.isEqual(next, previous)) {
148
138
  fetch();
149
139
  }
package/components/lists/chartOrganisations/FSBaseChartOrganisationsList.vue CHANGED
@@ -79,7 +79,6 @@ import type { RouteLocation } from "vue-router";
79
79
  import _ from "lodash";
80
80
 
81
81
  import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
82
- import { PlotPer } from "@dative-gpi/foundation-shared-domain/enums";
83
82
 
84
83
  import { type ChartOrganisationFilters, type ChartOrganisationInfos } from "@dative-gpi/foundation-core-domain/models";
85
84
  import { useChartOrganisations } from "@dative-gpi/foundation-core-services/composables";
@@ -110,11 +109,6 @@ export default defineComponent({
110
109
  required: false,
111
110
  default: null
112
111
  },
113
- plotPer: {
114
- type: Number as PropType<PlotPer>,
115
- required: false,
116
- default: PlotPer.None
117
- },
118
112
  itemTo: {
119
113
  type: Function as PropType<(item: ChartOrganisationInfos) => Partial<RouteLocation>>,
120
114
  required: false
@@ -135,19 +129,14 @@ export default defineComponent({
135
129
  };
136
130
 
137
131
  const fetch = () =>{
138
- if(props.plotPer === PlotPer.None) {
139
- getManyChartOrganisations(props.chartOrganisationFilters);
140
- } else {
141
- getManyChartOrganisations({...props.chartOrganisationFilters, plotPer: props.plotPer});
142
- }
132
+ getManyChartOrganisations(props.chartOrganisationFilters);
143
133
  }
144
134
 
145
- watch(() => [props.chartOrganisationFilters, props.plotPer], (next, previous) => {
135
+ watch(() => [props.chartOrganisationFilters], (next, previous) => {
146
136
  if ((!next && !previous) || !_.isEqual(next, previous)) {
147
137
  fetch();
148
138
  }
149
139
  }, { immediate: true });
150
-
151
140
 
152
141
  return {
153
142
  ColorEnum,
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@dative-gpi/foundation-core-components",
3
3
  "sideEffects": false,
4
- "version": "1.0.84",
4
+ "version": "1.0.85",
5
5
  "description": "",
6
6
  "publishConfig": {
7
7
  "access": "public"
@@ -10,11 +10,11 @@
10
10
  "author": "",
11
11
  "license": "ISC",
12
12
  "dependencies": {
13
- "@dative-gpi/foundation-core-domain": "1.0.84",
14
- "@dative-gpi/foundation-core-services": "1.0.84",
15
- "@dative-gpi/foundation-shared-components": "1.0.84",
16
- "@dative-gpi/foundation-shared-domain": "1.0.84",
17
- "@dative-gpi/foundation-shared-services": "1.0.84"
13
+ "@dative-gpi/foundation-core-domain": "1.0.85",
14
+ "@dative-gpi/foundation-core-services": "1.0.85",
15
+ "@dative-gpi/foundation-shared-components": "1.0.85",
16
+ "@dative-gpi/foundation-shared-domain": "1.0.85",
17
+ "@dative-gpi/foundation-shared-services": "1.0.85"
18
18
  },
19
19
  "peerDependencies": {
20
20
  "@dative-gpi/bones-ui": "^1.0.0",
@@ -26,5 +26,5 @@
26
26
  "sass": "1.71.1",
27
27
  "sass-loader": "13.3.2"
28
28
  },
29
- "gitHead": "a7eaef654fe35badd76832b3d07ea64bb6979d97"
29
+ "gitHead": "178fc269ca3ac29c4a0a6e3b1c163b52d1865dbf"
30
30
  }