cleanup

Author: xsalonx

lib/public/views/Runs/Overview/exportTriggerAndModal.js

@@ -17,8 +17,7 @@ import { h } from '/js/src/index.js';
 /**
  * Export form component, containing the fields to export, the export type and the export button
  *
- * @param {RunsOverviewModel} exportModel the runsOverviewModel
- * @param {array} runs the runs to export
+ * @param {DataExportModel} exportModel export model
  * @param {ModalHandler} modalHandler The modal handler, used to dismiss modal after export
  *
  * @return {vnode[]} the form component
@@ -54,13 +53,13 @@ const exportForm = (exportModel, modalHandler) => {
             }, name)),
     ]);
 
-    const exportTypeSelectionHeader = [
-        h('.form-check-label.f4.mt1', 'Export type'),
-        h('.form-check-label.f6', 'Select output format'),
+    const exportTypeSelectionLabels = [
+        h('label.form-check-label.f4.mt1', 'Export type'),
+        h('label.form-check-label.f6', 'Select output format'),
     ];
 
     const exportTypeSelect = h('.flex-row.g3', exportTypes.map((exportType) => {
-        const id = `runs-export-type-${exportType}`;
+        const id = `data-export-type-${exportType}`;
         return h('.form-check', [
             h('input.form-check-input', {
                 id,
@@ -84,23 +83,23 @@ const exportForm = (exportModel, modalHandler) => {
             await exportModel.createExport();
             modalHandler.dismiss();
         },
-    }, dataAvailable ? 'Export' : 'Loading data');
+    }, dataAvailable ? 'Export' : 'Loading data...');
 
     const dataLength = exportModel.items.match({ Success: ({ length } = {}) => length, Other: () => null });
     const { totalExistingItemsCount } = exportModel;
 
     const truncatedDataInfo = dataLength && dataLength < totalExistingItemsCount
         ? h(
             '#truncated-export-warning.warning',
-            `The data export is limited to ${dataLength} entries, only the last data will be exported`,
+            `The data export is limited to ${dataLength} entries, only the most recent data will be exported`,
         )
         : null;
 
     return [
-        dataAvailable ? truncatedDataInfo : spinner({ size: 2, absolute: false }),
+        truncatedDataInfo,
         fieldsSelectionLabels,
         fieldsSelection,
-        exportTypeSelectionHeader,
+        exportTypeSelectionLabels,
         exportTypeSelect,
         exportBtn,
     ];
@@ -109,16 +108,21 @@ const exportForm = (exportModel, modalHandler) => {
 const errorDisplay = () => h('.danger', 'Data fetching failed');
 
 /**
- * A function to construct the exports runs screen
+ * A function to construct the exports data screen
  *
- * @param {ExportModel} exportModel pass the model to access the defined functions
+ * @param {DataExportModel} exportModel pass the model to access the defined functions
  * @param {ModalHandler} modalHandler The modal handler, used to dismiss modal after export
  * @return {Component} Return the view of the inputs
  */
 const exportModal = (exportModel, modalHandler) => {
     exportModel.callForData();
+    const dataLoading = exportModel.items.match({ Loading: () => true, Other: () => false });
+
     return h('div#export-data-modal', [
-        h('h2', 'Export data'),
+        h('.flex-row', [
+            h('h2.w-50', 'Export data'),
+            dataLoading ? h('.w-50', spinner({ size: 2, absolute: false })) : null,
+        ]),
         exportModel.items.match({
             NotAsked: () => errorDisplay(),
             Failure: () => errorDisplay(),
@@ -130,7 +134,7 @@ const exportModal = (exportModel, modalHandler) => {
 /**
  * Builds a button which will open popover for data export
  *
- * @param {ExportModel} exportModel runs overview model
+ * @param {DataExportModel} exportModel export model
  * @param {ModelModel} modalModel modal model
  * @param {object} [displayConfiguration] additional display options
  * @param {boolean} [displayConfiguration.autoMarginLeft = true] if true margin left is set to auto, otherwise not

test/public/runs/overview.test.js

@@ -46,7 +46,7 @@ const { runService } = require('../../../lib/server/services/run/RunService.js')
 
 const { expect } = chai;
 
-const EXPORT_RUNS_TRIGGER_SELECTOR = '#export-runs-trigger';
+const EXPORT_RUNS_TRIGGER_SELECTOR = '#export-data-trigger';
 
 module.exports = () => {
     let page;
@@ -885,7 +885,7 @@ module.exports = () => {
         const truncatedExportWarning = await page.waitForSelector('#export-runs-modal #truncated-export-warning');
         expect(await truncatedExportWarning.evaluate((warning) => warning.innerText))
             .to
-            .equal('The runs export is limited to 100 entries, only the last runs will be exported (sorted by run number)');
+            .equal('The data export is limited to 100 entries, only the most recent data will be exported');
     });
 
     it('should successfully display disabled runs export button when there is no runs available', async () => {

test/public/runs/runsPerDataPass.overview.test.js

@@ -268,7 +268,7 @@ module.exports = () => {
 
         // First export
         await pressElement(page, '#actions-dropdown-button .popover-trigger', true);
-        await pressElement(page, '#export-runs-trigger');
+        await pressElement(page, '#export-data-trigger');
         await page.waitForSelector('#export-runs-modal');
         await page.waitForSelector('#send:disabled');
         await page.waitForSelector('.form-control');

test/public/runs/runsPerLhcPeriod.overview.test.js

@@ -179,7 +179,7 @@ module.exports = () => {
         await waitForTableLength(page, 4);
     });
 
-    const EXPORT_RUNS_TRIGGER_SELECTOR = '#export-runs-trigger';
+    const EXPORT_RUNS_TRIGGER_SELECTOR = '#export-data-trigger';
 
     it('should successfully export all runs per lhc Period', async () => {
         await page.evaluate(() => {

test/public/runs/runsPerSimulationPass.overview.test.js

@@ -191,7 +191,7 @@ module.exports = () => {
     });
 
     it('should successfully export runs', async () => {
-        const EXPORT_RUNS_TRIGGER_SELECTOR = '#export-runs-trigger';
+        const EXPORT_RUNS_TRIGGER_SELECTOR = '#export-data-trigger';
 
         const targetFileName = 'runs.json';