@bigbinary/neeto-themes-frontend 3.0.1 → 3.0.3

package/app/javascript/src/translations/en.json

@@ -63,7 +63,7 @@
             "delete": "Delete",
             "setAsGlobalTheme": {
               "label": "Set as global theme",
-              "helpText": "Enabling this will set this theme as the default theme, automatically applying it to all your future {{entityType}}s.",
+              "helpText": "Enabling this will set this theme as the default theme, automatically applying it to all your future {{entityType}}s. This theme will also be applied to the {{entityType}}s that uses the previous global theme.",
               "tooltipContent": "This theme is currently set as the global theme. Select another theme to change it."
             }
           },

package/dist/NeetoThemesBuilder.js

@@ -140,7 +140,7 @@ var useListThemes = function useListThemes(entityId) {
 };
 var useCreateTheme = function useCreateTheme() {
   return useMutationWithInvalidation(themesApi.create, {
-    keysToInvalidate: [[QUERY_KEYS.THEMES_LIST], [QUERY_KEYS.GLOBAL_THEME_DETAILS]]
+    keysToInvalidate: [[QUERY_KEYS.THEMES_LIST], [QUERY_KEYS.THEME_ENTITY_DETAILS], [QUERY_KEYS.GLOBAL_THEME_DETAILS]]
   });
 };
 var useUpdateTheme = function useUpdateTheme(themeId) {
@@ -172,7 +172,7 @@ var useApplyTheme = function useApplyTheme(_ref) {
 };
 var useApplyGlobalTheme = function useApplyGlobalTheme() {
   return useMutationWithInvalidation(themesApi.applyGlobalTheme, {
-    keysToInvalidate: [[QUERY_KEYS.GLOBAL_THEME_DETAILS]]
+    keysToInvalidate: [[QUERY_KEYS.GLOBAL_THEME_DETAILS], [QUERY_KEYS.THEMES_LIST], [QUERY_KEYS.THEME_ENTITY_DETAILS]]
   });
 };
 
@@ -1146,13 +1146,15 @@ var Customize = function Customize(_ref) {
     themePropertiesSchema = _useConfigStore.themePropertiesSchema,
     entityType = _useConfigStore.entityType;
   var _useThemeUtils = useThemeUtils(),
-    currentTheme = _useThemeUtils.currentTheme;
+    currentTheme = _useThemeUtils.currentTheme,
+    setThemeState = _useThemeUtils.setThemeState;
   var _useShowGlobalTheme = useShowGlobalTheme(entityType),
     _useShowGlobalTheme$d = _useShowGlobalTheme.data,
     _useShowGlobalTheme$d2 = _useShowGlobalTheme$d === void 0 ? {} : _useShowGlobalTheme$d,
     _useShowGlobalTheme$d3 = _useShowGlobalTheme$d2.globalTheme,
     globalTheme = _useShowGlobalTheme$d3 === void 0 ? {} : _useShowGlobalTheme$d3;
   var isThemeGlobalTheme = (globalTheme === null || globalTheme === void 0 ? void 0 : globalTheme.id) === themeId;
+  var isCurrentThemeAndGlobalThemeSame = (currentTheme === null || currentTheme === void 0 ? void 0 : currentTheme.id) === (globalTheme === null || globalTheme === void 0 ? void 0 : globalTheme.id);
   var isEditingCurrentlyAppliedTheme = themeId === (currentTheme === null || currentTheme === void 0 ? void 0 : currentTheme.id);
   var submitBtnRef = useRef(null);
   var _useCreateTheme = useCreateTheme(),
@@ -1187,11 +1189,15 @@ var Customize = function Customize(_ref) {
       });
     }
     return updateTheme(themeToSave, {
-      onSuccess: function onSuccess() {
+      onSuccess: function onSuccess(_ref4) {
+        var theme = _ref4.theme;
+        onUpdateThemeSuccess === null || onUpdateThemeSuccess === void 0 ? void 0 : onUpdateThemeSuccess(theme);
+        setThemeState({
+          previewingTheme: theme
+        });
         resetForm({
-          values: values
+          values: theme
         });
-        onUpdateThemeSuccess === null || onUpdateThemeSuccess === void 0 ? void 0 : onUpdateThemeSuccess(values);
       }
     });
   };
@@ -1205,10 +1211,10 @@ var Customize = function Customize(_ref) {
       enableReinitialize: true,
       onSubmit: onSubmit
     },
