Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abdimo101 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
69abe44
updated frontend to work with the new externalsettings structure
abdimo101 Mar 23, 2026
dab1907
Merge branch 'master' into refactor-externalsettings-keys
abdimo101 Mar 23, 2026
096cfea
eslint fix
abdimo101 Mar 23, 2026
6d17329
test fix
abdimo101 Mar 23, 2026
8e17771
centralized external settings keys and removed any type
abdimo101 Mar 30, 2026
9e1cce0
eslint fix
abdimo101 Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/datasets/dataset-table/dataset-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ export class DatasetTableComponent implements OnInit, OnDestroy {
this.store.dispatch(
updateUserSettingsAction({
property: {
columns: columnsSetting,
fe_dataset_table_columns: columnsSetting,
},
}),
);
Expand Down
2 changes: 1 addition & 1 deletion src/app/datasets/datasets-filter/datasets-filter.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/app/datasets/datasets-filter/datasets-filter.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ export class DatasetsFilterComponent implements OnInit, OnDestroy {
);
this.store.dispatch(
updateUserSettingsAction({
property: { conditions: [] },
property: { fe_dataset_table_conditions: [] },
}),
);

Expand Down Expand Up @@ -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 },
}),
);

Expand Down
15 changes: 4 additions & 11 deletions src/app/files/files-dashboard/files-dashboard.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
}),
);
Expand Down
15 changes: 4 additions & 11 deletions src/app/instruments/instruments-dashboard/instruments-dashboard.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
}),
);
Expand Down
9 changes: 1 addition & 8 deletions src/app/proposals/proposal-table/proposal-table.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
}),
);
Expand Down
3 changes: 1 addition & 2 deletions src/app/samples/sample-dashboard/sample-dashboard.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
Copy link
Copy Markdown
Member

@Junjiequan Junjiequan Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn’t samples clear enough already? Is there any specific reason to use longer text when the property name is self-explanatory?

[addConditionAction]="addCondition"
[removeConditionAction]="removeCondition"
></shared-condition>
Expand Down
15 changes: 4 additions & 11 deletions src/app/samples/sample-dashboard/sample-dashboard.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
}),
);
Expand Down
1 change: 1 addition & 0 deletions src/app/shared/modules/shared-condition/shared-condition.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ describe("SharedConditionComponent", () => {

fixture = TestBed.createComponent(SharedConditionComponent);
component = fixture.componentInstance;
component.conditionSettingsKey = "fe_dataset_table_conditions";
fixture.detectChanges();
});

Expand Down
Loading
Loading