@dative-gpi/foundation-core-services 0.0.49 → 0.0.51

package/composables/app/index.ts

@@ -0,0 +1 @@
+export * from "./useAppOrganisationId";

package/composables/app/useAppOrganisationId.ts

@@ -0,0 +1,18 @@
+import { computed, ref } from "vue";
+
+const organisationId = ref<string | null>(null);
+
+export const useAppOrganisationId = () => {
+
+    const setOrganisationId = (payload: string) => {
+        organisationId.value = payload;
+    };
+
+    const ready = computed(() => organisationId.value !== null);
+
+    return {
+        ready,
+        organisationId,
+        setOrganisationId
+    };
+}

package/composables/index.ts

@@ -1,4 +1,4 @@
+export * from "./app";
 export * from "./hubs";
 export * from "./services";
-export * from "./useCore";
-export * from "./useOrganisationId";
+export * from "./useFoundationCore";

package/composables/services/index.ts

@@ -12,14 +12,12 @@ export * from "./useDeviceConnectivities";
 export * from "./useDeviceOrganisations";
 export * from "./useDeviceStatuses";
 export * from "./useGroups";
-export * from "./useLanguages";
 export * from "./useLocations";
 export * from "./useManufacturers";
 export * from "./useModels";
 export * from "./useOrganisations";
 export * from "./useOrganisationTypes";
 export * from "./usePermissionCategories";
-export * from "./usePermissions";
 export * from "./useRoleOrganisations";
 export * from "./useRoleOrganisationTypes";
 export * from "./useTables";

package/composables/useFoundationCore.ts

@@ -0,0 +1,17 @@
+import { computed } from "vue";
+
+import { useFoundationShared } from "@dative-gpi/foundation-shared-services/composables";
+
+import { useAppOrganisationId } from "./app/useAppOrganisationId";
+
+export function useFoundationCore() {
+
+	const { ready: sharedReady } = useFoundationShared();
+	const { ready: organisationReady } = useAppOrganisationId();
+
+	const ready = computed(() => sharedReady.value && organisationReady.value);
+
+	return {
+		ready
+	};
+}

package/config/urls/index.ts

@@ -12,8 +12,6 @@ export * from "./deviceConnectivities";
 export * from "./deviceOrganisations";
 export * from "./deviceStatuses";
 export * from "./groups";
-export * from "./images";
-export * from "./languages";
 export * from "./locations";
 export * from "./manufacturers";
 export * from "./models";

package/config/urls/urlFactory.ts

@@ -1,6 +1,6 @@
-import { useOrganisationId } from "../../composables/useOrganisationId";
+import { useAppOrganisationId } from "../../composables";
 
-const { organisationId } = useOrganisationId();
+const { organisationId } = useAppOrganisationId();
 
 export function urlFactory(url: (orgId: string) => string) {
     return () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-services",
   "sideEffects": false,
-  "version": "0.0.49",
+  "version": "0.0.51",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -11,10 +11,10 @@
   "license": "ISC",
   "dependencies": {
     "@dative-gpi/bones-ui": "^0.0.61",
-    "@dative-gpi/foundation-core-domain": "0.0.49",
+    "@dative-gpi/foundation-core-domain": "0.0.51",
     "@microsoft/signalr": "^8.0.0",
     "vue": "^3.2.0",
     "vue-router": "^4.2.5"
   },
-  "gitHead": "cf285c38be7fcc0f02f813f2cb3693867d277003"
+  "gitHead": "13a8e0d4bd10a05a35c570412fa2024d33b0c115"
 }

package/composables/services/useLanguages.ts

@@ -1,11 +0,0 @@
-import { LanguageDetails, LanguageDetailsDTO, LanguageFilters, LanguageInfos, LanguageInfosDTO } from "@dative-gpi/foundation-shared-domain/models";
-import { ComposableFactory, ServiceFactory } from "@dative-gpi/bones-ui";
-
-import { LANGUAGES_URL } from "../../config/urls";
-
-const LanguageServiceFactory = new ServiceFactory<LanguageDetailsDTO, LanguageDetails>("language", LanguageDetails).create(factory => factory.build(
-    factory.addGetMany<LanguageInfosDTO, LanguageInfos, LanguageFilters>(LANGUAGES_URL, LanguageInfos),
-    factory.addNotify()
-));
-
-export const useLanguages = ComposableFactory.getMany(LanguageServiceFactory);

package/composables/services/usePermissions.ts

@@ -1,41 +0,0 @@
-import { ref } from "vue";
-
-import { PermissionDetails, PermissionDetailsDTO, PermissionInfos } from "@dative-gpi/foundation-shared-domain/models";
-import { ServiceFactory } from "@dative-gpi/bones-ui";
-
-import { PERMISSIONS_CURRENT_URL } from "../../config/urls";
-
-const PermissionServiceFactory = new ServiceFactory<PermissionDetailsDTO, PermissionDetails>("permission", PermissionDetails).create(factory => factory.build(
-    factory.addNotify(() => ({
-        getCurrent: async (): Promise<PermissionInfos[]> => {
-            const response = await ServiceFactory.http.get(PERMISSIONS_CURRENT_URL());
-            const result = response.data.map((dto: PermissionInfos) => new PermissionInfos(dto));
-
-            return result;
-        }
-    }))
-));
-
-export const useCurrentPermissions = () => {
-    const service = PermissionServiceFactory();
-
-    const fetching = ref(false);
-    const fetched = ref<PermissionInfos[] | null>(null);
-
-    const fetch = async () => {
-        fetching.value = true;
-        try {
-            fetched.value = await service.getCurrent();
-        }
-        finally {
-            fetching.value = false;
-        }
-        return fetched;
-    }
-
-    return {
-        fetching,
-        fetch,
-        fetched
-    }
-}

package/composables/useCore.ts

@@ -1,26 +0,0 @@
-import { ref } from "vue";
-
-import { useOrganisationId } from "./useOrganisationId";
-
-let called = false;
-
-const ready = ref(false);
-
-export async function useCore() {
-	if (called) {
-		return {
-			ready
-		};
-	}
-
-	called = true;
-
-	const { ready: organisationIdReady } = useOrganisationId();
-
-	await organisationIdReady;
-	ready.value = true;
-
-	return {
-		ready
-	};
-}

package/composables/useOrganisationId.ts

@@ -1,28 +0,0 @@
-import { ref, watch } from "vue";
-
-const organisationId = ref<string | null>(null);
-
-export const useOrganisationId = () => {
-    const setOrganisationId = (payload: string) => {
-        organisationId.value = payload;
-    };
-
-    const ready = new Promise((resolve) => {
-        if (organisationId.value) {
-            resolve(organisationId.value);
-        }
-        else {
-            watch(organisationId, () => {
-                if (organisationId.value) {
-                    resolve(organisationId.value);
-                }
-            });
-        }
-    });
-
-    return {
-        ready,
-        organisationId,
-        setOrganisationId
-    };
-}

package/config/urls/images.ts

@@ -1,5 +0,0 @@
-import { CORE_URL } from "./base";
-
-export const IMAGES_URL = () => `${CORE_URL()}/images`;
-export const IMAGE_RAW_URL = (imageId: string) => `${IMAGES_URL()}/raw/${encodeURIComponent(imageId)}`; 
-export const IMAGE_THUMBNAIL_URL = (imageId: string) => `${IMAGES_URL()}/thumbnail/${encodeURIComponent(imageId)}`

package/config/urls/languages.ts

@@ -1,3 +0,0 @@
-import { CORE_URL } from "./base";
-
-export const LANGUAGES_URL = () => `${CORE_URL()}/languages`;