@7365admin1/layer-common 4.2.0 → 4.2.1-staging.259

package/components/EntryPassMain.vue

@@ -418,6 +418,42 @@
 
             <v-divider />
 
+            <!-- Invitation Note -->
+            <v-col cols="12">
+              <div class="mt-5 pb-5">
+                <div class="d-flex pr-5">
+                  <p class="mr-6 font-weight-medium flex-grow-1">
+                    Invitation Note
+                    <span class="d-block text-caption screen-hint mt-1">
+                      Turning this on appends the text message below as a note
+                      within the contractor's invitation link.
+                    </span>
+                  </p>
+                  <v-switch
+                    color="success"
+                    hide-details
+                    v-model="currentEntryPassSettings.onboardingInvitationNoteEnabled"
+                    @update:modelValue="updateInvitationNoteEnabled()"
+                  />
+                </div>
+                <v-textarea
+                  placeholder="Enter note here"
+                  variant="outlined"
+                  density="comfortable"
+                  rows="4"
+                  no-resize
+                  class="mt-3"
+                  :disabled="!currentEntryPassSettings.onboardingInvitationNoteEnabled"
+                  :error-messages="invitationNoteError"
+                  v-model="currentEntryPassSettings.onboardingInvitationNoteText"
+                  @update:modelValue="invitationNoteError = ''"
+                  @blur="saveInvitationNote()"
+                />
+              </div>
+            </v-col>
+
+            <v-divider />
+
             <!-- Printer Setup -->
             <v-col cols="12">
               <div class="mt-5 pb-5">
@@ -609,6 +645,8 @@ const currentEntryPassSettings = ref<Record<string, any>>({
   onboardingSubText: "",
   onboardingPrinterVendorId: "",
   onboardingPrinterProductId: "",
+  onboardingInvitationNoteEnabled: false,
+  onboardingInvitationNoteText: "",
   status: "",
   createdBy: "",
   updatedBy: "",
@@ -799,6 +837,10 @@ watchEffect(() => {
       onboardingPrinterProductId: data.settings?.onboarding?.printer?.productId
         ? String(data.settings.onboarding.printer.productId)
         : "",
+      onboardingInvitationNoteEnabled:
+        data.settings?.onboarding?.invitationNote?.isEnabled ?? false,
+      onboardingInvitationNoteText:
+        data.settings?.onboarding?.invitationNote?.text ?? "",
       createdAt: data.createdAt ?? "",
       updatedAt: data.updatedAt ?? "",
     };
@@ -844,6 +886,14 @@ function buildPayload() {
           vendorId: Number(currentEntryPassSettings.value.onboardingPrinterVendorId) || null,
           productId: Number(currentEntryPassSettings.value.onboardingPrinterProductId) || null,
         },
+        invitationNote: {
+          isEnabled:
+            currentEntryPassSettings.value.onboardingInvitationNoteEnabled ?? false,
+          // Kept even while the toggle is off - flipping it off is "stop
+          // appending this", not "throw away what I typed", so turning it
+          // back on restores the same note rather than a blank box.
+          text: (currentEntryPassSettings.value.onboardingInvitationNoteText || "").trim(),
+        },
       },
     },
   };
@@ -893,6 +943,43 @@ async function updateOnboardingEnabled() {
   getSiteEntryPassSettings();
 }
 
+/** Blank while the toggle is on means every contractor registration would
+    get an empty note appended - flagged on the field rather than silently
+    saved, mirroring the resident-contractor settings screen. */
+const invitationNoteError = ref("");
+
+function invitationNoteIsValid() {
+  const enabled = currentEntryPassSettings.value.onboardingInvitationNoteEnabled;
+  const text = (currentEntryPassSettings.value.onboardingInvitationNoteText || "").trim();
+  if (enabled && !text) {
+    invitationNoteError.value = "Enter the note to append to the invitation link.";
+    return false;
+  }
+  invitationNoteError.value = "";
+  return true;
+}
+
+async function updateInvitationNoteEnabled() {
+  if (!invitationNoteIsValid()) return;
+  await _save(buildPayload());
+  showMessage("Invitation note updated!", "success");
+  getSiteEntryPassSettings();
+}
+
+// This section has no Save button of its own (the one below it belongs to
+// Printer Setup), so the note text persists on blur - otherwise a site
+// could type a note, flip nothing else, and lose it on navigation.
+async function saveInvitationNote() {
+  if (!invitationNoteIsValid()) return;
+  const saved = getSiteEntryPassSettingsReq.value?.data?.settings?.onboarding
+    ?.invitationNote?.text ?? "";
+  const current = (currentEntryPassSettings.value.onboardingInvitationNoteText || "").trim();
+  if (saved === current) return;
+  await _save(buildPayload());
+  showMessage("Invitation note saved!", "success");
+  getSiteEntryPassSettings();
+}
+
 async function scanOnboardingPrinter() {
   if (!isWebUsbSupported.value) {
     showMessage("Web USB is not supported in this browser", "error");

package/components/InvitationForm.vue

@@ -160,6 +160,15 @@ const props = defineProps({
     type: String,
     default: "",
   },
+  /*
+   * Pre-bind the invitation to one site.
+   *
+   * This prop has been declared since the component was written and was never
+   * read anywhere - `invite.site` was only ever filled by the Site picker. A
+   * caller that already knows the site (onboarding step 6, "Invite Site Admin",
+   * which is about the site created in step 4) had no way to say so. It is
+   * wired to `invite` below.
+   */
   site: {
     type: Object as PropType<TCustomerSite>,
     default: () => ({
@@ -225,17 +234,34 @@ watch(
   () => {
     invite.value.org = props.org || ""
 
-    if (props.hideApp) {
-      invite.value.app = "property_management_agency"
-      return
-    }
-
+    /*
+     * `hideApp` HIDES the App field (see the `v-if` in the template). It also
+     * used to overwrite the value with a literal "property_management_agency",
+     * so a caller that hid the field could not choose what it was hiding, and
+     * every organisation - security, cleaning, landscaping - was invited into
+     * property management. Hiding a field is not the same as deciding it.
+     *
+     * `adminState: false` keeps its existing fallback: that flag is about the
+     * ORGANISATION-admin invitation, which is a separate flow, and changing it
+     * here would move where those members land.
+     */
     invite.value.app = props.adminState
       ? (props.app || "")
       : "property_management_agency"
   },
   { immediate: true }
 )
+
+/* A caller-supplied site wins; the picker still works when there is none. */
+watch(
+  () => props.site,
+  (site) => {
+    if (!site?.site) return
+    invite.value.site = site.site
+    invite.value.siteName = site.name || ""
+  },
+  { immediate: true, deep: true }
+)
 // invite.value.app = props.app;
 // invite.value.org = props.org ?? "";
 

package/package.json

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