Merge pull request #3147 from glific/sync-hsm

Moved sync button to top
glific · Dec 10, 2024 · 8995031 · 8995031
2 parents f5c05d2 + 272f2ce
commit 8995031
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 25 deletions.
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;
   }