chose: fix export menu text and reorder them

Author: lpatiny

src/component/toolbar/toolbarMenu.tsx

@@ -40,20 +40,6 @@ const IMPORT_MENU: ToolbarPopoverMenuItem[] = [
 ] as const;
 
 const EXPORT_MENU: ToolbarPopoverMenuItem[] = [
-  {
-    icon: <FaDownload />,
-    text: 'Export as SVG',
-    data: {
-      id: 'svg',
-    },
-  },
-  {
-    icon: <FaFileImage />,
-    text: 'Export as PNG',
-    data: {
-      id: 'png',
-    },
-  },
   {
     icon: <FaFileDownload />,
     text: 'Save data (Press Ctrl+s)',
@@ -63,16 +49,23 @@ const EXPORT_MENU: ToolbarPopoverMenuItem[] = [
   },
   {
     icon: <FaFileDownload />,
-    text: 'Save data as (Press Ctrl+Shift+s)',
+    text: 'Save as (Press Ctrl+Shift+s)',
     data: {
       id: 'advance_save',
     },
   },
   {
-    icon: <FaFileDownload />,
-    text: 'Save NMRE data',
+    icon: <FaDownload />,
+    text: 'Export as SVG',
     data: {
-      id: 'nmre',
+      id: 'svg',
+    },
+  },
+  {
+    icon: <FaFileImage />,
+    text: 'Export as PNG',
+    data: {
+      id: 'png',
     },
   },
   {
@@ -82,6 +75,13 @@ const EXPORT_MENU: ToolbarPopoverMenuItem[] = [
       id: 'copy',
     },
   },
+  {
+    icon: <FaFileDownload />,
+    text: 'Export as NMReData',
+    data: {
+      id: 'nmre',
+    },
+  },
 ];
 
 export { EXPORT_MENU, IMPORT_MENU };

test-e2e/panels/spectra.test.ts

@@ -370,7 +370,7 @@ test('Export source from 1H spectrum', async ({ page }) => {
   });
   await test.step('Open Save as window ', async () => {
     await nmrium.clickTool('exportAs');
-    await nmrium.page.click('_react=ToolbarPopoverItem  >> text=Save data as');
+    await nmrium.page.click('_react=ToolbarPopoverItem  >> text=Save as');
   });
   await test.step('Check include data options', async () => {
     const fields = nmrium.page.locator(
@@ -408,7 +408,7 @@ test('Export source from 1H spectrum', async ({ page }) => {
   await test.step('Check export DATA SOURCE', async () => {
     const downloadPromise = nmrium.page.waitForEvent('download');
     await nmrium.clickTool('exportAs');
-    await nmrium.page.click('_react=ToolbarPopoverItem  >> text=Save data as');
+    await nmrium.page.click('_react=ToolbarPopoverItem  >> text=Save as');
 
     await nmrium.page.click('_react=SaveAsModal >> text="Data source" ');
 
@@ -432,7 +432,7 @@ test('Export source from 1H spectrum', async ({ page }) => {
   await test.step('Check export NO Data', async () => {
     const downloadPromise = nmrium.page.waitForEvent('download');
     await nmrium.clickTool('exportAs');
-    await nmrium.page.click('_react=ToolbarPopoverItem >> text=Save data as');
+    await nmrium.page.click('_react=ToolbarPopoverItem >> text=Save as');
     await nmrium.page.click('_react=SaveAsModal >> text="No data" ');
     await nmrium.page.click('_react=SaveAsModal >> button >> text=Save');
     const download = await downloadPromise;
@@ -458,7 +458,7 @@ test('Export source from imported spectrum', async ({ page }) => {
   });
   await test.step('Open Save as window ', async () => {
     await nmrium.clickTool('exportAs');
-    await nmrium.page.click('_react=ToolbarPopoverItem  >> text=Save data as');
+    await nmrium.page.click('_react=ToolbarPopoverItem  >> text=Save as');
   });
   await test.step('Check include data options', async () => {
     const fields = nmrium.page.locator(
@@ -495,7 +495,7 @@ test('Export source from imported spectrum', async ({ page }) => {
   await test.step('Check export NO Data', async () => {
     const downloadPromise = nmrium.page.waitForEvent('download');
     await nmrium.clickTool('exportAs');
-    await nmrium.page.click('_react=ToolbarPopoverItem >> text=Save data as');
+    await nmrium.page.click('_react=ToolbarPopoverItem >> text=Save as');
     await nmrium.page.click('_react=SaveAsModal >> text="No data"');
     await nmrium.page.click('_react=SaveAsModal >> button >> text=Save');
     const download = await downloadPromise;