Merge pull request #3829 from bcgov/NDT-680-Remove-Null-option-for-CR…

…TC-and-Connected-Coast-Dependent-dropdowns feat: allow selects to not have null value
bcgov · Feb 1, 2025 · cb1ad64 · cb1ad64
2 parents 310ded8 + 72e17a1
commit cb1ad64
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# [1.234.0](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.233.0...v1.234.0) (2025-01-31)
+
+### Features
+
+- allow selects to not have null value ([a7c798c](https://github.com/bcgov/CONN-CCBC-portal/commit/a7c798cd3e5ef0486458c4bf124412d32a4809cf))
+
 # [1.233.0](https://github.com/bcgov/CONN-CCBC-portal/compare/v1.232.0...v1.233.0) (2025-01-31)
 
 ### Features

diff --git a/app/formSchema/uiSchema/analyst/assessmentsUiSchema.ts b/app/formSchema/uiSchema/analyst/assessmentsUiSchema.ts
@@ -45,12 +45,14 @@ const assessmentsUiSchema = {
   },
   connectedCoastNetworkDependent: {
     'ui:widget': 'SelectWidget',
+    'ui:shownull': false,
     'ui:options': {
       boldTitle: true,
     },
   },
   crtcProjectDependent: {
     'ui:widget': 'SelectWidget',
+    'ui:shownull': false,
     'ui:options': {
       boldTitle: true,
     },

diff --git a/app/lib/theme/widgets/SelectWidget.tsx b/app/lib/theme/widgets/SelectWidget.tsx
@@ -76,8 +76,8 @@ const SelectWidget: React.FC<SelectWidgetProps> = ({
   // @ts-ignore
   const options = objectOptions ?? (schema.enum as Array<string>);
   const description = uiSchema ? uiSchema['ui:description'] : null;
+  const showNull = uiSchema?.['ui:shownull'] ?? true;
   const isError = rawErrors && rawErrors.length > 0 && !value;
-
   return (
     <StyledDiv className="select-widget-wrapper">
       <StyledSelect
@@ -95,9 +95,12 @@ const SelectWidget: React.FC<SelectWidgetProps> = ({
         value={value}
         aria-label={label}
       >
-        <option key={`option-placeholder-${id}`} value={undefined}>
-          {placeholder}
-        </option>
+        {showNull && (
+          <option key={`option-placeholder-${id}`} value={undefined}>
+            {placeholder}
+          </option>
+        )}
+        ;
         {options?.map((opt, index) => {
           return (
             <option

diff --git a/db/sqitch.plan b/db/sqitch.plan
@@ -795,3 +795,4 @@ tables/application_map_data 2025-01-28T17:53:59Z Rafael Solorzano <61289255+rafa
 @1.231.0 2025-01-31T05:19:13Z CCBC Service Account <[email protected]> # release v1.231.0
 @1.232.0 2025-01-31T17:43:27Z CCBC Service Account <[email protected]> # release v1.232.0
 @1.233.0 2025-01-31T22:40:56Z CCBC Service Account <[email protected]> # release v1.233.0
+@1.234.0 2025-01-31T23:42:58Z CCBC Service Account <[email protected]> # release v1.234.0
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CONN-CCBC-portal",
-  "version": "1.233.0",
+  "version": "1.234.0",
   "main": "index.js",
   "repository": "https://github.com/bcgov/CONN-CCBC-portal.git",
   "author": "Romer, Meherzad CITZ:EX <[email protected]>",