Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/app/app-config.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ export interface AppConfigInterface {
defaultTab?: DefaultTab;
statusBannerMessage?: string;
statusBannerCode?: "INFO" | "WARN";
markForDeletionWorkflowEnabled?: boolean;
}

function isMainPageConfiguration(obj: any): obj is MainPageConfiguration {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,18 @@ describe("DatasetTableActionsComponent", () => {
setArchiveViewModeAction({ modeToggle }),
);
});

it("should dispatch selected marked_for_deletion archive mode", () => {
dispatchSpy = spyOn(store, "dispatch");
const modeToggle = ArchViewMode.marked_for_deletion;

component.onModeChange(modeToggle);

expect(dispatchSpy).toHaveBeenCalledTimes(1);
expect(dispatchSpy).toHaveBeenCalledWith(
setArchiveViewModeAction({ modeToggle }),
);
});
});

describe("#isEmptySelection()", () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,14 @@ export class DatasetTableActionsComponent implements OnInit, OnDestroy {
ArchViewMode.work_in_progress,
ArchViewMode.system_error,
ArchViewMode.user_error,
ArchViewMode.marked_for_deletion,
ArchViewMode.deleted,
];
].filter(
(mode) =>
this.appConfig.archiveWorkflowEnabled &&
(mode !== ArchViewMode.marked_for_deletion ||
this.appConfig.markForDeletionWorkflowEnabled),
);

searchPublicDataEnabled = this.appConfig.searchPublicDataEnabled;

Expand Down
10 changes: 10 additions & 0 deletions src/app/shared/services/datasets-list.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,12 @@ export class DatasetsListService implements OnDestroy {
return false;
}

markedForDeletionCondition(dataset: DatasetClass): boolean {
return (
dataset.datasetlifecycle.archiveStatusMessage === "markedForDeletion"
);
}

deletedCondition(dataset: DatasetClass): boolean {
return dataset.datasetlifecycle.archiveStatusMessage === "deleted";
}
Expand Down Expand Up @@ -192,6 +198,8 @@ export class DatasetsListService implements OnDestroy {
return "Archivable";
} else if (this.retrievableCondition(row)) {
return "Retrievable";
} else if (this.markedForDeletionCondition(row)) {
return "Marked for deletion";
} else if (this.deletedCondition(row)) {
return "Deleted";
} else if (this.systemErrorCondition(row)) {
Expand All @@ -210,6 +218,8 @@ export class DatasetsListService implements OnDestroy {
return "Archivable";
} else if (this.retrievableCondition(row)) {
return "Retrievable";
} else if (this.markedForDeletionCondition(row)) {
return "Marked for deletion";
} else if (this.deletedCondition(row)) {
return "Deleted";
} else if (this.systemErrorCondition(row)) {
Expand Down
1 change: 1 addition & 0 deletions src/app/state-management/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ export enum ArchViewMode {
work_in_progress = "work in progress",
system_error = "system error",
user_error = "user error",
marked_for_deletion = "marked for deletion",
deleted = "deleted",
}
export enum JobViewMode {
Expand Down
5 changes: 5 additions & 0 deletions src/app/state-management/reducers/datasets.reducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,11 @@ const reducer = createReducer(
],
};
break;
case ArchViewMode.marked_for_deletion:
mode = {
"datasetlifecycle.archiveStatusMessage": "markedForDeletion",
};
break;
case ArchViewMode.deleted:
mode = {
"datasetlifecycle.archiveStatusMessage": "deleted",
Expand Down