@bydata/react-supertabs 1.2.3 → 1.2.5

package/dist/TabContext.js

@@ -293,6 +293,8 @@ function TabProvider(_ref9) {
     setTabModePreference = _useState26[1];
   var previousEntityId = (0, _usePrevious["default"])(currentEntityId);
   var closeTabFailedRequestsRef = (0, _react.useRef)({});
+  /** AbortController per client tab id for in-flight open_tab API */
+  var openTabAbortByClientIdRef = (0, _react.useRef)({});
   (0, _react.useEffect)(function () {
     localStorage.setItem(SITE_PREFIX + "tab_mode_preference", JSON.stringify(tabModePreference));
   }, [tabModePreference]);
@@ -570,6 +572,7 @@ function TabProvider(_ref9) {
       isSubTab,
       _ref16$keepInactive,
       keepInactive,
+      openTabAbortController,
       _payload$tab_info,
       isEditMode,
       unique_identifier,
@@ -586,6 +589,8 @@ function TabProvider(_ref9) {
       payload,
       storedExpandedIds,
       isExpanded,
+      clientTabId,
+      previousOpenAbort,
       response,
       _tabId,
       newTab,
@@ -595,6 +600,8 @@ function TabProvider(_ref9) {
       while (1) switch (_context5.p = _context5.n) {
         case 0:
           _ref16 = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {}, tab = _ref16.tab, _ref16$isHomeTab = _ref16.isHomeTab, isHomeTab = _ref16$isHomeTab === void 0 ? false : _ref16$isHomeTab, _ref16$isSubTab = _ref16.isSubTab, isSubTab = _ref16$isSubTab === void 0 ? false : _ref16$isSubTab, _ref16$keepInactive = _ref16.keepInactive, keepInactive = _ref16$keepInactive === void 0 ? false : _ref16$keepInactive;
+          // return;
+          openTabAbortController = null;
           _context5.p = 1;
           if (!isSubTab) {
             updateActiveTab(tab);
@@ -643,10 +650,16 @@ function TabProvider(_ref9) {
             }
           }
           (_payload$tab_info = payload.tab_info) === null || _payload$tab_info === void 0 || delete _payload$tab_info.isClientChanged;
-          // return;
+          clientTabId = tab.id;
+          previousOpenAbort = openTabAbortByClientIdRef.current[clientTabId];
+          if (previousOpenAbort) {
+            previousOpenAbort.abort();
+          }
+          openTabAbortController = new AbortController();
+          openTabAbortByClientIdRef.current[clientTabId] = openTabAbortController;
           currentOpenTabCallerRef.current = payload.tab_info;
           _context5.n = 3;
-          return handleOpenTab(payload);
+          return handleOpenTab(payload, openTabAbortController);
         case 3:
           response = _context5.v;
           if (!(response.status === 1)) {
@@ -749,12 +762,19 @@ function TabProvider(_ref9) {
         case 9:
           _context5.p = 9;
           _t = _context5.v;
-          if (window.isDebugOn) {
-            alertService === null || alertService === void 0 || alertService.error(_t.message ? _t.message : 'Error in opening tab!');
+          if (_t instanceof DOMException && _t.name === 'AbortError') {
+            // Tab closed or superseded while open was in progress
+          } else {
+            if (window.isDebugOn) {
+              alertService === null || alertService === void 0 || alertService.error(_t.message ? _t.message : 'Error in opening tab!');
+            }
+            console.log("openTab - error", _t);
           }
-          console.log("openTab - error", _t);
         case 10:
           _context5.p = 10;
+          if (openTabAbortController != null && openTabAbortByClientIdRef.current[tab.id] === openTabAbortController) {
+            delete openTabAbortByClientIdRef.current[tab.id];
+          }
           currentOpenTabCallerRef.current = null;
           return _context5.f(10);
         case 11:
@@ -1094,8 +1114,10 @@ function TabProvider(_ref9) {
       tab,
       _ref25$isSubTab,
       isSubTab,
-      response,
+      pendingOpenAbort,
       _activeSubTabRef$curr5,
+      response,
+      _activeSubTabRef$curr6,
       tabId,
       updatedTabModePreference,
       _args8 = arguments,
@@ -1231,7 +1253,21 @@ function TabProvider(_ref9) {
             break;
           }
           console.log('Tab id not found', tab);
-          history.replace("/");
+          pendingOpenAbort = openTabAbortByClientIdRef.current[tab.id];
+          if (pendingOpenAbort) {
+            pendingOpenAbort.abort();
+            delete openTabAbortByClientIdRef.current[tab.id];
+          }
+          if (isSubTab && activeSubTabRef.current) {
+            if (isSubTab && ((_activeSubTabRef$curr5 = activeSubTabRef.current) === null || _activeSubTabRef$curr5 === void 0 ? void 0 : _activeSubTabRef$curr5.open_order) > 2) {
+              updateCurrentTab({
+                tab: activeSubTabRef.current,
+                isSubTab: true,
+                parentId: activeTabRef.current.id
+              });
+            }
+            activeSubTabRef.current.open_order = 1;
+          }
           return _context8.a(2);
         case 2:
           _context8.n = 3;
@@ -1245,7 +1281,7 @@ function TabProvider(_ref9) {
           console.log('closeTab - response.current_tab_id', response.current_tab_id, activeSubTabRef.current);
           // if (isSubTab && response.current_tab_id !== activeSubTabRef.current?.tabId ) {
           if (isSubTab && activeSubTabRef.current) {
-            if (isSubTab && ((_activeSubTabRef$curr5 = activeSubTabRef.current) === null || _activeSubTabRef$curr5 === void 0 ? void 0 : _activeSubTabRef$curr5.open_order) > 2) {
+            if (isSubTab && ((_activeSubTabRef$curr6 = activeSubTabRef.current) === null || _activeSubTabRef$curr6 === void 0 ? void 0 : _activeSubTabRef$curr6.open_order) > 2) {
               updateCurrentTab({
                 tab: activeSubTabRef.current,
                 isSubTab: true,
@@ -1486,7 +1522,7 @@ function TabProvider(_ref9) {
     if (currentEntityId != null && currentEntityId != undefined) {
       var fetchTabDetails = /*#__PURE__*/function () {
         var _ref29 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10() {
-          var href, orgId, payload, response, _response$current_tab, _response$current_tab2, _response$current_tab4, pathName, isHomeTab, tabsOutputWithoutDuplicates, tabsOutput, _activeTab, _activeSubTab, currentActiveTab, _activeTab2, _response$current_tab3, tab_info, rest, flattenedObj, isCurrentTabOpen, openedParentTab, updatedParentTab, flattenedParentObj, parentTab, _activeSubTabRef$curr6, parentTabFromData, _flattenedParentObj, _tab_info, _rest, _flattenedObj, isSubTab, parent, parentTabInfo, parentRest, _flattenedParentObj2, tabsMap, restTabs, id, _tabsMap$id, _activeSubTab$tabId, _activeSubTab2, _activeTab3, tabId, isEditMode, tempTabModePreference, updated, _t8;
+          var href, orgId, payload, response, _response$current_tab, _response$current_tab2, _response$current_tab4, pathName, isHomeTab, tabsOutputWithoutDuplicates, tabsOutput, _activeTab, _activeSubTab, currentActiveTab, _activeTab2, _response$current_tab3, tab_info, rest, flattenedObj, isCurrentTabOpen, openedParentTab, updatedParentTab, flattenedParentObj, parentTab, _activeSubTabRef$curr7, parentTabFromData, _flattenedParentObj, _tab_info, _rest, _flattenedObj, isSubTab, parent, parentTabInfo, parentRest, _flattenedParentObj2, tabsMap, restTabs, id, _tabsMap$id, _activeSubTab$tabId, _activeSubTab2, _activeTab3, tabId, isEditMode, tempTabModePreference, updated, _t8;
           return _regenerator().w(function (_context10) {
             while (1) switch (_context10.p = _context10.n) {
               case 0:
@@ -1617,7 +1653,7 @@ function TabProvider(_ref9) {
                   name: 'Loading...',
                   title: ''
                 });
-                if ((_activeSubTabRef$curr6 = activeSubTabRef.current) !== null && _activeSubTabRef$curr6 !== void 0 && _activeSubTabRef$curr6.tabId) _activeSubTab.tabId = activeSubTabRef.current.tabId;
+                if ((_activeSubTabRef$curr7 = activeSubTabRef.current) !== null && _activeSubTabRef$curr7 !== void 0 && _activeSubTabRef$curr7.tabId) _activeSubTab.tabId = activeSubTabRef.current.tabId;
               case 10:
                 _context10.n = 12;
                 break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bydata/react-supertabs",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "A customizable React super tabs component.",
   "main": "dist/index.js",
   "module": "dist/index.js",