Merge pull request #115 from intuitem/CA-264-Display-and-manage-statu…

…s-for-assessments Ca 264 display and manage status for assessments
intuitem · Mar 11, 2024 · 57867f4 · 57867f4
2 parents 41661e9 + b2a55b7
commit 57867f4
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 39 deletions.
diff --git a/backend/core/filters.py b/backend/core/filters.py
@@ -363,22 +363,6 @@ class ComplianceAssessmentFilter(GenericFilterSet):
     )
     project = GenericModelMultipleChoiceFilter(queryset=Project.objects.all())
     framework = GenericModelMultipleChoiceFilter(queryset=Framework.objects.all())
-    is_draft = GenericChoiceFilter(
-        choices=((True, _("Yes")), (False, _("No"))),
-        widget=Select(
-            attrs={
-                "class": "bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 disabled:opacity-50"
-            }
-        ),
-    )
-    is_obsolete = GenericChoiceFilter(
-        choices=((True, _("Yes")), (False, _("No"))),
-        widget=Select(
-            attrs={
-                "class": "bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 disabled:opacity-50"
-            }
-        ),
-    )
     orderby = GenericOrderingFilter(
         fields=(
             ("name", "name"),

diff --git a/backend/core/views.py b/backend/core/views.py
@@ -313,6 +313,10 @@ class RiskAssessmentViewSet(BaseModelViewSet):
         "status",
     ]
 
+    @action(detail=False, name="Get status choices")
+    def status(self, request):
+        return Response(dict(RiskAssessment.Status.choices))
+
     @action(detail=False, name="Get quality check")
     def quality_check(self, request):
         """
@@ -1129,10 +1133,14 @@ class ComplianceAssessmentViewSet(BaseModelViewSet):
     """
 
     model = ComplianceAssessment
-    filterset_fields = ["framework", "project"]
+    filterset_fields = ["framework", "project", "status"]
     search_fields = ["name", "description"]
     ordering_fields = ["name", "description"]
 
+    @action(detail=False, name="Get status choices")
+    def status(self, request):
+        return Response(dict(ComplianceAssessment.Status.choices))
+
     def perform_create(self, serializer):
         """
         Create RequirementAssessment objects for the newly created ComplianceAssessment

diff --git a/frontend/messages/en.json b/frontend/messages/en.json
@@ -435,6 +435,9 @@
 	"support": "Support",
 	"toDo": "To do",
 	"inProgress": "In progress",
+	"inReview": "In review",
+	"deprecated": "Deprecated",
+	"done": "Done",
 	"nonCompliant": "Non compliant",
 	"partiallyCompliant": "Partially compliant",
 	"compliant": "Compliant",

diff --git a/frontend/messages/fr.json b/frontend/messages/fr.json
@@ -435,6 +435,9 @@
 	"support": "Support",
 	"toDo": "À faire",
 	"inProgress": "En cours",
+	"inReview": "En révision",
+	"deprecated": "Déprécié",
+	"done": "Terminé",
 	"nonCompliant": "Non conforme",
 	"partiallyCompliant": "Partiellement conforme",
 	"compliant": "Conforme",

diff --git a/frontend/src/lib/components/Forms/ModelForm.svelte b/frontend/src/lib/components/Forms/ModelForm.svelte
@@ -117,6 +117,12 @@
 			hide={initialData.project}
 		/>
 		<TextField {form} field="version" label={m.version()} />
+		<Select
+			{form}
+			options={model.selectOptions['status']}
+			field="status"
+			label={m.status()}
+		/>
 		<AutocompleteSelect
 			{form}
 			options={getOptions({ objects: model.foreignKeys['risk_matrix'] })}
@@ -314,6 +320,12 @@
 			hide={initialData.project}
 		/>
 		<TextField {form} field="version" label={m.version()} />
+		<Select
+			{form}
+			options={model.selectOptions['status']}
+			field="status"
+			label={m.status()}
+		/>
 		<AutocompleteSelect
 			{form}
 			options={getOptions({ objects: model.foreignKeys['framework'] })}

diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
@@ -139,7 +139,8 @@ export const URL_MODEL_MAP: ModelMap = {
 			{ field: 'risk_scenarios', urlModel: 'risk-scenarios' }
 		],
 		reverseForeignKeyFields: [{ field: 'risk_assessment', urlModel: 'risk-scenarios' }],
-		filters: [{ field: 'project' }, { field: 'auditor' }]
+		selectFields: [{ field: 'status' }],
+		filters: [{ field: 'project' }, { field: 'auditor' }, { field: 'status' }]
 	},
 	threats: {
 		ref_id: 'ref_id',
@@ -325,7 +326,9 @@ export const URL_MODEL_MAP: ModelMap = {
 			{ field: 'framework', urlModel: 'frameworks' },
 			{ field: 'authors', urlModel: 'users' },
 			{ field: 'reviewers', urlModel: 'users' }
-		]
+		],
+		selectFields: [{ field: 'status' }],
+		filters: [{ field: 'status' }]
 	},
 	requirements: {
 		ref_id: 'ref_id',
@@ -394,10 +397,14 @@ interface FieldColoredTagMap {
 export const FIELD_COLORED_TAG_MAP: FieldColoredTagMap = {
 	'risk-assessments': {
 		name: {
-			key: 'is_draft',
+			key: 'status',
 			values: {
-				true: { text: 'draft', cssClasses: 'badge bg-blue-200' }
-			} // badge bg-blue-200 | bg-blue-500
+				planned: {text: 'planned', cssClasses: 'badge bg-indigo-300'},
+				in_progress: {text: 'inProgress', cssClasses: 'badge bg-yellow-300'},
+				in_review: {text: 'inReview', cssClasses: 'badge bg-cyan-300'},
+				done: {text: 'done', cssClasses: 'badge bg-lime-300'},
+				deprecated: {text: 'deprecated', cssClasses: 'badge bg-orange-300'}
+			}
 		}
 	},
 	'risk-scenarios': {
@@ -413,20 +420,16 @@ export const FIELD_COLORED_TAG_MAP: FieldColoredTagMap = {
 		}
 	},
 	'compliance-assessments': {
-		name: [
-			{
-				key: 'is_draft',
-				values: {
-					true: { text: 'draft', cssClasses: 'badge bg-blue-200' }
-				}
-			},
-			{
-				key: 'is_obsolete',
-				values: {
-					true: { text: 'obsolete', cssClasses: 'badge bg-red-300' }
-				}
+		name: {
+			key: 'status',
+			values: {
+				planned: {text: 'planned', cssClasses: 'badge bg-indigo-300'},
+				in_progress: {text: 'inProgress', cssClasses: 'badge bg-yellow-300'},
+				in_review: {text: 'inReview', cssClasses: 'badge bg-cyan-300'},
+				done: {text: 'done', cssClasses: 'badge bg-lime-300'},
+				deprecated: {text: 'deprecated', cssClasses: 'badge bg-orange-300'}
 			}
-		]
+		}
 	},
 	assets: {
 		name: {

diff --git a/frontend/src/lib/utils/locales.ts b/frontend/src/lib/utils/locales.ts
@@ -282,6 +282,9 @@ export function localItems(languageTag: string): LocalItems {
 		support: m.support({ languageTag: languageTag }),
 		toDo: m.toDo({ languageTag: languageTag }),
 		inProgress: m.inProgress({ languageTag: languageTag }),
+		inReview: m.inReview({ languageTag: languageTag }),
+		deprecated: m.deprecated({ languageTag: languageTag }),
+		done: m.done({ languageTag: languageTag }),
 		nonCompliant: m.nonCompliant({ languageTag: languageTag }),
 		partiallyCompliant: m.partiallyCompliant({ languageTag: languageTag }),
 		requirementAssessments: m.requirementAssessments({ languageTag: languageTag }),

diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
@@ -60,6 +60,7 @@ export const LibraryUploadSchema = z.object({
 export const RiskAssessmentSchema = baseNamedObject({
 	version: z.string().optional().default('0.1'),
 	project: z.string(),
+	status: z.string().optional(),
 	risk_matrix: z.string(),
 	eta: z.string().optional().nullable(),
 	due_date: z.string().optional().nullable(),
@@ -170,6 +171,7 @@ export const SetPasswordSchema = z.object({
 export const ComplianceAssessmentSchema = baseNamedObject({
 	version: z.string().optional().default('0.1'),
 	project: z.string(),
+	status: z.string().optional(),
 	framework: z.string(),
 	eta: z.string().optional().nullable(),
 	due_date: z.string().optional().nullable(),

diff --git a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/+page.svelte
@@ -88,7 +88,7 @@
 <div class="flex flex-col space-y-4 whitespace-pre-line">
 	<div class="card px-6 py-4 bg-white flex flex-row justify-between shadow-lg">
 		<div class="flex flex-col space-y-2 whitespace-pre-line">
-			{#each Object.entries(data.compliance_assessment).filter( ([key, _]) => ['name', 'description', 'project', 'framework', 'authors', 'reviewers'].includes(key) ) as [key, value]}
+			{#each Object.entries(data.compliance_assessment).filter( ([key, _]) => ['name', 'description', 'project', 'framework', 'authors', 'reviewers', 'status'].includes(key) ) as [key, value]}
 				<div class="flex flex-col">
 					<div
 						class="text-sm font-medium text-gray-800 capitalize-first"

diff --git a/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/risk-assessments/[id=uuid]/+page.svelte
@@ -204,14 +204,15 @@
 			</div>
 			<div class="container w-1/3">
 				<div id="name" class="text-lg font-semibold" data-testid="name-field-value">
-					{#if risk_assessment.is_draft}
-						<span class="badge bg-blue-200">{m.draft()}</span>
-					{/if}
 					{risk_assessment.project.str}/{risk_assessment.name} - {risk_assessment.version}
 				</div>
 				<br />
 				<div class="text-sm">
 					<ul>
+						<li class="pb-1">
+							<span class="font-semibold">{m.status()}:</span>
+							{risk_assessment.status}
+						</li>
 						<li class="pb-1">
 							<span class="font-semibold">{m.authors()}:</span>
 							<ul>

diff --git a/frontend/tests/functional/user-route.test.ts b/frontend/tests/functional/user-route.test.ts
@@ -125,6 +125,7 @@ test('user usual routine actions are working correctly', async ({
 			description: vars.description,
 			project: vars.projectName,
 			version: '1.4.2',
+			status: 'Done',
 			framework: vars.framework.name,
 			eta: '2025-01-01',
 			due_date: '2025-05-01'
@@ -179,6 +180,7 @@ test('user usual routine actions are working correctly', async ({
 			description: vars.description,
 			project: vars.projectName,
 			version: '1.4.2',
+			status: 'Done',
 			risk_matrix: vars.matrix.displayName,
 			eta: '2025-01-01',
 			due_date: '2025-05-01'

diff --git a/frontend/tests/utils/test-utils.ts b/frontend/tests/utils/test-utils.ts
@@ -89,6 +89,7 @@ export const test = base.extend<Fixtures>({
 			{ name: 'description', type: type.TEXT },
 			{ name: 'project', type: type.SELECT_AUTOCOMPLETE },
 			{ name: 'version', type: type.TEXT },
+			{ name: 'status', type: type.SELECT },
 			{ name: 'framework', type: type.SELECT_AUTOCOMPLETE },
 			{ name: 'eta', type: type.DATE },
 			{ name: 'due_date', type: type.DATE }
@@ -163,6 +164,7 @@ export const test = base.extend<Fixtures>({
 			{ name: 'description', type: type.TEXT },
 			{ name: 'project', type: type.SELECT_AUTOCOMPLETE },
 			{ name: 'version', type: type.TEXT },
+			{ name: 'status', type: type.SELECT },
 			{ name: 'risk_matrix', type: type.SELECT_AUTOCOMPLETE },
 			{ name: 'eta', type: type.DATE },
 			{ name: 'due_date', type: type.DATE }
@@ -448,6 +450,7 @@ export class TestContent {
 					name: vars.assessmentName,
 					description: vars.description,
 					project: vars.projectName,
+					status: 'Planned',
 					// version: "1.4.2",
 					framework: vars.framework.name
 					// eta: "2025-01-01",
@@ -491,6 +494,7 @@ export class TestContent {
 					description: vars.description,
 					project: vars.projectName,
 					version: '1.4.2',
+					status: 'Planned',
 					risk_matrix: vars.matrix.displayName
 					// eta: "2025-01-01",
 					// due_date: "2025-05-01"