@dative-gpi/foundation-core-services 1.0.86 → 1.0.88

package/composables/services/useConnectivityScenarios.ts

@@ -1,14 +1,25 @@
-import { ConnectivityScenarioDetails, type ConnectivityScenarioDetailsDTO, type ConnectivityScenarioFilters, ConnectivityScenarioInfos, type ConnectivityScenarioInfosDTO, type CreateConnectivityScenarioDTO, type UpdateConnectivityScenarioDTO } from "@dative-gpi/foundation-core-domain/models";
+import { ConnectivityScenarioDetails, type ConnectivityScenarioDetailsDTO, type ConnectivityScenarioFilters, ConnectivityScenarioInfos, type ConnectivityScenarioInfosDTO, type UpsertConnectivityScenarioDTO, type UpdateConnectivityScenarioDTO } from "@dative-gpi/foundation-core-domain/models";
 import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui/core";
 
 import { CONNECTIVITY_SCENARIOS_URL, CONNECTIVITY_SCENARIO_URL } from "../../config";
 
-const ConnectivityScenarioServiceFactory = new ServiceFactory<ConnectivityScenarioDetailsDTO, ConnectivityScenarioDetails>("ConnectivityScenario", ConnectivityScenarioDetails)
-  .createComplete<ConnectivityScenarioInfos, ConnectivityScenarioInfosDTO, CreateConnectivityScenarioDTO, UpdateConnectivityScenarioDTO, ConnectivityScenarioFilters>(CONNECTIVITY_SCENARIOS_URL, CONNECTIVITY_SCENARIO_URL, ConnectivityScenarioInfos);
+
+const ConnectivityScenarioServiceFactory = new ServiceFactory<ConnectivityScenarioDetailsDTO, ConnectivityScenarioDetails>("ConnectivityScenario", ConnectivityScenarioDetails).create(factory => factory.build(
+  factory.addGet(CONNECTIVITY_SCENARIO_URL),
+  factory.addGetMany<ConnectivityScenarioInfosDTO, ConnectivityScenarioInfos, ConnectivityScenarioFilters>(CONNECTIVITY_SCENARIOS_URL, ConnectivityScenarioInfos),
+  factory.addUpdate<UpdateConnectivityScenarioDTO>(CONNECTIVITY_SCENARIO_URL),
+  factory.addRemove(CONNECTIVITY_SCENARIO_URL),
+  factory.addNotify(notifyService => ({
+    ...ServiceFactory.addCustom("upsert", (axios, payload: UpsertConnectivityScenarioDTO) => axios.post(CONNECTIVITY_SCENARIOS_URL(), payload), () => {
+      notifyService.notify("reset");
+    })
+  }))
+));
+
 
 export const useConnectivityScenario = ComposableFactory.get(ConnectivityScenarioServiceFactory);
 export const useConnectivityScenarios = ComposableFactory.getMany(ConnectivityScenarioServiceFactory);
-export const useCreateConnectivityScenario = ComposableFactory.create(ConnectivityScenarioServiceFactory);
 export const useUpdateConnectivityScenario = ComposableFactory.update(ConnectivityScenarioServiceFactory);
 export const useRemoveConnectivityScenario = ComposableFactory.remove(ConnectivityScenarioServiceFactory);
+export const useUpsertConnectivityScenario = ComposableFactory.custom(ConnectivityScenarioServiceFactory.upsert);
 

package/composables/services/useDataTables.ts

@@ -6,23 +6,15 @@ import { type FSDataTable, type FSDataTableColumn } from "@dative-gpi/foundation
 export const useDataTables = () => {
   const initialized = ref(false);
 
-  const table = ref<FSDataTable>({
-    headers: [],
-    mode: null,
-    sortBy: null,
-    rowsPerPage: 10,
-    showFilters: false,
-    filters: {},
-    page: 1
-  });
+  const table = ref<FSDataTable | null>(null);
 
   const computeTable = (
     headersOptions: { [key: string]: Partial<FSDataTableColumn> },
     defaultMode: "table" | "iterator" = "table"
   ) => ({
     ...table.value,
-    mode: table.value.mode ?? defaultMode,
-    headers: table.value.headers.map(header => ({
+    mode: table.value?.mode ?? defaultMode,
+    headers: table.value?.headers.map(header => ({
       ...header,
       fixedFilters: (header.value && headersOptions[header.value] && headersOptions[header.value].fixedFilters) || null,
       methodFilter: (header.value && headersOptions[header.value] && headersOptions[header.value].methodFilter) || null,
@@ -61,10 +53,13 @@ export const useDataTables = () => {
     tableCode: string,
     defaultMode: "table" | "iterator" = "table"
   ): Promise<void> => {
+    let done = false;
     if (tableCode) {
       const composableTable = getTable(tableCode);
+
       if (composableTable) {
         table.value = composableTable;
+        done = true;
       }
       else {
         try {
@@ -82,6 +77,7 @@ export const useDataTables = () => {
               filters: {},
               page: 1
             }
+            done = true;
           }
         }
         catch {
@@ -89,6 +85,17 @@ export const useDataTables = () => {
         }
       }
     }
+    if (!done) {
+      table.value = {
+        headers: [],
+        mode: null,
+        sortBy: null,
+        rowsPerPage: 10,
+        showFilters: false,
+        filters: {},
+        page: 1
+      };
+    }
     initialized.value = true;
   };
 

package/composables/services/useScenarioDeviceOrganisations.ts

@@ -7,8 +7,9 @@ const ScenarioDeviceOrganisationServiceFactory = new ServiceFactory<ScenarioDevi
   .createComplete<ScenarioDeviceOrganisationInfos, ScenarioDeviceOrganisationInfosDTO, CreateScenarioDeviceOrganisationDTO, UpdateScenarioDeviceOrganisationDTO, ScenarioDeviceOrganisationFilters>(SCENARIO_DEVICE_ORGANISATIONS_URL, SCENARIO_DEVICE_ORGANISATION_URL, ScenarioDeviceOrganisationInfos);
 
 const ScenarioDeviceOrganisationServiceFactoryIncomplete = new ServiceFactory<ScenarioDeviceOrganisationInfosDTO, ScenarioDeviceOrganisationInfos>("notifications", ScenarioDeviceOrganisationDetails).create(factory => factory.build(
-  factory.addNotify(() => ({
+  factory.addNotify(notifyService => ({
     ...ServiceFactory.addCustom("createMany", (axios, payload: CreateManyScenarioDeviceOrganisationDTO) => axios.put(SCENARIO_DEVICE_ORGANISATIONS_URL(), payload), () => {
+      notifyService.notify("reset");
     })
   }))
 ));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-services",
   "sideEffects": false,
-  "version": "1.0.86",
+  "version": "1.0.88",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,7 +10,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.0.86"
+    "@dative-gpi/foundation-core-domain": "1.0.88"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -18,5 +18,5 @@
     "vue": "^3.4.29",
     "vue-router": "^4.3.0"
   },
-  "gitHead": "5de195b233970af6cc7c2f8cdf52fb97ff952269"
+  "gitHead": "ab11b2d34cc774a15549d7450ae6d06a6c6023ee"
 }