@crystaldesign/diva-navigator 26.3.0-rc.9 → 26.3.0

package/build/esm/index.js

@@ -4,14 +4,14 @@ import _objectDestructuringEmpty from '@babel/runtime/helpers/objectDestructurin
 import classNames from 'classnames';
 import { useTranslation, useDivaCore, getLogger } from '@crystaldesign/diva-core';
 import { jsxs, jsx, Fragment as Fragment$1 } from 'react/jsx-runtime';
-import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import _regeneratorRuntime from '@babel/runtime/regenerator';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import Fuse from 'fuse.js';
 import Switch from 'react-switch';
 import Dropdown from 'react-dropdown';
 import { md5 } from '@crystaldesign/diva-utils';
+import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
+import _regeneratorRuntime from '@babel/runtime/regenerator';
 import { Alert, Button as Button$1, Stack, Paper, Typography, Divider, TextField, CircularProgress } from '@mui/material';
 import SearchIcon from '@mui/icons-material/Search';
 import _typeof from '@babel/runtime/helpers/typeof';
@@ -503,67 +503,24 @@ var initialState = {
 function useOrgTree(onSelect) {
   var _organization$_id;
   var _useDivaCore = useDivaCore(),
-    organization = _useDivaCore.state.organization,
-    organizationHandler = _useDivaCore.handler.organizationHandler;
+    _useDivaCore$state = _useDivaCore.state,
+    organization = _useDivaCore$state.organization,
+    organizationTree = _useDivaCore$state.organizationTree,
+    initializing = _useDivaCore$state.initializing;
   var _useReducer = useReducer(treeReducer, initialState),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
   var organizationId = (_organization$_id = organization === null || organization === void 0 ? void 0 : organization._id) !== null && _organization$_id !== void 0 ? _organization$_id : null;
   useEffect(function () {
-    var cancelled = false;
-    _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var response;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.prev = 0;
-            _context.next = 3;
-            return organizationHandler.getOrganizationTree();
-          case 3:
-            response = _context.sent;
-            if (!cancelled) {
-              _context.next = 6;
-              break;
-            }
-            return _context.abrupt("return");
-          case 6:
-            dispatch({
-              type: 'SET_TREE',
-              tree: response.tree,
-              totalAccessible: response.totalAccessible,
-              selectedId: organizationId
-            });
-            _context.next = 12;
-            break;
-          case 9:
-            _context.prev = 9;
-            _context.t0 = _context["catch"](0);
-            if (!cancelled) {
-              dispatch({
-                type: 'SET_TREE',
-                tree: [],
-                totalAccessible: 0,
-                selectedId: null
-              });
-            }
-          case 12:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[0, 9]]);
-    }))();
-    return function () {
-      cancelled = true;
-    };
-  }, []);
-  useEffect(function () {
-    if (state.selectedId === organizationId) return;
+    if (initializing) return;
     dispatch({
-      type: 'SELECT',
-      nodeId: organizationId
+      type: 'SET_TREE',
+      tree: organizationTree.tree,
+      totalAccessible: organizationTree.totalAccessible,
+      selectedId: organizationId
     });
-    var path = findPathToNode(state.tree, organizationId);
+    var path = findPathToNode(organizationTree.tree, organizationId);
     if (path) {
       dispatch({
         type: 'SET_EXPANDED',
@@ -571,7 +528,7 @@ function useOrgTree(onSelect) {
         force: 'expand'
       });
     }
-  }, [organizationId, state.tree, state.selectedId]);
+  }, [initializing, organizationId, organizationTree.totalAccessible, organizationTree.tree]);
   var toggleExpand = useCallback(function (nodeId) {
     dispatch({
       type: 'SET_EXPANDED',
@@ -849,7 +806,10 @@ function performSearch(fuse, flatItems, query) {
           var _scoreMap$get, _result$score;
           var result = _step9.value;
           var prev = (_scoreMap$get = scoreMap.get(result.item._id)) !== null && _scoreMap$get !== void 0 ? _scoreMap$get : 0;
-          var positionBonus = getMatchPositionScore(result) * POSITION_WEIGHT;
+          // getMatchPositionScore returns rank (0 best -> 2 worst). Convert to boost
+          // so stronger positional matches receive larger score reductions.
+          var positionRank = getMatchPositionScore(result);
+          var positionBonus = Math.max(0, 2 - Math.min(positionRank, 2)) * POSITION_WEIGHT;
           scoreMap.set(result.item._id, prev + ((_result$score = result.score) !== null && _result$score !== void 0 ? _result$score : 0) - positionBonus - MATCH_COUNT_BONUS);
           if (result.matches) {
             var _iterator10 = _createForOfIteratorHelper$2(result.matches),
@@ -2484,6 +2444,7 @@ function openResultInTargetOrg(result, openComponent, closeModal) {
 
 var LOG = getLogger('Framework', 'QrCoedScanner');
 function Scanner(_ref) {
+  var _organization$type, _organization$type$to;
   var onResult = _ref.onResult;
   var qrCodeReader = useRef();
   var _useDivaCore = useDivaCore(),
@@ -2507,7 +2468,8 @@ function Scanner(_ref) {
     _React$useState2 = _slicedToArray(_React$useState, 2),
     error = _React$useState2[0],
     setError = _React$useState2[1];
-  var isWrapperOrg = !(organization !== null && organization !== void 0 && organization.type) && !(organization !== null && organization !== void 0 && organization.parentType);
+  var organizationType = organization === null || organization === void 0 || (_organization$type = organization.type) === null || _organization$type === void 0 || (_organization$type$to = _organization$type.toUpperCase) === null || _organization$type$to === void 0 ? void 0 : _organization$type$to.call(_organization$type);
+  var isWrapperOrg = !(organization !== null && organization !== void 0 && organization.type) && !(organization !== null && organization !== void 0 && organization.parentType) || organizationType === 'SUPPLIER' || organizationType === 'SUPLIER';
   var handleResult = function handleResult(result) {
     var isSameOrg = !result.organizationId || result.organizationId === organization._id;
     if (isSameOrg) {
@@ -2674,13 +2636,14 @@ function OrgActionButtons(_ref) {
   var result = _ref.result,
     organizationId = _ref.organizationId,
     isWrapperOrg = _ref.isWrapperOrg,
+    canAccessTargetOrg = _ref.canAccessTargetOrg,
     onOpenCurrent = _ref.onOpenCurrent,
     onOpenTarget = _ref.onOpenTarget;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var isSameOrg = !result.organizationId || result.organizationId === organizationId;
   var isProduct = result.type === 'product';
-  if (isSameOrg || isProduct && !isWrapperOrg) {
+  if (isSameOrg || isProduct && !isWrapperOrg || !canAccessTargetOrg) {
     return /*#__PURE__*/jsx(Button$1, {
       variant: "contained",
       onClick: onOpenCurrent,
@@ -2713,12 +2676,14 @@ function OrgActionButtons(_ref) {
   });
 }
 function ScannerModalContent() {
+  var _organization$type, _organization$type$to;
   var _useTranslation2 = useTranslation(),
     t = _useTranslation2.t;
   var _useDivaCore = useDivaCore(),
     _useDivaCore$actions = _useDivaCore.actions,
     closeModal = _useDivaCore$actions.closeModal,
     openComponent = _useDivaCore$actions.openComponent,
+    canAccessOrganization = _useDivaCore$actions.canAccessOrganization,
     _useDivaCore$state = _useDivaCore.state,
     qrCodeScanner = _useDivaCore$state.navigationConfiguration.qrCodeScanner,
     jwt = _useDivaCore$state.jwt,
@@ -2751,7 +2716,9 @@ function ScannerModalContent() {
   var hasEnoughDigits = function hasEnoughDigits(value) {
     return /^DIVA-\d{4}/i.test(value.trim());
   };
-  var isWrapperOrg = !(organization !== null && organization !== void 0 && organization.type) && !(organization !== null && organization !== void 0 && organization.parentType);
+  var organizationType = organization === null || organization === void 0 || (_organization$type = organization.type) === null || _organization$type === void 0 || (_organization$type$to = _organization$type.toUpperCase) === null || _organization$type$to === void 0 ? void 0 : _organization$type$to.call(_organization$type);
+  var isWrapperOrg = !(organization !== null && organization !== void 0 && organization.type) && !(organization !== null && organization !== void 0 && organization.parentType) || organizationType === 'SUPPLIER' || organizationType === 'SUPLIER';
+  var canAccessTargetOrg = (fetchedResult === null || fetchedResult === void 0 ? void 0 : fetchedResult.organizationId) != null ? canAccessOrganization(fetchedResult.organizationId) : true;
   React.useEffect(function () {
     var normalized = divaNrInput.trim().toUpperCase();
     if (!isValidDivaNr(normalized) || !hasEnoughDigits(normalized)) {
@@ -2880,6 +2847,7 @@ function ScannerModalContent() {
       result: fetchedResult,
       organizationId: organization._id,
       isWrapperOrg: isWrapperOrg,
+      canAccessTargetOrg: canAccessTargetOrg,
       onOpenCurrent: handleOpenCurrent,
       onOpenTarget: handleOpenTarget
     })]

package/build/types/navigator/src/Header/QrCodeScanner/Scanner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Scanner.d.ts","sourceRoot":"","sources":["../../../../../../src/Header/QrCodeScanner/Scanner.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwC,MAAM,OAAO,CAAC;AAM7D,OAAO,EACL,aAAa,EAOd,MAAM,SAAS,CAAC;AAIjB,UAAU,YAAY;IACpB,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C;AAED,wBAAgB,OAAO,CAAC,EAAE,QAAQ,EAAE,EAAE,YAAY,qBA+GjD"}
+{"version":3,"file":"Scanner.d.ts","sourceRoot":"","sources":["../../../../../../src/Header/QrCodeScanner/Scanner.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwC,MAAM,OAAO,CAAC;AAM7D,OAAO,EACL,aAAa,EAOd,MAAM,SAAS,CAAC;AAIjB,UAAU,YAAY;IACpB,QAAQ,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAC;CAC3C;AAED,wBAAgB,OAAO,CAAC,EAAE,QAAQ,EAAE,EAAE,YAAY,qBAgHjD"}

package/build/types/navigator/src/Header/QrCodeScanner/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/Header/QrCodeScanner/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AA2K1B,MAAM,CAAC,OAAO,gCAyBb"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/Header/QrCodeScanner/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAgL1B,MAAM,CAAC,OAAO,gCAyBb"}

package/build/types/navigator/src/OrgTreeSelect/useOrgTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useOrgTree.d.ts","sourceRoot":"","sources":["../../../../../src/OrgTreeSelect/useOrgTree.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAA0C,MAAM,SAAS,CAAC;AAiD9E,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,IAAI;;;;;;;2BAyC9C,MAAM;sBAKvC,WAAW;2BAQT,MAAM;EAoBlB"}
+{"version":3,"file":"useOrgTree.d.ts","sourceRoot":"","sources":["../../../../../src/OrgTreeSelect/useOrgTree.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAyB,MAAM,SAAS,CAAC;AAiD7D,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,KAAK,IAAI;;;;;;;2BAsB9C,MAAM;sBAKvC,WAAW;2BAQT,MAAM;EAoBlB"}

package/build/types/navigator/src/OrgTreeSelect/useTreeSearch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useTreeSearch.d.ts","sourceRoot":"","sources":["../../../../../src/OrgTreeSelect/useTreeSearch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAuB,OAAO,EAAE,MAAM,SAAS,CAAC;AA+NpE,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE;;4BAKZ,MAAM;;6BAIL,OAAO;;;;;EAuDpD"}
+{"version":3,"file":"useTreeSearch.d.ts","sourceRoot":"","sources":["../../../../../src/OrgTreeSelect/useTreeSearch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAuB,OAAO,EAAE,MAAM,SAAS,CAAC;AAkOpE,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE;;4BAKZ,MAAM;;6BAIL,OAAO;;;;;EAuDpD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-navigator",
-  "version": "26.3.0-rc.9",
+  "version": "26.3.0",
   "license": "MIT",
   "devDependencies": {
     "@testing-library/jest-dom": "^6.5.0",
@@ -25,5 +25,5 @@
   },
   "module": "build/esm/index.js",
   "types": "./build/types/navigator/src/index.d.ts",
-  "gitHead": "fb4eafebba203081b1a7fdbe8a92c827dbcd025a"
+  "gitHead": "cf3302995a149aa3f95fd31b254e270a30507941"
 }