@7365admin1/layer-common 1.11.43 → 1.11.45

package/components/SlideCardGroup.vue

@@ -14,7 +14,7 @@
           :class="['ma-1', isSelected && 'selected']"
           width="150"
           height="100"
-          @click="clickable && emit('onClickCarousel', data.path)"
+          @click="clickable && emit('onClickCarousel', data)"
           class="rounded-lg border-thin"
           border=" opacity-50 thin "
         >

package/components/TableV3.vue

@@ -0,0 +1,179 @@
+<template>
+  <v-card
+    width="100%"
+    variant="outlined"
+    border="thin"
+    rounded="lg"
+    :loading="loading"
+    class="table-v3"
+  >
+    <v-toolbar density="compact" color="grey-lighten-5">
+      <template #prepend>
+        <v-btn
+          icon
+          variant="text"
+          density="comfortable"
+          class="table-v3__refresh-btn"
+          @click="emit('refresh')"
+        >
+          <v-icon size="28" color="black">mdi-history</v-icon>
+        </v-btn>
+      </template>
+
+      <template #append>
+        <v-row no-gutters justify="end" align="center">
+          <span class="mr-2 text-caption text-fontgray">
+            {{ pageRange }}
+          </span>
+          <v-btn
+            icon="mdi-chevron-left"
+            variant="text"
+            density="comfortable"
+            :disabled="!canGoPrev"
+            @click="goPrev"
+          />
+          <v-btn
+            icon="mdi-chevron-right"
+            variant="text"
+            density="comfortable"
+            :disabled="!canGoNext"
+            @click="goNext"
+          />
+        </v-row>
+      </template>
+    </v-toolbar>
+
+    <v-data-table
+      :headers="headers"
+      :items="items"
+      :item-value="itemValue"
+      :items-per-page="itemsPerPage"
+      fixed-header
+      hide-default-footer
+      :style="`max-height: calc(100vh - (${offset}px))`"
+      @click:row="(_: any, data: any) => emit('row-click', data.item)"
+    >
+      <template v-for="(_, slotName) in $slots" #[slotName]="slotProps">
+        <slot :name="slotName" v-bind="slotProps" />
+      </template>
+    </v-data-table>
+
+    <v-toolbar density="compact" color="grey-lighten-5" class="table-v3__footer">
+      <template #append>
+        <v-row no-gutters justify="end" align="center">
+          <span class="mr-2 text-caption text-fontgray">
+            {{ pageRange }}
+          </span>
+          <v-btn
+            icon="mdi-chevron-left"
+            variant="text"
+            density="comfortable"
+            :disabled="!canGoPrev"
+            @click="goPrev"
+          />
+          <v-btn
+            icon="mdi-chevron-right"
+            variant="text"
+            density="comfortable"
+            :disabled="!canGoNext"
+            @click="goNext"
+          />
+        </v-row>
+      </template>
+    </v-toolbar>
+  </v-card>
+</template>
+
+<script setup lang="ts">
+const props = defineProps({
+  headers: {
+    type: Array as PropType<Array<Record<string, any>>>,
+    required: true,
+  },
+  items: {
+    type: Array as PropType<Array<Record<string, any>>>,
+    default: () => [],
+  },
+  loading: {
+    type: Boolean,
+    default: false,
+  },
+  itemValue: {
+    type: String,
+    default: "_id",
+  },
+  itemsPerPage: {
+    type: Number,
+    default: 20,
+  },
+  page: {
+    type: Number,
+    default: 1,
+  },
+  pages: {
+    type: Number,
+    default: 0,
+  },
+  pageRange: {
+    type: String,
+    default: "-- - -- of --",
+  },
+  offset: {
+    type: Number,
+    default: 220,
+  },
+});
+
+const emit = defineEmits(["refresh", "update:page", "row-click"]);
+
+const internalPage = ref(props.page);
+const canGoPrev = computed(() => internalPage.value > 1);
+const canGoNext = computed(
+  () => props.pages > 0 && internalPage.value < props.pages
+);
+
+function goPrev() {
+  if (!canGoPrev.value) {
+    return;
+  }
+  internalPage.value -= 1;
+  emit("update:page", internalPage.value);
+}
+
+function goNext() {
+  if (!canGoNext.value) {
+    return;
+  }
+  internalPage.value += 1;
+  emit("update:page", internalPage.value);
+}
+
+watch(
+  () => props.page,
+  (val) => {
+    internalPage.value = val;
+  }
+);
+</script>
+
+<style scoped>
+.table-v3 :deep(thead th) {
+  background-color: #f5f5f5;
+  color: #6b7280;
+  font-weight: 600 !important;
+  font-size: 12px;
+}
+
+.table-v3 :deep(tbody td) {
+  height: 54px;
+}
+
+.table-v3__footer {
+  border-top: 1px solid rgba(0, 0, 0, 0.08);
+}
+
+.table-v3__refresh-btn {
+  width: 38px;
+  height: 38px;
+}
+</style>

package/composables/useOrg.ts

@@ -171,7 +171,14 @@ export default function useOrg() {
         ) as TOrg;
       });
   }
-
+  function getOrgsByEmail(email = "") {
+    return useNuxtApp().$api<TOrg[]>(
+      `/api/organizations/orgs/${email}`,
+      {
+        method: "GET",
+      }
+    );
+  }
 
   return {
     org,
@@ -189,5 +196,6 @@ export default function useOrg() {
     add,
     addOnboardingOrg,
     updateOrg,
+    getOrgsByEmail
   };
 }

