Merge pull request #1073 from openmsupply/additional-tweaks

Fix "disabled" message on Save button
msupply-foundation · Dec 8, 2021 · 6bc1464 · 6bc1464
2 parents 47242d4 + c7eb8f4
commit 6bc1464
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/src/containers/TemplateBuilder/template/Actions/ActionConfig.tsx b/src/containers/TemplateBuilder/template/Actions/ActionConfig.tsx
@@ -186,7 +186,7 @@ const ActionConfig: React.FC<ActionConfigProps> = ({ templateAction, onClose })
             <ButtonWithFallback
               title={strings.TEMPLATE_BUTTON_SAVE}
               disabled={!isDraft || !shouldUpdate}
-              disabledMessage={disabledMessage}
+              disabledMessage={!isDraft ? disabledMessage : strings.TEMPLATE_MESSAGE_SAVE_DISABLED}
               onClick={updateAction}
             />
             <ButtonWithFallback

diff --git a/src/containers/TemplateBuilder/template/Form/ElementConfig.tsx b/src/containers/TemplateBuilder/template/Form/ElementConfig.tsx
@@ -314,7 +314,7 @@ const ElementConfig: React.FC<ElementConfigProps> = ({ element, onClose }) => {
             <ButtonWithFallback
               title={strings.TEMPLATE_BUTTON_SAVE}
               disabled={!isDraft || !shouldUpdate}
-              disabledMessage={disabledMessage}
+              disabledMessage={!isDraft ? disabledMessage : strings.TEMPLATE_MESSAGE_SAVE_DISABLED}
               onClick={updateElement}
             />
             <ButtonWithFallback

diff --git a/src/containers/User/UserArea.tsx b/src/containers/User/UserArea.tsx
@@ -111,6 +111,14 @@ const MainMenuBar: React.FC<MainMenuBarProps> = ({ templates, outcomes }) => {
       value: '/admin/localisations',
     },
   ]
+  // Only include Snapshots menu item in Dev mode
+  if (process.env.NODE_ENV === 'development')
+    adminOptions.splice(1, 0, {
+      key: 'snapshots',
+      text: 'Snapshots',
+      value: '/admin/snapshots',
+    })
+
   // Add Admin templates to Admin menu
   adminOptions.push(
     ...templates

diff --git a/src/utils/defaultLanguageStrings.ts b/src/utils/defaultLanguageStrings.ts
@@ -319,6 +319,7 @@ export default {
   TEMPLATE_APPEARS_IN: 'Appears in',
   TEMPLATE_MESSAGE_SAVE_AND_CLOSE: 'There are changes not saved. Would you like to save and close?',
   TEMPLATE_MESSAGE_SAVE_SUCCESS: 'Changes saved',
+  TEMPLATE_MESSAGE_SAVE_DISABLED: 'No changes',
   TEMPLATE_MESSAGE_REMOVE_ELEMENT_TITLE: 'Remove element',
   TEMPLATE_MESSAGE_REMOVE_ELEMENT_CONTENT: 'Are you sure you would like to remove this element?',
   UNASSIGN_TITLE: 'Unassignment of reviewer',