refactor

Author: xsalonx

lib/public/models/DataExportModel.js

@@ -22,9 +22,10 @@ export class DataExportModel extends Observable {
     /**
      * Constructor
      * @param {ObservableData<RemoteData<T[]>>} items$ observable data used as source for export
-     * @param {function} onDataNotAskedAction
+     * @param {object<string, {exportFormat: function|null|undefined}>} fieldsFormatting defines selectable fields and their formatting
+     * @param {function} onDataNotAskedAction function to be called in case of missing data
      */
-    constructor(items$, onDataNotAskedAction) {
+    constructor(items$, fieldsFormatting, onDataNotAskedAction) {
         super();
 
         this._items$ = items$;
@@ -38,14 +39,22 @@ export class DataExportModel extends Observable {
 
         this._exportName = 'data';
 
-        this.columnFormats = null;
+        this._fieldsFormatting = fieldsFormatting;
         this._onDataNotAskedAction = onDataNotAskedAction;
 
         this._disabled = null;
 
         this._totalExistingItemsCount = null;
     }
 
+    /**
+     * Get mapping of selecteble fields to their format functions
+     * @return {object<string, {exportFormat: function|null|undefined}>} mapping
+     */
+    get fieldsFormatting() {
+        return this._fieldsFormatting;
+    }
+
     /**
      * Get total number of items that model knows they exist
      * @return {number} totalExistingItemsCount
@@ -104,7 +113,7 @@ export class DataExportModel extends Observable {
 
     /**
      * Observable notified when the export configuration visually changes
-     * @return {Observable}
+     * @return {Observable} the visual change observable
      */
     get visualChange$() {
         return this._visualChange$;
@@ -161,7 +170,7 @@ export class DataExportModel extends Observable {
                 const formatted = items.map((item) => {
                     const selectedEntries = Object.entries(pick(item, selectedFields));
                     const mappedEntries = selectedEntries.map(([key, value]) => {
-                        const formatter = this.columnFormats[key]?.exportFormat || ((v) => v);
+                        const formatter = this.fieldsFormatting[key]?.exportFormat || ((v) => v);
                         return [key, formatter(value, item)];
                     });
 

lib/public/models/OverviewModel.js

@@ -241,6 +241,11 @@ export class OverviewPageModel extends Observable {
         return this._sortModel;
     }
 
+    /**
+     * State whther some data was successfuly fetched
+     *
+     * @return {boolean} true if any data was successfuly fetched, false otherwise
+     */
     hasAnyData() {
         return this._item$.getCurrent().match({ Success: ({ length = 0 } = {}) => length > 0, Other: () => false });
     }

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

@@ -34,6 +34,7 @@ import { RunDefinitionFilterModel } from '../../../components/Filters/RunsFilter
 import { RUN_QUALITIES } from '../../../domain/enums/RunQualities.js';
 import { SelectionFilterModel } from '../../../components/Filters/common/filters/SelectionFilterModel.js';
 import { DataExportModel } from '../../../models/DataExportModel.js';
+import { runsActiveColumns as fieldsFormattingConf } from '../ActiveColumns/runsActiveColumns.js';
 
 /**
  * Model representing handlers for runs page
@@ -100,7 +101,7 @@ export class RunsOverviewModel extends OverviewPageModel {
             this._debouncedLoad = debounce(this.load.bind(this), model.inputDebounceTime);
         };
 
-        this._exportModel = new DataExportModel(this._allItems$, () => this.loadAll());
+        this._exportModel = new DataExportModel(this._allItems$, fieldsFormattingConf, () => this.loadAll());
         this._item$.observe(() => {
             this._exportModel.setDisabled(!this.hasAnyData());
             this._exportModel.setTotalExistingItemsCount(this._pagination.itemsCount);

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

@@ -51,8 +51,6 @@ export const RunsOverviewPage = ({ runs: { overviewModel: runsOverviewModel }, m
         PAGE_USED_HEIGHT,
     ));
 
-    runsOverviewModel.exportModel.columnFormats = runsActiveColumns;
-
     return h('', [
         h('.flex-row.header-container.g2.pv2', [
             filtersPanelPopover(runsOverviewModel, runsActiveColumns),

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

@@ -27,7 +27,7 @@ const exportForm = (exportModel, modalHandler) => {
 
     const { selectedFields } = exportModel;
     const { selectedExportType } = exportModel;
-    const fields = Object.keys(exportModel.columnFormats);
+    const fields = Object.keys(exportModel.fieldsFormatting);
 
     const fieldsSelected = selectedFields.length > 0;