package/composables/useOrganizationSwitcher.ts

@@ -0,0 +1,11 @@
+export default function useOrganizationSwitcher() {
+  const selectedOrg = useState<any | null>('selected-org', () => null)
+  const selectedApp = useState<string>('selected-app', () => '')
+
+  function setOrganization({ org, app }: { org: any; app: string }) {
+    selectedOrg.value = org
+    selectedApp.value = app || org?.nature || ''
+  }
+
+  return { selectedOrg, selectedApp, setOrganization }
+}

package/composables/useServiceProvider.ts

@@ -57,10 +57,19 @@ export default function useServiceProvider() {
     serviceProviderOrgId = "",
     orgId = "",
     siteId = "",
+    status = "",
   } = {}) {
     return useNuxtApp().$api<Record<string, any>>("/api/service-providers", {
       method: "GET",
-      query: { page, search, limit, serviceProviderOrgId, orgId, siteId },
+      query: {
+        page,
+        search,
+        limit,
+        serviceProviderOrgId,
+        orgId,
+        siteId,
+        ...(status ? { status } : {}),
+      },
     });
   }
 
@@ -128,32 +137,36 @@ export default function useServiceProvider() {
 
   async function createServiceProviderInvite({
     email,
+    name = "",
+    app = "",
+    role = "",
     orgId,
     siteId,
     siteName,
   }: {
     email: string;
+    name?: string;
+    app?: string;
+    role?: string;
     orgId: string;
     siteId: string;
     siteName: string;
   }) {
-    try {
-     const res =  await useNuxtApp().$api<Record<string, any>>(
-        "/api/auth/invite/service-provider",
-        {
-          method: "POST",
-           body: {
-      email,
-      orgId,
-      siteId,
-      siteName,
-    },
-        }
-      );
-       console.log(">>> response:", res);
-    } catch (err) {
-      console.error("Error creating service provider invite:", err);
-    }
+    return useNuxtApp().$api<Record<string, any>>(
+      "/api/auth/invite/service-provider/with-org",
+      {
+        method: "POST",
+        body: {
+          email,
+          name,
+          app,
+          role,
+          orgId,
+          siteId,
+          siteName,
+        },
+      }
+    );
   }
 
   async function invite({
@@ -211,6 +224,16 @@ export default function useServiceProvider() {
     );
   }
 
+  async function updateStatus(id: string, status: "active" | "inactive") {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/service-providers/${id}/status`,
+      {
+        method: "PATCH",
+        body: { status },
+      }
+    );
+  }
+
   return {
     serviceProviders,
     serviceProvider,
@@ -228,5 +251,6 @@ export default function useServiceProvider() {
     invite,
     add,
     addViaInvite,
+    updateStatus,
   };
 }

package/composables/useUser.ts

@@ -14,36 +14,36 @@ export default function useUser() {
     });
   }
 
-function inviteUserClient({
-  email = '',
-  app = [],
-  role = '',
-  name = '',
-  org = '',
-  site = '',
-  siteName = ''
-}: {
-  email?: string
-  app?: string[]
-  role?: string
-  name?: string
-  org?: string
-  site?: string
-  siteName?: string
-} = {}) {
-  return useNuxtApp().$api<Record<string, any>>('/api/auth/invite/user', {
-    method: 'POST',
-    body: {
-      email,
-      app,
-      role,
-      name,
-      org,
-      ...(site && { siteId: site }),
-      ...(siteName && { siteName })
-    }
-  })
-}
+  function inviteUserClient({
+    email = '',
+    app = [],
+    role = '',
+    name = '',
+    org = '',
+    site = '',
+    siteName = ''
+  }: {
+    email?: string
+    app?: string[]
+    role?: string
+    name?: string
+    org?: string
+    site?: string
+    siteName?: string
+  } = {}) {
+    return useNuxtApp().$api<Record<string, any>>('/api/auth/invite/user', {
+      method: 'POST',
+      body: {
+        email,
+        app,
+        role,
+        name,
+        org,
+        ...(site && { siteId: site }),
+        ...(siteName && { siteName })
+      }
+    })
+  }
 
   function inviteMemberClient({
     email = "",
@@ -168,6 +168,11 @@ function inviteUserClient({
       method: "GET"
     });
   }
+  function getUserByEmailV2(email = "") {
+    return useNuxtApp().$api<Record<string, any>>(`/api/users/user/${email}`, {
+      method: "GET"
+    });
+  }
 
   return {
     inviteUser,
@@ -183,6 +188,7 @@ function inviteUserClient({
     getById,
     createUserByVerification,
     getUserByEmail,
+    getUserByEmailV2,
     inviteUserClient,
     inviteMemberClient
   };

package/composables/useVerification.ts

@@ -5,7 +5,10 @@ export default function useVerification() {
     search = "",
     page = 1,
     email = "",
-    app = ""
+    app = "",
+    siteId = "",
+    orgId = "",
+    limit = 20,
   } = {}): Promise<{
     items: TMiniVerification[];
     pages: number;
@@ -13,7 +16,7 @@ export default function useVerification() {
   }> {
     return useNuxtApp().$api("/api/verifications", {
       method: "GET",
-      query: { status, search, page, type, email, app },
+      query: { status, search, page, type, email, app, siteId, orgId, limit },
     });
   }
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.11.43",
+  "version": "1.11.45",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {