@controleonline/ui-common 1.2.87 → 1.2.89

package/src/react/utils/runtimeZoom.js

@@ -22,7 +22,10 @@ export const normalizeRuntimeZoomPercent = value => {
 export const resolveRuntimeZoomScale = value =>
   normalizeRuntimeZoomPercent(value) / 100;
 
-export const buildRuntimeZoomStyle = (value, {isWeb = false} = {}) => {
+export const buildRuntimeZoomStyle = (
+  value,
+  {isWeb = false, viewport = null} = {},
+) => {
   const scale = resolveRuntimeZoomScale(value);
 
   if (scale === 1) {
@@ -33,11 +36,32 @@ export const buildRuntimeZoomStyle = (value, {isWeb = false} = {}) => {
     return {zoom: scale};
   }
 
-  const inverseSize = `${100 / scale}%`;
+  const inverseScale = 1 / scale;
+  const nativeBase = {
+    transform: [{scale}],
+    transformOrigin: 'top left',
+    alignSelf: 'flex-start',
+  };
+
+  const viewportWidth = Number(viewport?.width);
+  const viewportHeight = Number(viewport?.height);
+
+  if (
+    Number.isFinite(viewportWidth) &&
+    Number.isFinite(viewportHeight) &&
+    viewportWidth > 0 &&
+    viewportHeight > 0
+  ) {
+    return {
+      ...nativeBase,
+      width: viewportWidth * inverseScale,
+      height: viewportHeight * inverseScale,
+    };
+  }
 
   return {
-    height: inverseSize,
-    transform: [{scale}],
-    width: inverseSize,
+    ...nativeBase,
+    width: `${100 * inverseScale}%`,
+    height: `${100 * inverseScale}%`,
   };
 };

package/src/react/utils/shopFranchises.js

@@ -8,17 +8,108 @@ import {normalizeShopEntityId} from '@controleonline/ui-common/src/react/utils/s
 export const SHOP_FRANCHISE_LINK_TYPE = 'franchisee';
 export const SHOP_FRANCHISE_PAGE_SIZE = 50;
 
+/** people.enable must be 1/true for franchise to appear in settings Maps list (#815). */
+export const isPeopleEnabled = people => {
+  if (!people || typeof people !== 'object') {
+    return false;
+  }
+  // API may expose enable or enabled (GeneralTab uses both).
+  const value = people.enable ?? people.enabled;
+  if (value === true || value === 1 || value === '1') {
+    return true;
+  }
+  if (value === false || value === 0 || value === '0') {
+    return false;
+  }
+  return false;
+};
+
+/** Load people.enable from API so people_links embeds without enable are accurate (#815). */
+const hydratePeopleEnableFlags = async companies => {
+  const list = Array.isArray(companies) ? companies : [];
+  const hydrated = await Promise.all(
+    list.map(async company => {
+      const peopleId = normalizeShopEntityId(company);
+      if (!peopleId) {
+        return company;
+      }
+      // Always read enable from people table — people_links embed can be stale/wrong (#815)
+      try {
+        const person = await api.fetch(`people/${peopleId}`);
+        if (person && typeof person === 'object') {
+          return {
+            ...company,
+            enable: person.enable ?? person.enabled,
+            enabled: person.enabled ?? person.enable,
+          };
+        }
+      } catch (_) {}
+      return company;
+    }),
+  );
+  return hydrated;
+};
+
+
 const normalizeItemsPerPage = value =>
   Math.max(1, Math.min(SHOP_FRANCHISE_PAGE_SIZE, Number(value) || SHOP_FRANCHISE_PAGE_SIZE));
 
-const normalizeFranchiseDirectoryItem = company => ({
-  ...company,
-  shopAddresses: Array.isArray(company?.shopAddresses)
+const parseCoordValue = value => {
+  if (value === null || value === undefined || value === '') {
+    return null;
+  }
+  const n = Number(value);
+  return Number.isFinite(n) ? n : null;
+};
+
+/** Coords may live on the address root or under address.map (API / DefaultAddress). */
+export const resolveFranchiseAddressCoords = address => {
+  if (!address || typeof address !== 'object') {
+    return {latitude: null, longitude: null};
+  }
+  const latitude = parseCoordValue(
+    address.latitude ??
+      address.lat ??
+      address?.map?.latitude ??
+      address?.map?.lat ??
+      address?.geo?.latitude,
+  );
+  const longitude = parseCoordValue(
+    address.longitude ??
+      address.lng ??
+      address.lon ??
+      address?.map?.longitude ??
+      address?.map?.lng ??
+      address?.map?.lon ??
+      address?.geo?.longitude,
+  );
+  return {latitude, longitude};
+};
+
+const normalizeFranchiseAddress = address => {
+  if (!address || typeof address !== 'object') {
+    return address;
+  }
+  const {latitude, longitude} = resolveFranchiseAddressCoords(address);
+  return {
+    ...address,
+    latitude,
+    longitude,
+  };
+};
+
+const normalizeFranchiseDirectoryItem = company => {
+  const rawAddresses = Array.isArray(company?.shopAddresses)
     ? company.shopAddresses
     : Array.isArray(company?.address)
       ? company.address
-      : [],
-});
+      : [];
+
+  return {
+    ...company,
+    shopAddresses: rawAddresses.map(normalizeFranchiseAddress),
+  };
+};
 
 const sortByLabel = (left, right) =>
   String(left || '')
@@ -162,6 +253,10 @@ export const resolveFranchiseCompanyLabel = company =>
  */
 export const extractFranchiseCompanyFromLink = (link, viewerCompanyId) => {
   const viewerId = normalizeShopEntityId(viewerCompanyId);
+  if (!viewerId || link?.linkType !== SHOP_FRANCHISE_LINK_TYPE) {
+    return null;
+  }
+
   const companySide = link?.company;
   const peopleSide = link?.people;
   const companyId = normalizeShopEntityId(companySide);
@@ -173,8 +268,11 @@ export const extractFranchiseCompanyFromLink = (link, viewerCompanyId) => {
   if (viewerId && peopleId === viewerId) {
     return companySide;
   }
-  // Fallback: franchisee is typically the `people` side of linkType=franchisee.
-  return peopleSide || companySide || null;
+
+  // Never trust an API response that does not prove the current company is
+  // one side of the link. This prevents a broad/ignored people_links filter
+  // from leaking another tenant's franchise or its addresses.
+  return null;
 };
 
 const fetchFranchiseLinksPage = async ({
@@ -189,13 +287,23 @@ const fetchFranchiseLinksPage = async ({
     return [];
   }
 
+  // Align with FranchiseLinksTab (ui-customers): numeric company/people id + enable.
   const params = {
     page: Math.max(1, Number(page) || 1),
     itemsPerPage: normalizeItemsPerPage(itemsPerPage),
-    linkType: SHOP_FRANCHISE_LINK_TYPE,
-    [side]: toEntityIri(id, 'people'),
+    // linkType must be array — API rejects string
+    // Do NOT filter enable=true: many franchisee rows omit/null enable and would vanish (staging company=1 had 4 franchisees, 0 with enable=true).
+    linkType: [String(SHOP_FRANCHISE_LINK_TYPE)],
   };
 
+  if (side === 'company') {
+    params.company = id;
+  } else if (side === 'people') {
+    params.people = id;
+  } else {
+    params[side] = toEntityIri(id, 'people');
+  }
+
   if (String(search || '').trim()) {
     params.search = String(search).trim();
   }
@@ -221,8 +329,15 @@ const fetchFranchiseCompaniesFromLinks = async ({
   const pageSize = normalizeItemsPerPage(itemsPerPage);
   const byId = new Map();
 
-  for (const side of ['company', 'people']) {
+  // Primary path matches FranchiseLinksTab: company=<id>&linkType[]=franchisee
+  // Fallback dual-side only if no authorized company-side link is returned
+  // (inverted associations). The API response is filtered again below because
+  // authorization cannot depend on a query parameter being honored remotely.
+  const sidesToTry = ['company', 'people'];
+
+  for (const side of sidesToTry) {
     let page = 1;
+    let gotAuthorizedAny = false;
     while (true) {
       const links = await fetchFranchiseLinksPage({
         companyId: viewerId,
@@ -232,13 +347,13 @@ const fetchFranchiseCompaniesFromLinks = async ({
         search,
       });
       const pageLinks = Array.isArray(links) ? links : [];
-
       pageLinks.forEach(link => {
         const franchise = extractFranchiseCompanyFromLink(link, viewerId);
         const franchiseId = normalizeShopEntityId(franchise);
         if (!franchiseId || franchiseId === viewerId) {
           return;
         }
+        gotAuthorizedAny = true;
         if (!byId.has(franchiseId)) {
           byId.set(
             franchiseId,
@@ -254,6 +369,12 @@ const fetchFranchiseCompaniesFromLinks = async ({
       }
       page += 1;
     }
+
+    // If company-side returned an authorized franchise, skip people-side
+    // (avoids duplicate requests while preserving the inverted-link fallback).
+    if (side === 'company' && gotAuthorizedAny) {
+      break;
+    }
   }
 
   return Array.from(byId.values())
@@ -344,11 +465,45 @@ export const fetchAllShopFranchiseDirectory = async ({
       );
   }
 
-  return fetchFranchiseCompaniesFromLinks({
+  const linkedCompanies = await fetchFranchiseCompaniesFromLinks({
     companyId,
     search,
     itemsPerPage,
   });
+  // Hydrate enable from /people/{id} when people_links embed omits the flag (#815)
+  const companies = (await hydratePeopleEnableFlags(linkedCompanies)).filter(
+    isPeopleEnabled,
+  );
+
+  // Always load addresses from /addresses so lat/long (and map.*) are present.
+  // people_link embeds are often stubs without coordinates.
+  const enriched = await Promise.all(
+    companies.map(async company => {
+      const peopleId = normalizeShopEntityId(company);
+      if (!peopleId) {
+        return normalizeFranchiseDirectoryItem(company);
+      }
+      try {
+        const addresses = await fetchShopFranchiseAddresses({peopleId});
+        if (Array.isArray(addresses) && addresses.length > 0) {
+          return normalizeFranchiseDirectoryItem({
+            ...company,
+            shopAddresses: addresses,
+          });
+        }
+      } catch {
+        // fall through to embedded addresses
+      }
+      return normalizeFranchiseDirectoryItem(company);
+    }),
+  );
+
+  return enriched.sort((left, right) =>
+    sortByLabel(
+      resolveFranchiseCompanyLabel(left),
+      resolveFranchiseCompanyLabel(right),
+    ),
+  );
 };
 
 export const fetchShopFranchiseAddresses = async ({