@vizzly/dashboard 0.14.4-dev-a0b1f2b460bae8e2dcaf46786f7f4aae10749727 → 0.14.4-dev-eaaec8b3050228b960681eeb4fab1bb93dddc66a

package/dist/dashboard.esm.js

@@ -14887,6 +14887,7 @@ var ADMIN_FEATURE_TOGGLES = {
   parameters: true,
   disableAutoSave: true,
   showGlobalFilters: true,
+  hideToolbar: false,
   showResetButton: false,
   canManageGlobalFilters: true,
   canEditComponentLibrary: true,
@@ -14924,6 +14925,7 @@ var END_USER_DEFAULT_FEATURE_TOGGLES = {
   parameters: true,
   disableAutoSave: false,
   showGlobalFilters: true,
+  hideToolbar: false,
   showResetButton: true,
   canAddTags: true,
   canManageGlobalFilters: true,
@@ -15879,7 +15881,7 @@ var init$b = function init(overrides, includeComponentTypes, excludeComponentTyp
     organizationName: overrides.organizationName,
     dateTimeFormatOptions: buildDateTimeFormatOptions(_extends({}, base.dateTimeFormatOptions, wrapOverridesInDateObjects(overrides.dateTimeFormatOptions ? overrides.dateTimeFormatOptions : {})), queryEngineConfig),
     datePickerFormat: overrides.datePickerFormat ? overrides.datePickerFormat : base.datePickerFormat,
-    disableToolbar: overrides.disableToolbar,
+    disableToolbar: featureToggles.hideToolbar ? featureToggles.hideToolbar : overrides.disableToolbar,
     scheduledReports: overrides.scheduledReports || base.scheduledReports
   });
 };
@@ -41635,7 +41637,7 @@ var AdminTools = function AdminTools(props) {
       logDebug('Received from VizzlyState, `save()`');
       doSave();
     }
-  });
+  }, undefined, [dashboard]);
   if (disableToolbar) return null;
   var close = function close() {
     setShowConfirmAdminSave(false);
@@ -42670,18 +42672,31 @@ var useCheckIfPageClosing = function useCheckIfPageClosing(params) {
   var _useState2 = useState(null),
     initialDashboardState = _useState2[0],
     setInitialDashboardState = _useState2[1];
+  var _useState3 = useState(null),
+    lastSavedDashboardState = _useState3[0],
+    setLastSavedDashboardState = _useState3[1];
   useEffect(function () {
     if (params.dashboard) {
       var dashboard = params.dashboard;
       var emptyDashboard = emptyCurrentDashboard(dashboard);
-      if (initialDashboardState !== null && hashDashboard(emptyDashboard) !== hashDashboard(initialDashboardState)) {
+      var isSaved = hashDashboard(lastSavedDashboardState) === hashDashboard(dashboard);
+      if (initialDashboardState !== null && hashDashboard(emptyDashboard) !== hashDashboard(initialDashboardState) && !isSaved) {
         setHasChanges(true);
       }
     }
-  }, [params]);
+  }, [params.dashboard]);
   useEffect(function () {
     setInitialDashboardState(params.dashboard);
   }, []);
+  useEffect(function () {
+    if (params.saving) {
+      var saving = params.saving;
+      if (saving === 'Saved') {
+        setLastSavedDashboardState(params.dashboard);
+        setHasChanges(false);
+      }
+    }
+  }, [params.saving]);
   useEffect(function () {
     var handleBeforeunload = function handleBeforeunload(event) {
       if (mode === 'admin' && hasChanges) {
@@ -58300,7 +58315,6 @@ function buildFieldCollectorItems(values, dataSet, purpose, queryEngineConfig, _
           value: func
         };
       });
-      console.log('selectOptions', selectOptions);
     } else if (purpose === 'grouping' && field.dataType === 'date_time') {
       selectOptions = getDateTimeSelectOptions(field.allowedGranularities, queryEngineConfig.supportedTimeTruncFunctions);
     }
@@ -69846,7 +69860,8 @@ var StudioApp = function StudioApp() {
     isResizing = _useState2[0],
     setIsResizing = _useState2[1];
   useCheckIfPageClosing({
-    dashboard: dashboard
+    dashboard: dashboard,
+    saving: saving
   });
   var handleResize = function handleResize(timeout) {
     if (prevWindowWidth.current !== windowWidth) {
@@ -76171,6 +76186,17 @@ var useOnDashboardLoadCallback = function useOnDashboardLoadCallback(session, on
   })]);
 };
 
+var FailedToSaveError = /*#__PURE__*/function (_Error) {
+  function FailedToSaveError(message) {
+    var _this;
+    _this = _Error.call(this, "Failed to save dashboard.") || this;
+    _this.message = message;
+    return _this;
+  }
+  _inheritsLoose(FailedToSaveError, _Error);
+  return FailedToSaveError;
+}( /*#__PURE__*/_wrapNativeSuper(Error));
+
 var GlobalProvider = function GlobalProvider(props) {
   var _useState = useState(0),
     resetKey = _useState[0],
@@ -76234,15 +76260,23 @@ var GlobalProviderContents = function GlobalProviderContents(props) {
   });
   var onSave = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dashboard, abortSignal) {
+      var error;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (session.scope == 'read_write') {
-              session.vizzly.updateDashboard({
-                dashboardId: dashboard.id,
-                definition: toSaveableDefinition(dashboard),
-                abortSignal: abortSignal
-              });
+              try {
+                session.vizzly.updateDashboard({
+                  dashboardId: dashboard.id,
+                  definition: toSaveableDefinition(dashboard),
+                  abortSignal: abortSignal
+                });
+              } catch (e) {
+                if (props.onError) {
+                  error = new FailedToSaveError(e);
+                  props.onError(error, error.message);
+                }
+              }
             }
           case 1:
           case "end":

package/dist/shared-logic/src/FeatureToggle/types.d.ts

@@ -1,5 +1,6 @@
 export declare type FeatureToggles = {
     showGlobalFilters: boolean;
+    hideToolbar: boolean;
     showResetButton: boolean;
     parameters: boolean;
     canManageGlobalFilters: boolean;

package/dist/shared-ui/src/library/effectHooks/useCheckIfPageClosing.d.ts

@@ -1,6 +1,8 @@
 import { Dashboard } from '../../../../shared-logic/src/Dashboard';
 import { Component } from '../../../../shared-logic/src/Component/types';
+import { SavingState } from '../../../../shared-logic/src/VizzlyState';
 export declare const useCheckIfPageClosing: (params: {
     dashboard?: Dashboard;
     component?: Component;
+    saving?: SavingState;
 }) => void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vizzly/dashboard",
   "author": "james@vizzly.co",
-  "version": "0.14.4-dev-a0b1f2b460bae8e2dcaf46786f7f4aae10749727",
+  "version": "0.14.4-dev-eaaec8b3050228b960681eeb4fab1bb93dddc66a",
   "source": "src/index.tsx",
   "types": "./dist/dashboard/src/index.d.ts",
   "module": "./dist/dashboard.esm.js",