@7365admin1/layer-common 4.35.1-staging.450 → 4.35.1-staging.451

package/components/BuildingUnitManagement.vue

@@ -75,8 +75,8 @@
         </v-toolbar>
         <v-card-text>
           <p class="text-caption mb-3">
-            Only active {{ adding === "members" ? "members" : "service providers" }} that are not assigned to a unit
-            yet are listed.
+            Only active {{ adding === "members" ? "members" : "service provider people" }} that are not assigned to a
+            unit yet are listed.
           </p>
           <v-autocomplete v-model="selected" v-model:search="candidateSearch" :items="candidates"
             :loading="candidatesLoading" item-title="name" item-value="_id" multiple chips closable-chips
@@ -103,12 +103,22 @@
 <script setup lang="ts">
 /**
  * A building unit's Management tab: the management members and the service
- * providers attached to this unit. Each can be on one unit at a time, and
- * only while active - the server detaches them the moment they are suspended,
- * set inactive or deleted, so they simply drop off this list.
+ * provider people (Members > Service Providers, not the provider companies)
+ * attached to this unit. Each can be on one unit at a time, and only while
+ * active - the server detaches them the moment they are suspended or deleted,
+ * so they simply drop off this list.
  */
 type TSection = "members" | "providers";
-type TRow = { _id: string; name: string; email?: string; roleName?: string; type?: string };
+type TRow = {
+  _id: string;
+  name: string;
+  email?: string;
+  roleName?: string;
+  type?: string;
+  company?: string;
+  role?: string;
+  status?: string;
+};
 
 const props = defineProps({
   unitId: {
@@ -136,7 +146,7 @@ const org = computed(() => (route.params.org as string) ?? "");
 const site = computed(() => props.siteId || ((route.params.site as string) ?? ""));
 
 const { getAll: getMembers, updateMemberUnit } = useMember();
-const { getAll: getProviders, updateUnit: updateProviderUnit } = useServiceProvider();
+const { getSiteMembers: getProviderPeople, updateSiteMemberUnit: updateProviderUnit } = useServiceProvider();
 const { debounce } = useUtils();
 
 const panels = ref<TSection[]>(["members", "providers"]);
@@ -147,8 +157,17 @@ function membersQuery(unit: string, search = "") {
   return getMembers({ org: org.value, siteId: site.value, type: props.managementType, status: "active", unit, search, limit: 50 });
 }
 
-function providersQuery(unit: string, search = "") {
-  return getProviders({ siteId: site.value, status: "active", unit, search, limit: 50 });
+/**
+ * The site's provider people on `unit`, active only. The endpoint returns the
+ * whole list (no paging or search), so `search` is matched here.
+ */
+async function providersQuery(unit: string, search = "") {
+  const res = await getProviderPeople(site.value, unit);
+  const q = search.toLowerCase();
+  const items = (res?.items ?? []).filter(
+    (p) => p.status === "active" && (!q || [p.name, p.email, p.company].some((v) => v?.toLowerCase().includes(q))),
+  );
+  return { items };
 }
 
 const { data: memberRes, pending: membersLoading, refresh: refreshMembers } = useLazyAsyncData(
@@ -161,7 +180,9 @@ const { data: providerRes, pending: providersLoading, refresh: refreshProviders
 );
 
 function subtitleOf(row: TRow) {
-  return [row.roleName || row.type?.replace(/_/g, " "), row.email].filter(Boolean).join(" · ");
+  return [row.company, row.roleName || row.role || row.type?.replace(/_/g, " "), row.email]
+    .filter(Boolean)
+    .join(" · ");
 }
 
 const sections = computed(() => [

package/composables/useServiceProvider.ts

@@ -15,6 +15,9 @@ export type TSiteProviderMember = {
   lastLoginAt?: string | null;
   /** a subcontractor: the provider that brought its company onto the site */
   invitedVia?: string;
+  /** The building unit this person is attached to (a unit's Management tab). */
+  unit?: string | null;
+  unitName?: string;
 };
 
 export type TSiteProviderCompany = {
@@ -307,17 +310,29 @@ export default function useServiceProvider() {
    * Members > Service Providers: the provider people with access to this
    * site, and one entry per provider company with its head count. The
    * site's own organisation only - the server refuses anyone else.
+   * `unit`: a building unit id, or "none" (people on no unit yet).
    */
-  function getSiteMembers(siteId: string): Promise<{
+  function getSiteMembers(siteId: string, unit = ""): Promise<{
     items: TSiteProviderMember[];
     companies: TSiteProviderCompany[];
   }> {
     return useNuxtApp().$api("/api/service-providers/site-members", {
       method: "GET",
-      query: { siteId },
+      query: { siteId, ...(unit ? { unit } : {}) },
     });
   }
 
+  /** Attach one of those people to a building unit, or detach them (`unit` ""). */
+  function updateSiteMemberUnit(id: string, unit: string) {
+    return useNuxtApp().$api<Record<string, any>>(
+      `/api/service-providers/site-members/${id}/unit`,
+      {
+        method: "PATCH",
+        body: { unit },
+      }
+    );
+  }
+
   /** The same list as an Excel file, under the same filters. */
   function exportSiteMembers(
     siteId: string,
@@ -334,6 +349,7 @@ export default function useServiceProvider() {
 
   return {
     getSiteMembers,
+    updateSiteMemberUnit,
     exportSiteMembers,
     serviceProviders,
     serviceProvider,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.35.1-staging.450",
+  "version": "4.35.1-staging.451",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "//files": "What a consumer extending this layer actually loads. Without this npm ships the whole working tree - the changesets, the CI workflows, the render harness in tools/ and any scratch directory that happened to exist at publish time. Nuxt resolves a layer by directory, so every runtime directory below has to stay listed; adding a new top-level runtime directory means adding it here too.",