-    children: function children(_ref4) {
-      var dirty = _ref4.dirty,
-        values = _ref4.values,
-        setFieldValue = _ref4.setFieldValue;
+    children: function children(_ref5) {
+      var dirty = _ref5.dirty,
+        values = _ref5.values,
+        setFieldValue = _ref5.setFieldValue;
       return /*#__PURE__*/jsxs("div", {
         className: "neeto-themes-sidebar__scroll",
         children: [/*#__PURE__*/jsxs("div", {
@@ -1228,8 +1234,8 @@ var Customize = function Customize(_ref) {
             })
           }), filterBy({
             kind: "image"
-          }, themePropertiesSchema).map(function (_ref5) {
-            var key = _ref5.key;
+          }, themePropertiesSchema).map(function (_ref6) {
+            var key = _ref6.key;
             return /*#__PURE__*/createElement(Images, {
               onPropertiesChange: onPropertiesChange,
               attribute: key,
@@ -1283,7 +1289,6 @@ var Customize = function Customize(_ref) {
           appendTo: function appendTo() {
             return document.body;
           },
-          disabled: isEditingCurrentlyAppliedTheme,
           position: "top",
           reference: submitBtnRef,
           trigger: "click",
@@ -1320,6 +1325,7 @@ var Customize = function Customize(_ref) {
               }
             })]
           }),
+          disabled: isEditingCurrentlyAppliedTheme || isCurrentThemeAndGlobalThemeSame && values.shouldSetAsGlobalTheme,
           onMount: setPopoverInstance
         })]
       });
@@ -1635,6 +1641,7 @@ var Themes = function Themes(_ref) {
     thumbnail = _ref.thumbnail,
     themeBeingApplied = _ref.themeBeingApplied,
     onApplyTheme = _ref.onApplyTheme,
+    onApplyGlobalThemeSuccess = _ref.onApplyGlobalThemeSuccess,
     isApplyingTheme = _ref.isApplyingTheme;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
@@ -1703,6 +1710,10 @@ var Themes = function Themes(_ref) {
     applyGlobalTheme({
       themeId: themeId,
       payload: payload
+    }, {
+      onSuccess: function onSuccess() {
+        onApplyGlobalThemeSuccess === null || onApplyGlobalThemeSuccess === void 0 ? void 0 : onApplyGlobalThemeSuccess();
+      }
     });
   };
   if (isLoading || isCurrentThemeLoading || isLoadingGlobalTheme) {
@@ -1858,7 +1869,8 @@ var Sidebar = function Sidebar(_ref) {
   var thumbnail = _ref.thumbnail,
     onPropertiesChange = _ref.onPropertiesChange,
     onApplyThemeSuccess = _ref.onApplyThemeSuccess,
-    onUpdateThemeSuccess = _ref.onUpdateThemeSuccess;
+    onUpdateThemeSuccess = _ref.onUpdateThemeSuccess,
+    onApplyGlobalThemeSuccess = _ref.onApplyGlobalThemeSuccess;
   var _useState = useState(DESIGN_SCREENS.THEMES),
     _useState2 = _slicedToArray(_useState, 2),
     currentScreen = _useState2[0],
@@ -2029,6 +2041,7 @@ var Sidebar = function Sidebar(_ref) {
         highlightTheme: highlightTheme,
         isApplyingTheme: isApplyingTheme,
         isCurrentThemeLoading: isCurrentThemeLoading,
+        onApplyGlobalThemeSuccess: onApplyGlobalThemeSuccess,
         onApplyTheme: onApplyTheme,
         themeBeingApplied: themeBeingApplied,
         themeToHighlight: themeToHighlight,
@@ -2084,7 +2097,9 @@ var NeetoThemesBuilder = function NeetoThemesBuilder(_ref) {
     _ref$onApplyThemeSucc = _ref.onApplyThemeSuccess,
     onApplyThemeSuccess = _ref$onApplyThemeSucc === void 0 ? noop : _ref$onApplyThemeSucc,
     _ref$onUpdateThemeSuc = _ref.onUpdateThemeSuccess,
-    onUpdateThemeSuccess = _ref$onUpdateThemeSuc === void 0 ? noop : _ref$onUpdateThemeSuc;
+    onUpdateThemeSuccess = _ref$onUpdateThemeSuc === void 0 ? noop : _ref$onUpdateThemeSuc,
+    _ref$onApplyGlobalThe = _ref.onApplyGlobalThemeSuccess,
+    onApplyGlobalThemeSuccess = _ref$onApplyGlobalThe === void 0 ? noop : _ref$onApplyGlobalThe;
   var _useThemeStore = useThemeStore(function (store) {
       return {
         setThemeState: store["setThemeState"]
@@ -2120,7 +2135,7 @@ var NeetoThemesBuilder = function NeetoThemesBuilder(_ref) {
       previewingTheme: currentTheme
     });
     setTheme(currentTheme);
-  }, [isLoading, entityId]);
+  }, [isLoading, entityId, currentTheme]);
   useEffect(function () {
     if (isNotPresent(currentTheme)) return;
     setThemeState({
@@ -2131,6 +2146,7 @@ var NeetoThemesBuilder = function NeetoThemesBuilder(_ref) {
   return /*#__PURE__*/jsxs("div", {
     className: "neeto-themes__wrapper",
     children: [/*#__PURE__*/jsx(Sidebar, {
+      onApplyGlobalThemeSuccess: onApplyGlobalThemeSuccess,
       onApplyThemeSuccess: onApplyThemeSuccess,
       onPropertiesChange: onPropertiesChange,
       onUpdateThemeSuccess: onUpdateThemeSuccess,