Update PSQL, interface, error message and scss

Author: sggerard

migrations/sql/V2025.01.07.22.23__add_permit_condition_status.sql

@@ -1,6 +1,6 @@
 
 
-CREATE TABLE permit_condition_status_code
+CREATE TABLE IF NOT EXISTS permit_condition_status_code
     (
         permit_condition_status_code character varying(3) NOT NULL,
         description character varying(100) NOT NULL,
@@ -32,15 +32,15 @@ CREATE TABLE permit_condition_status_code
     ON CONFLICT DO NOTHING;
 
 ALTER TABLE permit_conditions
-    ADD COLUMN IF NOT EXISTS permit_condition_status_code character varying(3),
+    ADD COLUMN IF NOT EXISTS permit_condition_status_code character varying(3) DEFAULT 'NST' NOT NULL,
     ADD COLUMN IF NOT EXISTS top_level_parent_permit_condition_id integer,
 ADD CONSTRAINT permit_condition_status_code_fkey FOREIGN KEY (permit_condition_status_code)
     REFERENCES permit_condition_status_code(permit_condition_status_code),
 ADD CONSTRAINT top_level_parent_permit_condition_id_fkey FOREIGN KEY (top_level_parent_permit_condition_id)
     REFERENCES permit_conditions(permit_condition_id);
 
 ALTER TABLE permit_conditions_version 
-    ADD COLUMN IF NOT EXISTS permit_condition_status_code character varying(3),
+    ADD COLUMN IF NOT EXISTS permit_condition_status_code character varying(3) DEFAULT 'NST' NOT NULL,
     ADD COLUMN IF NOT EXISTS top_level_parent_permit_condition_id integer,
 ADD CONSTRAINT permit_condition_status_code_fkey FOREIGN KEY (permit_condition_status_code)
     REFERENCES permit_condition_status_code(permit_condition_status_code),

services/common/src/interfaces/permits/permitCondition.interface.ts

@@ -19,15 +19,15 @@ export interface IPermitCondition {
   condition: string;
   condition_type_code: string;
   condition_category_code: string;
-  parent_permit_condition_id: number;
+  parent_permit_condition_id?: number;
   sub_conditions: IPermitCondition[];
   step: string;
   stepPath?: string;
   display_order: number;
   mineReportPermitRequirement?: IMineReportPermitRequirement;
   meta?: IPermitConditionMeta
   permit_condition_status_code: string;
-  top_level_parent_permit_condition_id: number;
+  top_level_parent_permit_condition_id?: number;
 }
 
 export interface IPermitConditionCategory {

services/core-api/app/api/mines/permits/permit_conditions/models/permit_condition_status_code.py

@@ -24,7 +24,7 @@ def find_by_permit_condition_status_code(cls, _id):
     @validates('permit_condition_status_code')
     def validate_permit_condition_status_code(self, key, permit_condition_status_code):
         if not permit_condition_status_code:
-            raise AssertionError('Permit amendment status code is not provided.')
+            raise AssertionError('Permit condition status code is not provided.')
         if len(permit_condition_status_code) > 3:
-            raise AssertionError('Permit amendment status code must not exceed 3 characters.')
+            raise AssertionError('Permit condition status code must not exceed 3 characters.')
         return permit_condition_status_code

services/core-web/src/components/mine/Permit/PermitConditions.tsx

@@ -132,9 +132,9 @@ const PermitConditions: FC<PermitConditionProps> = ({
   );
 
   const PERMIT_CONDITION_STATUS = {
-    complete: {icon: faCheckCircle, color: "#45a766", text: "Complete"},
-    in_progress: {icon: faClock, color: COLOR.violet, text: "In Progress"},
-    not_started: {icon: faBan, color: "#bbb", text:"Not Started"}
+    complete: {icon: faCheckCircle, color: "color-success", text: "Complete"},
+    in_progress: {icon: faClock, color: "color-primary", text: "In Progress"},
+    not_started: {icon: faBan, color: "color-gov-grey", text:"Not Started"}
   }
 
   const getPermitConditionCategories = (categories, conditions) => {
@@ -197,7 +197,7 @@ const PermitConditions: FC<PermitConditionProps> = ({
 
         return {
           href: cat.condition_category_code.toLowerCase().replace("-", ""),
-          icon: <FontAwesomeIcon icon={status.icon} style={{ color: status.color, fontSize: "20px" }} />,
+          icon: <FontAwesomeIcon icon={status.icon} className={status.color} style={{ fontSize: "20px" }} />,
           title: (
             <Typography.Text style={{ fontSize: "16px", fontWeight: "600" }}>
               {formatPermitConditionStep(cat.step)}

services/core-web/src/styles/generic/helpers.scss

@@ -21,6 +21,10 @@
     color: theme.$white !important;
   }
 
+  &-success {
+    color: variables.$ok-green !important;
+  }
+
   // Brand Colours
   &-gov-grey {
     color: variables.$gov-grey !important;