@7365admin1/core 3.54.0 → 3.55.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/core
 
+## 3.55.0
+
+### Minor Changes
+
+- 8cbae97: Notification settings: deliver the marketplace in-app messages, and stop offering a channel that cannot deliver.
+
+  `NotificationModule` was missing the two tags `iservice365-API-core` sends for marketplace orders, so every in-app marketplace notification failed validation and was dropped inside the `catch` around the persist — the push arrived, the message never reached the app, and the "In the app" switch governed something that never happened. Both tags are now accepted; no other tag changed.
+
+  `GET /notification-preferences` now sends only the channels a category can actually deliver on. Email has no sender anywhere in the estate, so the screen was drawing a switch that could not move beside a sentence apologising for it, and then counting the two that could as "on everywhere". Every client renders what the server sends, so the dead row disappears from the web screen and both mobile screens at once. Where the reason was something a person actually needs — a booking confirmation goes to the address on the form — it is now said in the category's own description.
+
+  No stored preference changes, and no notification that was being delivered stops.
+
 ## 3.54.0
 
 ### Minor Changes

package/dist/index.d.ts

@@ -12911,6 +12911,8 @@ declare enum NotificationModule {
     FACILITY_BOOKING = "facilityBooking",
     ONLINE_FORM = "onlineForm",
     PRELOVED_MARKETPLACE = "prelovedMarketplace",
+    MARKETPLACE_ORDER = "marketplace-order",
+    MARKETPLACE_VENDOR_ORDER = "marketplace-vendor-order",
     INCIDENT_REPORT = "incidentReport",
     EMERGENCY_CONTACT = "emergencyContact",
     VIRTUAL_PATROL = "virtualPatrol",
@@ -13477,10 +13479,16 @@ declare class NotificationService {
  *
  * ## Channels are declared per category, not assumed
  *
- * `channels` says what this category can *physically* deliver on today. The
- * screen draws every channel for every category and dims the ones that cannot
- * deliver, with the reason in `channelNote` — the house pattern is to show a
- * control and explain why it is unavailable, never to hide it.
+ * `channels` says what this category can *physically* deliver on today, and it
+ * is what the settings screen is built from: `getForUser` sends only the
+ * channels a category can actually use, so a person is never shown a switch
+ * that will not move. `channelNote` is the reason a channel is off, kept here
+ * for whoever reads this file and pinned by a test — it is not sent to a
+ * client, because an apology beside a dead control is not a setting.
+ *
+ * Where the reason is something a person actually needs (a booking
+ * confirmation goes to the address on the form), it is said in the category's
+ * own `description`, which the screen does show.
  *
  * Email is `false` everywhere for a real reason: the module emails this system
  * sends are addressed to an email string stored on a record (a booking's
@@ -13671,10 +13679,12 @@ type NotificationPreferenceView = {
         channels: Array<{
             key: string;
             label: string;
-            /** false = drawn, dimmed, and not switchable */
+            /**
+             * Always true. Only channels this category can really deliver on are
+             * sent at all; the field stays so a client written against the older
+             * shape, which filtered on it, keeps working unchanged.
+             */
             supported: boolean;
-            /** plain-English reason, present only when unsupported */
-            note?: string;
             enabled: boolean;
         }>;
     }>;

package/dist/index.js

@@ -14316,6 +14316,8 @@ var NotificationModule = /* @__PURE__ */ ((NotificationModule2) => {
   NotificationModule2["FACILITY_BOOKING"] = "facilityBooking";
   NotificationModule2["ONLINE_FORM"] = "onlineForm";
   NotificationModule2["PRELOVED_MARKETPLACE"] = "prelovedMarketplace";
+  NotificationModule2["MARKETPLACE_ORDER"] = "marketplace-order";
+  NotificationModule2["MARKETPLACE_VENDOR_ORDER"] = "marketplace-vendor-order";
   NotificationModule2["INCIDENT_REPORT"] = "incidentReport";
   NotificationModule2["EMERGENCY_CONTACT"] = "emergencyContact";
   NotificationModule2["VIRTUAL_PATROL"] = "virtualPatrol";
@@ -14770,7 +14772,7 @@ var NOTIFICATION_CATEGORIES = [
   {
     key: "facilityBooking",
     label: "Facility Bookings",
-    description: "When a facility booking is made or its status changes.",
+    description: "When a facility booking is made or its status changes. The confirmation email goes to the address entered on the booking form itself.",
     channels: { inApp: true, push: true, email: false },
     channelNote: {
       email: "Booking confirmations go to the email address entered on the booking form itself. To change where a confirmation lands, change that address when the booking is made."
@@ -14782,7 +14784,7 @@ var NOTIFICATION_CATEGORIES = [
   {
     key: "visitors",
     label: "Visitors",
-    description: "When a visitor you invited checks in or checks out.",
+    description: "When a visitor you invited checks in or checks out. The invitation email goes to the address entered for the visitor.",
     channels: { inApp: true, push: true, email: false },
     channelNote: {
       email: "Visitor invitations go to the email address entered for the visitor when they are invited. To change where one lands, change that address on the invitation."
@@ -14856,7 +14858,7 @@ var NOTIFICATION_CATEGORIES = [
   {
     key: "serviceProviderInvite",
     label: "Service Provider Invitations",
-    description: "When a property manager invites your company to provide services at a site.",
+    description: "When a property manager invites your company to provide services at a site. The invitation email is the invitation itself and is always sent to the address it was addressed to; these settings control the copy that reaches you inside the app.",
     channels: { inApp: true, push: true, email: false },
     channelNote: {
       email: "The invitation email is the invitation itself \u2014 for a company that has no account here yet it is the only copy, so it is always sent to the address the invitation was addressed to. The switches above control the copy that reaches you inside the app."
@@ -92003,8 +92005,10 @@ function useNotificationPreferenceService() {
       categoriesForUser(id)
     ]);
     const isOff = (category, channel) => off.some((o) => o.category === category && o.channel === channel);
+    const supportedIn = (category) => NOTIFICATION_CHANNELS.filter((channel) => category.channels[channel]);
+    const offered = new Set(categories.flatMap((c) => supportedIn(c)));
     return {
-      channels: NOTIFICATION_CHANNELS.map((c) => ({
+      channels: NOTIFICATION_CHANNELS.filter((c) => offered.has(c)).map((c) => ({
         key: c,
         label: NOTIFICATION_CHANNEL_LABELS[c]
       })),
@@ -92013,16 +92017,14 @@ function useNotificationPreferenceService() {
         label: category.label,
         description: category.description,
         safety: Boolean(category.safety),
-        channels: NOTIFICATION_CHANNELS.map((channel) => {
-          const supported = category.channels[channel];
-          return {
-            key: channel,
-            label: NOTIFICATION_CHANNEL_LABELS[channel],
-            supported,
-            note: supported ? void 0 : category.channelNote?.[channel],
-            enabled: supported && !isOff(category.key, channel)
-          };
-        })
+        channels: supportedIn(category).map((channel) => ({
+          key: channel,
+          label: NOTIFICATION_CHANNEL_LABELS[channel],
+          // kept so a client written against the old shape still filters
+          // correctly; every channel sent is now a supported one.
+          supported: true,
+          enabled: !isOff(category.key, channel)
+        }))
       }))
     };
   }