Merge branch 'main' into gestion-mdp

Author: alainabbas

nuxt.config.ts

@@ -33,7 +33,7 @@ export default defineNuxtConfig({
     },
   },
   css: ['~/assets/sass/global.sass'],
-  plugins: [{ src: '~/plugins/ofetch' }],
+  plugins: [/* { src: '~/plugins/ofetch' } */],
   components: {
     global: true,
     dirs: [{ path: '~/components', prefix: 'sesame' }],
@@ -100,7 +100,7 @@ export default defineNuxtConfig({
     },
   },
   http: {
-    debug: process.env.NODE_ENV === 'development',
+    debug: /true|on|yes|1/i.test(`${process.env.DEBUG}`),
     browserBaseURL: SESAME_APP_API_URL,
     baseURL: SESAME_APP_API_URL,
   },

src/components/identityForm/index.vue

@@ -94,8 +94,10 @@ const schemas = computed(() => {
 })
 
 async function addSchema(schema) {
-  console.log('identity.value', identity.value)
+  // console.log('identity.value', identity.value)
   if (!identity.value.additionalFields) identity.value.additionalFields = { objectClasses: [], attributes: {} }
+  if (!identity.value.additionalFields.objectClasses) identity.value.additionalFields.objectClasses = []
+  if (!identity.value.additionalFields.attributes) identity.value.additionalFields.attributes = {}
   identity.value.additionalFields.attributes[schema.name] = {}
   identity.value.additionalFields.objectClasses.push(schema.name)
 }

src/components/quasar-jsonform/util/composition.ts

@@ -114,8 +114,8 @@ export const useQuasarControl = <
   };
 
   // console.log('input.control.value.data', input.control.value.data)
-  if (isEmpty(input.control.value.data)) {
-    input.handleChange(input.control.value.path, input.control.value.schema.default || undefined)
+  if (isEmpty(input.control.value?.data)) {
+    input.handleChange(input.control.value?.path, input.control.value?.schema?.default || undefined)
     // console.log('trigger default', input.control.value.schema.default || null)
   }
 

src/layouts/default.vue

@@ -88,11 +88,20 @@ const identityStateStore = useIdentityStateStore()
 
 const auth = useAuth()
 const config = useAppConfig()
-let orchestratorVersion = ref(null)
-let appManagerVersion = ref(null)
-let daemonVersion = ref(null)
+
+let orchestratorVersion = ref<object | null>(null)
+let appManagerVersion = ref<object | null>(null)
+let daemonVersion = ref<object | null>(null)
+
 
 onMounted(async () => {
+  if (process.env.NODE_ENV === 'development') {
+    orchestratorVersion.value = { currentVersion: '0.0.0-dev', lastVersion: '0.0.0-dev', updateAvailable: false }
+    appManagerVersion.value = { currentVersion: '0.0.0-dev', lastVersion: '0.0.0-dev', updateAvailable: false }
+    daemonVersion.value = { currentVersion: '0.0.0-dev', lastVersion: '0.0.0-dev', updateAvailable: false }
+    return
+  }
+
   const { data: orchestratorVersionRes } = await useHttp<any>('/get-update/sesame-orchestrator')
   const { data: appManagerVersionRes } = await useHttp<any>('/get-update/sesame-app-manager', {
     query: {

src/stores/identityState.ts

@@ -39,57 +39,57 @@ export const useIdentityStateStore = defineStore('identityStates', {
     },
     async fetchTotalCount() {
       try {
-        const { data } = await useHttp('/management/identities/count?limit=99999999');
-        this.total = data.value.data;
+        const { data } = await useHttp<any>('/management/identities/count?limit=99999999');
+        this.total = data.value?.data;
       } catch (error) {
         console.error(error);
       }
     },
 
     async fetchToCompleteCount() {
       try {
-        const { data } = await useHttp(`/management/identities/count?filters[@state][]=${IdentityState.TO_COMPLETE}&limit=99999999`);
-        this[IdentityState.TO_COMPLETE] = data.value.data;
+        const { data } = await useHttp<any>(`/management/identities/count?filters[@state][]=${IdentityState.TO_COMPLETE}&limit=99999999`);
+        this[IdentityState.TO_COMPLETE] = data.value?.data;
       } catch (error) {
         console.error(error);
       }
     },
     async fetchToValidateCount() {
       try {
-        const { data } = await useHttp(`/management/identities/count?filters[@state][]=${IdentityState.TO_VALIDATE}&limit=99999999`);
-        this[IdentityState.TO_VALIDATE] = data.value.data;
+        const { data } = await useHttp<any>(`/management/identities/count?filters[@state][]=${IdentityState.TO_VALIDATE}&limit=99999999`);
+        this[IdentityState.TO_VALIDATE] = data.value?.data;
       } catch (error) {
         console.error(error);
       }
     },
     async fetchOnErrorCount() {
       try {
-        const { data } = await useHttp(`/management/identities/count?filters[@state][]=${IdentityState.ON_ERROR}&limit=99999999`);
-        this[IdentityState.ON_ERROR] = data.value.data;
+        const { data } = await useHttp<any>(`/management/identities/count?filters[@state][]=${IdentityState.ON_ERROR}&limit=99999999`);
+        this[IdentityState.ON_ERROR] = data.value?.data;
       } catch (error) {
         console.error(error);
       }
     },
     async fetchToSyncCount() {
       try {
-        const { data } = await useHttp(`/management/identities/count?filters[@state][]=${IdentityState.TO_SYNC}&limit=99999999`);
-        this[IdentityState.TO_SYNC] = data.value.data;
+        const { data } = await useHttp<any>(`/management/identities/count?filters[@state][]=${IdentityState.TO_SYNC}&limit=99999999`);
+        this[IdentityState.TO_SYNC] = data.value?.data;
       } catch (error) {
         console.error(error);
       }
     },
     async fetchProcessingCount() {
       try {
-        const { data } = await useHttp(`/management/identities/count?filters[@state][]=${IdentityState.PROCESSING}&limit=99999999`);
-        this[IdentityState.PROCESSING] = data.value.data;
+        const { data } = await useHttp<any>(`/management/identities/count?filters[@state][]=${IdentityState.PROCESSING}&limit=99999999`);
+        this[IdentityState.PROCESSING] = data.value?.data;
       } catch (error) {
         console.error(error);
       }
     },
     async fetchSyncedCount() {
       try {
-        const { data } = await useHttp(`/management/identities/count?filters[@state][]=${IdentityState.SYNCED}&limit=99999999`);
-        this[IdentityState.SYNCED] = data.value.data;
+        const { data } = await useHttp<any>(`/management/identities/count?filters[@state][]=${IdentityState.SYNCED}&limit=99999999`);
+        this[IdentityState.SYNCED] = data.value?.data;
       } catch (error) {
         console.error(error);
       }