Skip to content

404 error appears upon deleting copied risk profile #1150

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

Closed
sofyakurilova wants to merge 1 commit into from
Closed

404 error appears upon deleting copied risk profile #1150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 modules/ui/src/app/pages/risk-assessment/profile-form/profile-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
</div>
<button
mat-flat-button
[disabled]="selectedProfile === null"
[disabled]="selectedProfile === null || isCopyProfile"
(click)="onDeleteClick()"
class="delete-button">
Delete
Expand Down
11 changes: 9 additions & 2 deletions modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ import {
ChangeDetectorRef,
ElementRef,
} from '@angular/core';
import { RiskAssessmentStore } from './risk-assessment.store';
import {
COPY_ACTION,
DElETE_ACTION,
RiskAssessmentStore,
} from './risk-assessment.store';
import { SimpleDialogComponent } from '../../components/simple-dialog/simple-dialog.component';
import { Subject, takeUntil, timer } from 'rxjs';
import { MatDialog } from '@angular/material/dialog';
Expand Down Expand Up @@ -264,7 +268,10 @@ export class RiskAssessmentComponent
actions(actions: EntityAction[]) {
return (profile: Profile) => {
if (profile.status === ProfileStatus.EXPIRED) {
return [{ action: ProfileAction.Delete, icon: 'delete' }];
return [DElETE_ACTION];
}
if (!profile.created) {
return [COPY_ACTION];
}
return actions;
};
Expand Down
7 changes: 3 additions & 4 deletions modules/ui/src/app/pages/risk-assessment/risk-assessment.store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ import { selectRiskProfiles } from '../../store/selectors';
import { setRiskProfiles } from '../../store/actions';
import { EntityAction } from '../../model/entity-action';

export const COPY_ACTION = { action: ProfileAction.Copy, icon: 'content_copy' };
export const DElETE_ACTION = { action: ProfileAction.Delete, icon: 'delete' };
export interface AppComponentState {
selectedProfile: Profile | null;
profiles: Profile[];
Expand Down Expand Up @@ -190,10 +192,7 @@ export class RiskAssessmentStore extends ComponentStore<AppComponentState> {
profiles: [],
profileFormat: [],
selectedProfile: null,
actions: [
{ action: ProfileAction.Copy, icon: 'content_copy' },
{ action: ProfileAction.Delete, icon: 'delete' },
],
actions: [COPY_ACTION, DElETE_ACTION],
});
}
}
Loading