@crystaldesign/diva-navigator 26.3.0-beta.52 → 26.3.0-beta.54

package/build/esm/index.js

@@ -501,6 +501,7 @@ var initialState = {
   availableTypes: []
 };
 function useOrgTree(onSelect) {
+  var _organization$_id;
   var _useDivaCore = useDivaCore(),
     organization = _useDivaCore.state.organization,
     organizationHandler = _useDivaCore.handler.organizationHandler;
@@ -508,10 +509,11 @@ function useOrgTree(onSelect) {
     _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 _organization$_id, response;
+      var response;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -530,7 +532,7 @@ function useOrgTree(onSelect) {
               type: 'SET_TREE',
               tree: response.tree,
               totalAccessible: response.totalAccessible,
-              selectedId: (_organization$_id = organization === null || organization === void 0 ? void 0 : organization._id) !== null && _organization$_id !== void 0 ? _organization$_id : null
+              selectedId: organizationId
             });
             _context.next = 12;
             break;
@@ -555,6 +557,21 @@ function useOrgTree(onSelect) {
       cancelled = true;
     };
   }, []);
+  useEffect(function () {
+    if (state.selectedId === organizationId) return;
+    dispatch({
+      type: 'SELECT',
+      nodeId: organizationId
+    });
+    var path = findPathToNode(state.tree, organizationId);
+    if (path) {
+      dispatch({
+        type: 'SET_EXPANDED',
+        nodeIds: path.slice(0, -1),
+        force: 'expand'
+      });
+    }
+  }, [organizationId, state.tree, state.selectedId]);
   var toggleExpand = useCallback(function (nodeId) {
     dispatch({
       type: 'SET_EXPANDED',
@@ -872,12 +889,21 @@ function performSearch(fuse, flatItems, query) {
   var _iterator8 = _createForOfIteratorHelper$2(exactIdMatchedIds),
     _step8;
   try {
-    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+    var _loop = function _loop() {
       var _scoreMap$get2;
       var matchedId = _step8.value;
       matchedIds.add(matchedId);
-      var _prev = (_scoreMap$get2 = scoreMap.get(matchedId)) !== null && _scoreMap$get2 !== void 0 ? _scoreMap$get2 : 0;
-      scoreMap.set(matchedId, _prev - 1);
+      var prev = (_scoreMap$get2 = scoreMap.get(matchedId)) !== null && _scoreMap$get2 !== void 0 ? _scoreMap$get2 : 0;
+      scoreMap.set(matchedId, prev - 1);
+      var matchedItem = flatItems.find(function (item) {
+        return item._id === matchedId;
+      });
+      if (matchedItem && matchedItem.displayName.length > 0) {
+        matchIndicesMap.set(matchedId, [[0, matchedItem.displayName.length - 1]]);
+      }
+    };
+    for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+      _loop();
     }
   } catch (err) {
     _iterator8.e(err);
@@ -2300,7 +2326,7 @@ function _checkConfigurationByDivaNr() {
           _divaNr$split = divaNr.split('-'), _divaNr$split2 = _slicedToArray(_divaNr$split, 3), onlyDivaNr = _divaNr$split2[1], version = _divaNr$split2[2];
           _context3.prev = 1;
           _context3.next = 4;
-          return fetch("".concat(basketService, "/baskets/configuration?divaNr=DIVA-").concat(onlyDivaNr, "&fields={DivaNr,OrganizationId,OrganizationId_displayText,OrderStatus}&dontRepairBasket=true").concat(version ? '&version=' + version : ''), {
+          return fetch("".concat(basketService, "/baskets/configuration?divaNr=DIVA-").concat(onlyDivaNr, "&fields=").concat(encodeURIComponent('{DivaNr,OrganizationId,OrganizationId_displayText,OrderStatus}'), "&dontRepairBasket=true").concat(version ? '&version=' + version : ''), {
             headers: {
               Authorization: "Bearer ".concat(jwt)
             }
@@ -2317,9 +2343,9 @@ function _checkConfigurationByDivaNr() {
           data = _context3.sent;
           return _context3.abrupt("return", {
             isValid: true,
-            organizationId: data.OrganizationId,
-            organizationIdDisplayText: data.OrganizationId_displayText,
-            orderStatus: data.OrderStatus
+            organizationId: data.basket.OrganizationId,
+            organizationIdDisplayText: data.basket.OrganizationId_displayText,
+            orderStatus: data.basket.OrderStatus
           });
         case 10:
           return _context3.abrupt("return", {

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

@@ -37,6 +37,6 @@ export type TreeAction = {
     force?: 'expand' | 'collapse';
 } | {
     type: 'SELECT';
-    nodeId: string;
+    nodeId: string | null;
 };
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/OrgTreeSelect/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,OAAO,GAAG,UAAU,GAAG,iBAAiB,GAAG,UAAU,GAAG,QAAQ,GAAG,aAAa,GAAG,SAAS,CAAC;AAEzG,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,WAAW,EAAE,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,aAAa,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACxD,QAAQ,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAClC;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,OAAO,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAO3E,CAAC;AAEF,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,WAAW,EAAE,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,OAAO,EAAE,CAAC;CAC3B;AAED,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,WAAW,EAAE,CAAC;IAAC,eAAe,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAC7F;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAA;CAAE,GAC1E;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/OrgTreeSelect/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,OAAO,GAAG,UAAU,GAAG,iBAAiB,GAAG,UAAU,GAAG,QAAQ,GAAG,aAAa,GAAG,SAAS,CAAC;AAEzG,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,WAAW,EAAE,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,WAAW,EAAE,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,YAAY,CAAC,EAAE,aAAa,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACxD,QAAQ,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAClC;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,OAAO,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAO3E,CAAC;AAEF,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,WAAW,EAAE,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,OAAO,EAAE,CAAC;CAC3B;AAED,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,WAAW,EAAE,CAAC;IAAC,eAAe,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAC7F;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAA;CAAE,GAC1E;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC"}

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;;;;;;;2BA+B9C,MAAM;sBAKvC,WAAW;2BAQT,MAAM;EAoBlB"}
+{"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"}

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;AA0NpE,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;AA+NpE,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-beta.52",
+  "version": "26.3.0-beta.54",
   "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": "daa38781865a6fdf19f939193292187e94613de3"
+  "gitHead": "dbb0654feef32245af6adf53f099bd996fb235fb"
 }