@dative-gpi/foundation-core-services 1.0.92 → 1.0.94

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/composables/services/useDataTables.ts +7 -4
  2. package/composables/services/useScenarioDeviceOrganisations.ts +7 -5
  3. package/package.json +3 -3
package/composables/services/useDataTables.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import { ref, type Ref } from "vue";
2
+ import _ from "lodash";
2
3
 
3
4
  import { type UpdateUserOrganisationTableDTO, type UserOrganisationTableDetails } from "@dative-gpi/foundation-core-domain/models";
4
5
  import { type FSDataTable, type FSDataTableColumn } from "@dative-gpi/foundation-shared-components/models";
@@ -10,18 +11,20 @@ export const useDataTables = () => {
10
11
 
11
12
  const computeTable = (
12
13
  headersOptions: { [key: string]: Partial<FSDataTableColumn> },
13
- defaultMode: "table" | "iterator" = "table"
14
+ defaultMode: "table" | "iterator" = "table",
15
+ extraHeaders: FSDataTableColumn[] = []
14
16
  ) => ({
15
17
  ...table.value,
16
18
  mode: table.value?.mode ?? defaultMode,
17
- headers: table.value?.headers.map(header => ({
19
+ headers: _.sortBy(table.value?.headers.concat(extraHeaders.filter(e => !table.value?.headers.map(h => h.value).includes(e.value))), "index").map((header, i) => ({
18
20
  ...header,
21
+ index: i,
19
22
  fixedFilters: (header.value && headersOptions[header.value] && headersOptions[header.value].fixedFilters) || null,
20
23
  methodFilter: (header.value && headersOptions[header.value] && headersOptions[header.value].methodFilter) || null,
21
24
  methodFilterRaw: (header.value && headersOptions[header.value] && headersOptions[header.value].methodFilterRaw) || null,
22
25
  sort: (header.value && headersOptions[header.value] && headersOptions[header.value].sort) || null,
23
- sortRaw: (header.value && headersOptions[header.value] && headersOptions[header.value].sortRaw) || null ,
24
- innerValue: (header.value && headersOptions[header.value] && headersOptions[header.value].innerValue) || null
26
+ sortRaw: (header.value && headersOptions[header.value] && headersOptions[header.value].sortRaw) || null,
27
+ innerValue: (header.value && headersOptions[header.value] && headersOptions[header.value].innerValue) || null
25
28
  }))
26
29
  });
27
30
 
package/composables/services/useScenarioDeviceOrganisations.ts CHANGED
@@ -3,10 +3,12 @@ import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui/core";
3
3
 
4
4
  import { SCENARIO_DEVICE_ORGANISATIONS_URL, SCENARIO_DEVICE_ORGANISATION_URL } from "../../config";
5
5
 
6
- const ScenarioDeviceOrganisationServiceFactory = new ServiceFactory<ScenarioDeviceOrganisationDetailsDTO, ScenarioDeviceOrganisationDetails>("scenarioDeviceOrganisation", ScenarioDeviceOrganisationDetails)
7
- .createComplete<ScenarioDeviceOrganisationInfos, ScenarioDeviceOrganisationInfosDTO, CreateScenarioDeviceOrganisationDTO, UpdateScenarioDeviceOrganisationDTO, ScenarioDeviceOrganisationFilters>(SCENARIO_DEVICE_ORGANISATIONS_URL, SCENARIO_DEVICE_ORGANISATION_URL, ScenarioDeviceOrganisationInfos);
8
-
9
- const ScenarioDeviceOrganisationServiceFactoryIncomplete = new ServiceFactory<ScenarioDeviceOrganisationInfosDTO, ScenarioDeviceOrganisationInfos>("notifications", ScenarioDeviceOrganisationDetails).create(factory => factory.build(
6
+ const ScenarioDeviceOrganisationServiceFactory = new ServiceFactory<ScenarioDeviceOrganisationDetailsDTO, ScenarioDeviceOrganisationDetails>("scenarioDeviceOrganisation", ScenarioDeviceOrganisationDetails).create(factory => factory.build(
7
+ factory.addCreate<CreateScenarioDeviceOrganisationDTO>(SCENARIO_DEVICE_ORGANISATIONS_URL),
8
+ factory.addGet(SCENARIO_DEVICE_ORGANISATION_URL),
9
+ factory.addGetMany<ScenarioDeviceOrganisationInfosDTO, ScenarioDeviceOrganisationInfos, ScenarioDeviceOrganisationFilters>(SCENARIO_DEVICE_ORGANISATIONS_URL, ScenarioDeviceOrganisationInfos),
10
+ factory.addUpdate<UpdateScenarioDeviceOrganisationDTO>(SCENARIO_DEVICE_ORGANISATION_URL),
11
+ factory.addRemove(SCENARIO_DEVICE_ORGANISATION_URL),
10
12
  factory.addNotify(notifyService => ({
11
13
  ...ServiceFactory.addCustom("createMany", (axios, payload: CreateManyScenarioDeviceOrganisationDTO) => axios.put(SCENARIO_DEVICE_ORGANISATIONS_URL(), payload), () => {
12
14
  notifyService.notify("reset");
@@ -19,4 +21,4 @@ export const useScenarioDeviceOrganisations = ComposableFactory.getMany(Scenario
19
21
  export const useCreateScenarioDeviceOrganisation = ComposableFactory.create(ScenarioDeviceOrganisationServiceFactory);
20
22
  export const useUpdateScenarioDeviceOrganisation = ComposableFactory.update(ScenarioDeviceOrganisationServiceFactory);
21
23
  export const useRemoveScenarioDeviceOrganisation = ComposableFactory.remove(ScenarioDeviceOrganisationServiceFactory);
22
- export const useCreateManyScenarioDeviceOrganisation = ComposableFactory.custom(ScenarioDeviceOrganisationServiceFactoryIncomplete.createMany);
24
+ export const useCreateManyScenarioDeviceOrganisation = ComposableFactory.custom(ScenarioDeviceOrganisationServiceFactory.createMany);
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@dative-gpi/foundation-core-services",
3
3
  "sideEffects": false,
4
- "version": "1.0.92",
4
+ "version": "1.0.94",
5
5
  "description": "",
6
6
  "publishConfig": {
7
7
  "access": "public"
@@ -10,7 +10,7 @@
10
10
  "author": "",
11
11
  "license": "ISC",
12
12
  "dependencies": {
13
- "@dative-gpi/foundation-core-domain": "1.0.92"
13
+ "@dative-gpi/foundation-core-domain": "1.0.94"
14
14
  },
15
15
  "peerDependencies": {
16
16
  "@dative-gpi/bones-ui": "^1.0.0",
@@ -18,5 +18,5 @@
18
18
  "vue": "^3.4.29",
19
19
  "vue-router": "^4.3.0"
20
20
  },
21
- "gitHead": "5b512a8eaedd84fb5f24896d01891a9a6c838ec5"
21
+ "gitHead": "be58c8299c1fc3d18c29089e157f248527da9234"
22
22
  }