Merge branch 'master' into fix/chats

glific · Dec 10, 2024 · 20de8cb · 20de8cb
2 parents dd4db47 + 8995031
commit 20de8cb
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 30 deletions.
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "@emoji-mart/react": "^1.1.1",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@glific/flow-editor": "^1.26.3-15",
+    "@glific/flow-editor": "^1.26.3-17",
     "@lexical/react": "^0.17.1",
     "@mui/icons-material": "^6.1.1",
     "@mui/material": "^6.1.1",

diff --git a/src/containers/Template/List/Template.module.css b/src/containers/Template/List/Template.module.css
@@ -155,4 +155,11 @@
   display: flex;
   align-items: center;
   gap: 0.25rem;
+}
+
+.SecondaryButton {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  margin: 0 0.5rem
 }
diff --git a/src/containers/Template/List/Template.tsx b/src/containers/Template/List/Template.tsx
@@ -348,7 +348,6 @@ export const Template = ({
           value: selectedTag,
         }}
       />
-      {syncHSMButton}
     </div>
   );
 
@@ -397,43 +396,49 @@ export const Template = ({
 
   if (isHSM) {
     secondaryButton = (
-      <div className={styles.ImportButton}>
-        <a href={BULK_APPLY_SAMPLE_LINK} target="_blank" rel="noreferrer" className={styles.HelperText}>
-          View Sample
-        </a>
+      <div className={styles.SecondaryButton}>
+        {syncHSMButton}
+        <div className={styles.ImportButton}>
+          <a href={BULK_APPLY_SAMPLE_LINK} target="_blank" rel="noreferrer" className={styles.HelperText}>
+            View Sample
+          </a>
+          <ImportButton
+            title={t('Bulk apply')}
+            onImport={() => setImporting(true)}
+            afterImport={(result: string, media: any) => {
+              const extension = getFileExtension(media.name);
+              if (extension !== 'csv') {
+                setNotification('Please upload a valid CSV file', 'warning');
+                setImporting(false);
+              } else {
+                bulkApplyTemplates({ variables: { data: result } });
+              }
+            }}
+          />
+        </div>
+      </div>
+    );
+  }
+
+  if (provider === GUPSHUP_ENTERPRISE_SHORTCODE) {
+    secondaryButton = (
+      <div className={styles.SecondaryButton}>
+        {syncHSMButton}
         <ImportButton
-          title={t('Bulk apply')}
+          title={t('Import templates')}
           onImport={() => setImporting(true)}
           afterImport={(result: string, media: any) => {
             const extension = getFileExtension(media.name);
             if (extension !== 'csv') {
               setNotification('Please upload a valid CSV file', 'warning');
               setImporting(false);
             } else {
-              bulkApplyTemplates({ variables: { data: result } });
+              importTemplatesMutation({ variables: { data: result } });
             }
           }}
         />
       </div>
     );
-  }
-
-  if (provider === GUPSHUP_ENTERPRISE_SHORTCODE) {
-    secondaryButton = (
-      <ImportButton
-        title={t('Import templates')}
-        onImport={() => setImporting(true)}
-        afterImport={(result: string, media: any) => {
-          const extension = getFileExtension(media.name);
-          if (extension !== 'csv') {
-            setNotification('Please upload a valid CSV file', 'warning');
-            setImporting(false);
-          } else {
-            importTemplatesMutation({ variables: { data: result } });
-          }
-        }}
-      />
-    );
     button.show = false;
   }
 

diff --git a/yarn.lock b/yarn.lock
@@ -652,10 +652,10 @@
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.23.1.tgz#81fd50d11e2c32b2d6241470e3185b70c7b30699"
   integrity sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==
 
-"@glific/flow-editor@^1.26.3-15":
-  version "1.26.3-15"
-  resolved "https://registry.yarnpkg.com/@glific/flow-editor/-/flow-editor-1.26.3-15.tgz#7f281213fb3348703343a43d8d72fb0a8f3203a6"
-  integrity sha512-bCDjpodnCr32ZLOgq36HvveSUXL5NibEjJ2qwnvIBeyROipHvTLFlS4zpyU7JIB+rK6SDXlgVLcWmSveNK228w==
+"@glific/flow-editor@^1.26.3-17":
+  version "1.26.3-17"
+  resolved "https://registry.yarnpkg.com/@glific/flow-editor/-/flow-editor-1.26.3-17.tgz#4b38c37f908345dc77459e3cce09aca7182d43d0"
+  integrity sha512-438aIjOHmr2eE1icABebtKCh+g5Dd3FGlcs26PgtElu4mZVlJp+8T7wsU3N/B5Vvx5nkbL6RAMk7jxtVL9yCNQ==
   dependencies:
     react "^16.8.6"
     react-dom "^16.8.6"