refactor: update frontend to be compatible with the new externalsettings structure

src/app/datasets/dataset-table/dataset-table.component.ts

@@ -224,7 +224,7 @@ export class DatasetTableComponent implements OnInit, OnDestroy {
     this.store.dispatch(
       updateUserSettingsAction({
         property: {
-          columns: columnsSetting,
+          fe_dataset_table_columns: columnsSetting,
         },
       }),
     );

src/app/datasets/datasets-filter/datasets-filter.component.html

@@ -62,7 +62,7 @@
       [metadataKeys]="metadataKeys$ | async"
       [unitsEnabled]="appConfig.scienceSearchUnitsEnabled"
       [showConditionToggle]="true"
-      [conditionType]="'datasets'"
+      [conditionSettingsKey]="'fe_dataset_table_conditions'"
       [addConditionAction]="addCondition"
       [removeConditionAction]="removeCondition"
     ></shared-condition>

src/app/datasets/datasets-filter/datasets-filter.component.ts

@@ -169,7 +169,7 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy {
     );
     this.store.dispatch(
       updateUserSettingsAction({
-        property: { conditions: [] },
+        property: { fe_dataset_table_conditions: [] },
       }),
     );
 
@@ -208,7 +208,7 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy {
         if (filtersChanged) {
           this.store.dispatch(
             updateUserSettingsAction({
-              property: { filters: result.filterConfigs },
+              property: { fe_dataset_table_filters: result.filterConfigs },
             }),
           );
 

src/app/files/files-dashboard/files-dashboard.component.ts

@@ -250,23 +250,16 @@ export class FilesDashboardComponent implements OnInit, OnDestroy {
 
   saveTableSettings(setting: ITableSetting) {
     this.pending = true;
-    const columnsSetting = setting.columnSetting.map((column) => {
-      const { name, display, index, width } = column;
+    const columnsSetting = setting.columnSetting.map((column, index) => {
+      const { name, display, width } = column;
 
-      return { name, display, index, width };
+      return { name, display, order: index, width };
     });
 
-    const tablesSettings = {
-      ...this.tablesSettings,
-      [setting.settingName || this.tableName]: {
-        columns: columnsSetting,
-      },
-    };
-
     this.store.dispatch(
       updateUserSettingsAction({
         property: {
-          tablesSettings,
+          fe_file_table_columns: columnsSetting,
         },
       }),
     );

src/app/instruments/instruments-dashboard/instruments-dashboard.component.ts

@@ -195,23 +195,16 @@ export class InstrumentsDashboardComponent implements OnInit, OnDestroy {
 
   saveTableSettings(setting: ITableSetting) {
     this.pending = true;
-    const columnsSetting = setting.columnSetting.map((column) => {
-      const { name, display, index, width } = column;
+    const columnsSetting = setting.columnSetting.map((column, index) => {
+      const { name, display, width } = column;
 
-      return { name, display, index, width };
+      return { name, display, order: index, width };
     });
 
-    const tablesSettings = {
-      ...this.tablesSettings,
-      [setting.settingName || this.tableName]: {
-        columns: columnsSetting,
-      },
-    };
-
     this.store.dispatch(
       updateUserSettingsAction({
         property: {
-          tablesSettings,
+          fe_instrument_table_columns: columnsSetting,
         },
       }),
     );

src/app/proposals/proposal-table/proposal-table.component.ts

@@ -257,17 +257,10 @@ export class ProposalTableComponent implements OnInit, OnDestroy {
       };
     });
 
-    const tablesSettings = {
-      ...this.tablesSettings,
-      [setting.settingName || this.tableName]: {
-        columns: columnsSetting,
-      },
-    };
-
     this.store.dispatch(
       updateUserSettingsAction({
         property: {
-          tablesSettings,
+          fe_proposal_table_columns: columnsSetting,
         },
       }),
     );

src/app/samples/sample-dashboard/sample-dashboard.component.html

@@ -21,15 +21,14 @@
               (search)="onTextSearchChange($event)"
             ></app-search-bar>
 
-
             <shared-condition
               #conditionFilter
               *ngIf="appConfig.scienceSearchEnabled"
               [showConditions]="true"
               [metadataKeys]="vm.metadataKeys"
               [unitsEnabled]="appConfig.scienceSearchUnitsEnabled"
               [showConditionToggle]="false"
-              [conditionType]="'samples'"
+              [conditionSettingsKey]="'fe_sample_table_conditions'"
               [addConditionAction]="addCondition"
               [removeConditionAction]="removeCondition"
             ></shared-condition>

src/app/samples/sample-dashboard/sample-dashboard.component.ts

@@ -329,23 +329,16 @@ export class SampleDashboardComponent implements OnInit, OnDestroy {
 
   saveTableSettings(setting: ITableSetting) {
     this.pending = true;
-    const columnsSetting = setting.columnSetting.map((column) => {
-      const { name, display, index, width } = column;
+    const columnsSetting = setting.columnSetting.map((column, index) => {
+      const { name, display, width } = column;
 
-      return { name, display, index, width };
+      return { name, display, order: index, width };
     });
 
-    const tablesSettings = {
-      ...this.tablesSettings,
-      [setting.settingName || this.tableName]: {
-        columns: columnsSetting,
-      },
-    };
-
     this.store.dispatch(
       updateUserSettingsAction({
         property: {
-          tablesSettings,
+          fe_sample_table_columns: columnsSetting,
         },
       }),
     );

src/app/shared/modules/shared-condition/shared-condition.component.spec.ts

@@ -49,6 +49,7 @@ describe("SharedConditionComponent", () => {
 
     fixture = TestBed.createComponent(SharedConditionComponent);
     component = fixture.componentInstance;
+    component.conditionSettingsKey = "fe_dataset_table_conditions";
     fixture.detectChanges();
   });