@7365admin1/layer-common 4.64.2 → 4.64.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 4.64.4
+
+### Patch Changes
+
+- d47f886: Invite member: when the Role list cannot be loaded (for example no access to the organisation's roles), it says so instead of "No roles have been created for this site yet".
+
+## 4.64.3
+
+### Patch Changes
+
+- ed34f76: Invite member: "Create more" keeps the same app and site, so the Role list after an invitation is the same as before it (it used to switch to the organisation-type roles). When no role exists for the site, the list says so and links to Roles & Permissions.
+
 ## 4.64.2
 
 ### Patch Changes
@@ -1709,11 +1721,11 @@
   `utils/console-tier.ts` + `composables/useConsoleTier.ts` mirror the server's
   own rule from two endpoints the console already calls, unprojected:
 
-                                                                                                                                                                                                                                                                                    GET /api/members/user/:user/app/admin    the Seven365 staff membership
-                                                                                                                                                                                                                                                                                    GET /api/roles/id/:role                  that membership's role document
+                                                                                                                                                                                                                                                                                        GET /api/members/user/:user/app/admin    the Seven365 staff membership
+                                                                                                                                                                                                                                                                                        GET /api/roles/id/:role                  that membership's role document
 
-                                                                                                                                                                                                                                                                                    owner  = member.type === "admin" && role.type === "admin" && role.default === true
-                                                                                                                                                                                                                                                                                    staff  = member.type === "admin" && role.type === "admin"
+                                                                                                                                                                                                                                                                                        owner  = member.type === "admin" && role.type === "admin" && role.default === true
+                                                                                                                                                                                                                                                                                        staff  = member.type === "admin" && role.type === "admin"
 
   `role.default` is the marker because it is the only property of a platform
   staff role no API caller can set - `role.controller.ts` validates create and

package/components/InvitationForm.vue

@@ -53,7 +53,18 @@
                   :rules="[requiredRule]"
                   class="filter-field"
                   density="comfortable"
-                ></v-autocomplete>
+                >
+                  <template #no-data>
+                    <v-list-item data-test="invite-no-roles">
+                      <v-list-item-title class="text-wrap">
+                        {{ noRolesText }}
+                      </v-list-item-title>
+                      <NuxtLink v-if="rolesPageLink && !rolesError" :to="rolesPageLink">
+                        Open Roles &amp; Permissions
+                      </NuxtLink>
+                    </v-list-item>
+                  </template>
+                </v-autocomplete>
               </v-col>
             </v-row>
           </v-col>
@@ -248,6 +259,17 @@ const loading = reactive({
   verifyingEmail: false,
 });
 
+/*
+ * The app this form invites into when it opens. "Create more" resets to THIS,
+ * never to a literal: it used to reset to "organization", so after the first
+ * invitation the Role list switched to the organisation-type roles ("Site
+ * Admin", "Org Admin") and this site's own roles vanished (owner report
+ * 2026-09-28, Wing Tai / The LakeGarden Residences).
+ */
+function initialApp() {
+  return props.adminState ? (props.app || "") : "property_management_agency"
+}
+
 const invite = ref<Record<string, any>>({
   email: "",
   app: "",
@@ -274,9 +296,7 @@ watch(
      * 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"
+    invite.value.app = initialApp()
   },
   { immediate: true }
 )
@@ -454,7 +474,7 @@ const { getInvitableRoles } = useRole();
  * templates are gone from any invitation that names an organisation - the
  * server refuses them there (`core roleInvitable`).
  */
-const { data: RolesData, refresh: refreshRoles } = await useLazyAsyncData(
+const { data: RolesData, refresh: refreshRoles, error: rolesError } = await useLazyAsyncData(
   "get-roles-by-type-" + props.org + "-" + props.app + "-" + fixedSite.value,
   () =>
     getInvitableRoles({
@@ -481,6 +501,27 @@ watchEffect(() => {
 
 const roleOptions = computed(() => inviteRoleOptions(roles.value));
 
+const noRolesText = computed(() =>
+  rolesError?.value
+    ? "The roles could not be loaded. You may not have access to this organisation's roles; refresh, or sign in again."
+    : fixedSite.value
+    ? "No roles have been created for this site yet. Create one in Roles & Permissions first."
+    : "No roles have been created yet. Create one in Roles & Permissions first."
+);
+
+/* This screen's own Roles & Permissions page, when the app has one. */
+const route = useRoute();
+const router = useRouter();
+const rolesPageLink = computed(() => {
+  const path = route.path.replace(/\/invitations(\/.*)?$/, "/roles-permissions");
+  if (path === route.path) return "";
+  try {
+    return router.resolve(path).matched.length ? path : "";
+  } catch {
+    return "";
+  }
+});
+
 async function handleUpdateApp(value: string)  {
   invite.value.role = "";
   if (!fixedSite.value) {
@@ -499,8 +540,11 @@ const message = ref("");
 
 function resetInvite() {
   invite.value.email = "";
-  invite.value.app = "organization";
+  invite.value.app = initialApp();
   invite.value.role = "";
+  // Same site as before: a fixed site stays fixed, a picked one is cleared.
+  invite.value.site = fixedSite.value;
+  if (!invite.value.site) invite.value.siteName = "";
   message.value = "";
 }
 

package/package.json

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