Skip to content

Commit

Permalink
Convert assessment table to new table
Browse files Browse the repository at this point in the history
Update questionnaire model to match hub proposal

Start on Assessment Actions page

Restore drawer click bug fix

Signed-off-by: ibolton336 <[email protected]>
  • Loading branch information
ibolton336 committed Aug 17, 2023
1 parent 435b73a commit 7746f90
Show file tree
Hide file tree
Showing 9 changed files with 1,558 additions and 537 deletions.
1 change: 1 addition & 0 deletions client/src/app/Paths.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export enum Paths {
applicationsImports = "/applications/application-imports",
applicationsImportsDetails = "/applications/application-imports/:importId",
applicationsAssessment = "/applications/assessment/:assessmentId",
assessmentActions = "/applications/assessment-actions",
applicationsReview = "/applications/application/:applicationId/review",
applicationsAnalysis = "/applications/analysis",
controls = "/controls",
Expand Down
10 changes: 10 additions & 0 deletions client/src/app/Routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ const AssessmentSettings = lazy(
const Questionnaire = lazy(
() => import("./pages/assessment-management/questionnaire/questionnaire-page")
);
const AssessmentActions = lazy(
() =>
import("./pages/applications/assessment-actions/assessment-actions-page")
);
export interface IRoute {
path: string;
comp: React.ComponentType<any>;
Expand All @@ -66,6 +70,12 @@ export const devRoutes: IRoute[] = [
comp: ApplicationAssessment,
exact: false,
},
{
path: Paths.assessmentActions,
comp: AssessmentActions,
exact: false,
},

{
path: Paths.applicationsReview,
comp: Reviews,
Expand Down
18 changes: 17 additions & 1 deletion client/src/app/api/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ export interface Application {
repository?: Repository;
binary?: string;
migrationWave: Ref | null;
assessments?: Questionnaire[];
}

export interface Review {
Expand Down Expand Up @@ -705,15 +706,30 @@ export type HubFile = {
path: string;
};

// export interface Questionnaire {
// id: number;
// required: boolean;
// name: string;
// questions: number;
// rating: string;
// dateImported: string;
// system: boolean;
// }
export interface Questionnaire {
id: number;
required: boolean;
name: string;
description: string;
revision: number;
questions: number;
rating: string;
dateImported: string;
required: boolean;
system: boolean;
sections: Section[];
thresholds: Thresholds;
riskMessages: RiskMessages;
}

export interface RiskMessages {
green: string;
red: string;
Expand Down
Loading

0 comments on commit 7746f90

Please sign in to comment.