Merge pull request #1826 from IFRCGo/fix/dref-final-report-form-schema-ns-actions

Add schema for NS Actions in DREF Final Report form

Author: subinasr

app/package.json

@@ -100,7 +100,6 @@
         "stylelint": "^16.17.0",
         "stylelint-config-concentric": "^2.0.2",
         "stylelint-config-recommended": "^15.0.0",
-        "stylelint-no-unused-selectors": "git+https://github.com/toggle-corp/stylelint-no-unused-selectors#e0831e1",
         "stylelint-value-no-unknown-custom-properties": "^6.0.1",
         "surge": "^0.23.1",
         "ts-md5": "^1.3.1",

app/src/views/DrefFinalReportForm/schema.ts

@@ -201,6 +201,7 @@ const schema: FinalReportFormSchema = {
             national_authorities: {},
             un_or_other_actor: {},
             is_there_major_coordination_mechanism: {},
+            has_national_society_conducted: {},
 
             // OPERATION
             total_dref_allocation: {},
@@ -426,6 +427,23 @@ const schema: FinalReportFormSchema = {
             },
         );
 
+        formFields = addCondition(
+            formFields,
+            formValue,
+            ['has_national_society_conducted'],
+            ['national_society_conducted_description'],
+            (val): Pick<FinalReportFormSchemaFields, 'national_society_conducted_description'> => {
+                if (val?.has_national_society_conducted) {
+                    return {
+                        national_society_conducted_description: {},
+                    };
+                }
+                return {
+                    national_society_conducted_description: { forceValue: nullValue },
+                };
+            },
+        );
+
         type ActionsDrefTypeRelatedFields = Pick<FinalReportFormSchemaFields, 'needs_identified' | 'event_scope'>;
         formFields = addCondition(
             formFields,

app/stylelint.config.js

@@ -15,17 +15,9 @@ const config = {
         'stylelint-config-concentric',
     ],
     plugins: [
-        'stylelint-no-unused-selectors',
         'stylelint-value-no-unknown-custom-properties',
     ],
     rules: {
-        'plugin/no-unused-selectors': [
-            true,
-            {
-                suffixesToStrip: ['.module'],
-                documents: ['{cssDir}/{cssName}.tsx'],
-            },
-        ],
         'csstools/value-no-unknown-custom-properties': [
             true,
             {

packages/ui/package.json

@@ -95,7 +95,6 @@
         "stylelint": "^16.17.0",
         "stylelint-config-concentric": "^2.0.2",
         "stylelint-config-recommended": "^15.0.0",
-        "stylelint-no-unused-selectors": "git+https://github.com/toggle-corp/stylelint-no-unused-selectors#e0831e1",
         "stylelint-value-no-unknown-custom-properties": "^6.0.1",
         "typescript": "^5.2.2",
         "typescript-eslint": "^8.26.0",

packages/ui/stylelint.config.js

@@ -1,6 +1,5 @@
 const config  = {
     plugins: [
-        'stylelint-no-unused-selectors',
         'stylelint-value-no-unknown-custom-properties',
     ],
     extends: [
@@ -10,12 +9,6 @@ const config  = {
     rules: {
         // https://stylelint.io/migration-guide/to-15
         // indentation: 4,
-        'plugin/no-unused-selectors': {
-            'suffixesToStrip': ['.module'],
-            'documents': [
-                '{cssDir}/{cssName}.tsx',
-            ],
-        },
         'csstools/value-no-unknown-custom-properties': [
             true, {
                 importFrom: ['./src/index.css']