@7365admin1/layer-common 4.97.1-staging.591 → 4.97.1-staging.593

package/components/RolePermissionMain.vue

@@ -68,6 +68,8 @@
           -->
           <!-- "Admin · St. Regis Residences": names are unique per site (2026-10-01) -->
           <template #item.name="{ item }">{{ roleLabel(item) }}</template>
+          <!-- "App" column: plain app name, not the stored code (security_agency) -->
+          <template #item.type="{ item }">{{ roleAppLabel(item.type) }}</template>
           <template #item.scope="{ item }">
             <StatusChip
               :dot="false"
@@ -214,7 +216,7 @@
 
 <script setup lang="ts">
 // Relative import: this layer's `utils/` is not auto-imported into consumers.
-import { roleLabel, safeReturnTo, showSiteField, sitePickerRoleLabel } from "../utils/role";
+import { roleAppLabel, roleLabel, safeReturnTo, showSiteField, sitePickerRoleLabel } from "../utils/role";
 import { holdsPermission } from "../utils/permission-spellings";
 import { countRealPermissions } from "../utils/security-catalogue";
 import {

package/components/ScheduleTaskForm.vue

@@ -2,7 +2,7 @@
   ADD / EDIT AN EXTRA CHECK - four short steps: What, Where, When, Who is told.
 
   The last step shows one sentence saying exactly what will be created
-  ("Adds 1 extra check to 3 areas (24 units) at 08:00 every weekday ... next:
+  ("Adds 1 extra check to each of 3 areas (24 units) at 08:00 every weekday ... next:
   Wed 21 Oct"). The form checks what the server checks (utils/schedule-task.ts)
   so a schedule that would never run is caught before saving; whatever the
   server still refuses is shown in its own words.
@@ -85,8 +85,10 @@
             <v-stepper-window-item :value="2">
               <div class="st-step">
                 <p class="st-step__help">
-                  Pick the areas to check. Every unit in a picked area gets
-                  one more tick box on the Daily Checklist for this check.
+                  Pick the areas to check. Each time this check is due, every
+                  picked area gets exactly one extra round on the Daily
+                  Checklist (one more tick box per unit) - one round, however
+                  many normal visits the area has each day.
                 </p>
                 <InputLabel for="selected-areas" title="Areas" required />
                 <v-select

package/components/ScheduleTaskMain.vue

@@ -16,9 +16,11 @@
             that.
           </li>
           <li>
-            An <strong>extra check</strong> adds one more round of ticks to
-            that checklist, in the areas you pick, at the time you set - once,
-            or repeating (every day, weekdays, chosen days, or monthly).
+            An <strong>extra check</strong> adds exactly one more round of
+            ticks to that checklist each time it is due, in the areas you pick,
+            at the time you set - once, or repeating (every day, weekdays,
+            chosen days, or monthly). One extra check is one round per area,
+            however many normal visits that area has each day.
           </li>
           <li>
             At that time, staff get a phone notification and see the extra

package/components/SubscriptionPlanTable.vue

@@ -163,7 +163,11 @@
                   "
                   value="toggle-status"
                   class="text-body-2"
-                  @click="togglePlanStatus(item)"
+                  @click="
+                    item.status === 'active'
+                      ? (planToDeactivate = item)
+                      : togglePlanStatus(item)
+                  "
                 />
               </v-list>
             </v-card>
@@ -197,6 +201,32 @@
       />
     </v-dialog>
 
+    <ConfirmDialog
+      :model-value="!!planToDeactivate"
+      @update:model-value="(v: boolean) => { if (!v) planToDeactivate = null; }"
+    >
+      <template #title>Deactivate plan</template>
+      <template #description>
+        Deactivate {{ planToDeactivate?.name || "this plan" }}? You can activate
+        it again from the Deactivated tab.
+      </template>
+      <template #footer>
+        <v-spacer />
+        <v-btn
+          variant="outlined"
+          :disabled="isDeactivating"
+          @click="planToDeactivate = null"
+          >Cancel</v-btn
+        >
+        <v-btn
+          color="error"
+          variant="flat"
+          :loading="isDeactivating"
+          @click="confirmDeactivate"
+          >Deactivate</v-btn
+        >
+      </template>
+    </ConfirmDialog>
     <Snackbar v-model="messageSnackbar" :text="message" :color="messageColor" />
   </v-container>
 </template>
@@ -417,6 +447,20 @@ async function handleSubmit(payload: PlanFormState) {
   }
 }
 
+// Deactivate asks first; Activate stays one tap.
+const planToDeactivate = ref<SubscriptionPlan | null>(null);
+const isDeactivating = ref(false);
+async function confirmDeactivate() {
+  if (!planToDeactivate.value) return;
+  isDeactivating.value = true;
+  try {
+    await togglePlanStatus(planToDeactivate.value);
+  } finally {
+    isDeactivating.value = false;
+    planToDeactivate.value = null;
+  }
+}
+
 async function togglePlanStatus(plan: SubscriptionPlan) {
   const nextStatus = plan.status === "active" ? "deactive" : "active";
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "4.97.1-staging.591",
+  "version": "4.97.1-staging.593",
   "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.",

package/utils/role.ts

@@ -158,3 +158,27 @@ export function siteAccessLabel(item: { limitedTo?: unknown } | null | undefined
   const names = limitedSites(item).map((l) => l.siteName || "a site");
   return names.length ? `Limited to: ${names.join(", ")}` : "All sites";
 }
+
+/**
+ * A role's `type` is the app it belongs to, stored as a code
+ * (`security_agency`). The roles table shows the app's plain name instead.
+ * An unknown code is shown with its underscores as spaces, never dropped.
+ */
+const ROLE_APP_LABELS: Readonly<Record<string, string>> = Object.freeze({
+  admin: "Super Admin",
+  organization: "Organization",
+  property_management_agency: "Property Management",
+  security_agency: "Security",
+  cleaning_services: "Cleaning",
+  mechanical_electrical_services: "Mechanical & Electrical",
+  pest_control_services: "Pest Control",
+  pool_maintenance_services: "Pool Maintenance",
+  landscaping_services: "Landscape",
+  resident: "Resident",
+});
+
+export function roleAppLabel(type: unknown): string {
+  const code = String(type ?? "").trim();
+  if (!code) return "";
+  return ROLE_APP_LABELS[code] ?? code.replace(/_/g, " ").replace(/^./, (c) => c.toUpperCase());
+}

package/utils/schedule-task.ts

@@ -268,7 +268,8 @@ export function buildSummary(
   now: Date = new Date(),
 ): string {
   const year = sgtParts(now).date.slice(0, 4);
-  const areas = `${f.areaCount} area${f.areaCount === 1 ? "" : "s"}`;
+  // One extra check = exactly one more round per picked area each time it runs (not one per normal visit).
+  const areas = f.areaCount === 1 ? "1 area" : `each of ${f.areaCount} areas`;
   const units = `${unitCount} unit${unitCount === 1 ? "" : "s"}`;
   const next = nextRunDate(f, now);
   const nextText = next ? `${DAYS[weekdayOf(next)]} ${fmtDate(next, year)}` : "never";