dce-reactkit 3.6.2 → 3.6.4

package/dist/cjs/index.js

@@ -670,8 +670,6 @@ var LogLevel;
 })(LogLevel || (LogLevel = {}));
 var LogLevel$1 = LogLevel;
 
-// Keep track of whether or not session expiry has already been handled
-let sessionAlreadyExpired = false;
 /*------------------------------------------------------------------------*/
 /*                               Stub Logic                               */
 /*------------------------------------------------------------------------*/
@@ -754,20 +752,7 @@ const visitServerEndpoint = (opts) => __awaiter(void 0, void 0, void 0, function
     if (!response.body.success) {
         // Session expired
         if (response.body.code === ReactKitErrorCode$1.SessionExpired) {
-            // Skip notice if session was already expired
-            if (sessionAlreadyExpired) {
-                // Never return (browser is already reloading)
-                yield new Promise(() => {
-                    // Promise that never returns
-                });
-            }
-            sessionAlreadyExpired = true;
-            // Show session expiration message
-            {
-                // Fallback to alert
-                // eslint-disable-next-line no-alert
-                alert('Your session has expired. Please start over.');
-            }
+            showSessionExpiredMessage();
             // Never return (don't continue execution)
             yield new Promise(() => {
                 // Promise that never returns
@@ -895,7 +880,7 @@ let onAlertClosed;
  * @param title the title text to display at the top of the alert
  * @param text the text to display in the alert
  */
-const alert$1 = (title, text) => __awaiter(void 0, void 0, void 0, function* () {
+const alert = (title, text) => __awaiter(void 0, void 0, void 0, function* () {
     // Wait for helper to exist
     yield waitForHelper(() => {
         return !!setAlertInfo;
@@ -1016,7 +1001,7 @@ const showFatalError = (error, errorTitle = 'An Error Occurred') => __awaiter(vo
     });
     // Handle case where app hasn't loaded
     if (!setFatalErrorMessage || !setFatalErrorCode) {
-        alert$1(errorTitle, `${message} (code: ${code}). Please contact support.`);
+        alert(errorTitle, `${message} (code: ${code}). Please contact support.`);
         return;
     }
     // Use setters
@@ -1031,6 +1016,28 @@ const showFatalError = (error, errorTitle = 'An Error Occurred') => __awaiter(vo
 const addFatalErrorHandler = (handler) => {
     fatalErrorHandlers.push(handler);
 };
+/*----------------------------------------*/
+/* ----------- Session Expired ---------- */
+/*----------------------------------------*/
+// Stored copies of setters
+let setSessionHasExpired;
+/**
+ * Show the "session expired" message
+ * @author Gabe Abrams
+ */
+const showSessionExpiredMessage = () => __awaiter(void 0, void 0, void 0, function* () {
+    // Wait for helper to exist
+    yield waitForHelper(() => {
+        return !!setSessionHasExpired;
+    });
+    // Show session expired message
+    if (setSessionHasExpired) {
+        setSessionHasExpired(true);
+    }
+    else {
+        showFatalError('Your session has expired. Please start over.', 'Session Expired');
+    }
+});
 /*------------------------------------------------------------------------*/
 /* -------------------------------- Style ------------------------------- */
 /*------------------------------------------------------------------------*/
@@ -1083,6 +1090,7 @@ const AppWrapper = (props) => {
     setConfirmInfo = setConfirmInfoInner;
     // Session expired
     const [sessionHasExpired, setSessionHasExpiredInner,] = React.useState(false);
+    setSessionHasExpired = setSessionHasExpiredInner;
     /*------------------------------------------------------------------------*/
     /* ------------------------------- Render ------------------------------- */
     /*------------------------------------------------------------------------*/
@@ -2109,7 +2117,7 @@ const CopiableBox = (props) => {
             yield navigator.clipboard.writeText(text);
         }
         catch (err) {
-            return alert$1('Unable to copy', 'Oops! We couldn\'t copy that to the clipboard. Please copy the text manually.');
+            return alert('Unable to copy', 'Oops! We couldn\'t copy that to the clipboard. Please copy the text manually.');
         }
         // Show copied notice
         dispatch({
@@ -2698,7 +2706,7 @@ const IntelliTable = (props) => {
                     return !isSelected;
                 }));
                 if (noColumnsSelected) {
-                    return alert$1('Choose at least one column', 'To continue, you have to choose at least one column to show');
+                    return alert('Choose at least one column', 'To continue, you have to choose at least one column to show');
                 }
                 dispatch({
                     type: ActionType$6.ToggleColVisCusModalVisibility,
@@ -3710,7 +3718,7 @@ const LogReviewer = (props) => {
                                 || (year === dateFilterState.startDate.year
                                     && month === dateFilterState.startDate.month
                                     && day < dateFilterState.startDate.day)) {
-                                return alert$1('Invalid Start Date', 'The start date cannot be before the end date.');
+                                return alert('Invalid Start Date', 'The start date cannot be before the end date.');
                             }
                             dateFilterState.endDate = { month, day, year };
                             handleDateRangeUpdated(dateFilterState);
@@ -40207,7 +40215,7 @@ const AddOrEditDBEntry = (props) => {
                 React__default["default"].createElement("button", { type: "button", id: "AddOrEditDBEntry-save-changes-button", className: "btn btn-primary btn-lg me-1", "aria-label": "Save changes", onClick: () => __awaiter(void 0, void 0, void 0, function* () {
                         // Show validation errors
                         if (validationError && validationError.length > 0) {
-                            return alert$1('Please fix the following error', validationError);
+                            return alert('Please fix the following error', validationError);
                         }
                         // Run the included validator if it exists
                         if (validateEntry) {
@@ -40215,7 +40223,7 @@ const AddOrEditDBEntry = (props) => {
                                 yield validateEntry(entry);
                             }
                             catch (error) {
-                                return alert$1('Please fix the following error', String(error));
+                                return alert('Please fix the following error', String(error));
                             }
                         }
                         save();
@@ -43140,7 +43148,7 @@ exports.Variant = Variant$1;
 exports.abbreviate = abbreviate;
 exports.addDBEditorEndpoints = addDBEditorEndpoints;
 exports.addFatalErrorHandler = addFatalErrorHandler;
-exports.alert = alert$1;
+exports.alert = alert;
 exports.avg = avg;
 exports.canReviewLogs = canReviewLogs;
 exports.ceilToNumDecimals = ceilToNumDecimals;