Merge branch 'dev' into anton/fix-forwardRef

bcgov · Dec 18, 2024 · d0279ad · d0279ad
2 parents 3ad6ba9 + 449b9a7
commit d0279ad
Show file tree

Hide file tree

Showing 15 changed files with 691 additions and 86 deletions.
diff --git a/backend/src/app/services/site/site.service.spec.ts b/backend/src/app/services/site/site.service.spec.ts
@@ -502,7 +502,18 @@ describe('SiteService', () => {
               userAction: 'pending',
               apiAction: 'pending',
               srAction: 'pending',
-              notationParticipant: null,
+              notationParticipant: [
+                {
+                  apiAction: UserActionEnum.ADDED,
+                  eventParticId: 'xxx-xxx',
+                  eventId: '1',
+                  eprCode: 'RVB',
+                  psnorgId: '1',
+                  displayName: 'SAGER, J.',
+                  srAction: 'false',
+                  userAction: 'pending',
+                },
+              ],
             },
           ],
         };
@@ -1046,7 +1057,17 @@ describe('SiteService', () => {
           id: '1',
           etypCode: 'type',
           eclsCode: 'class',
-          notationParticipant: [],
+          notationParticipant: [
+            {
+              apiAction: UserActionEnum.ADDED,
+              eventParticId: 'xxx-xxx',
+              eventId: '1',
+              eprCode: 'RVB',
+              psnorgId: '1',
+              displayName: 'SAGER, J.',
+              srAction: 'false',
+            },
+          ],
         },
       ];
       const userInfo = { givenName: 'Updated User' };

diff --git a/backend/src/app/services/site/site.service.ts b/backend/src/app/services/site/site.service.ts
@@ -1090,6 +1090,14 @@ export class SiteService {
           // Process related participants regardless of event action
           if (notationParticipant?.length > 0) {
             await processParticipants(notationId, notationParticipant);
+          } else {
+            this.sitesLogger.warn(
+              `SiteService.processEvents(): There is no notation participants. Atleast every notation should have one notation participant.`,
+            );
+            throw new HttpException(
+              `Failed to process site notation participants. There is no notation participants. Atleast every notation should have one notation participant.`,
+              HttpStatus.NOT_FOUND,
+            );
           }
         });
 

diff --git a/frontend/src/app/components/form/Form.css b/frontend/src/app/components/form/Form.css
@@ -302,3 +302,8 @@ input::placeholder {
 .dropdown {
   position: unset !important;
 }
+
+.required-field::after {
+  content: ' *';
+  color: red;
+}
diff --git a/frontend/src/app/components/form/Form.tsx b/frontend/src/app/components/form/Form.tsx
@@ -87,6 +87,7 @@ const Form: React.FC<IFormRendererProps> = ({
                   isLoading={isLoading}
                   customInfoMessage={field.customInfoMessage}
                   customMenuMessage={field.customMenuMessage}
+                  isDisabled={field.isDisabled}
                 />
               )}
               {field.type === FormFieldType.TextArea && (
@@ -109,6 +110,7 @@ const Form: React.FC<IFormRendererProps> = ({
                   srMode={srMode ?? false}
                   textAreaRow={field.textAreaRow}
                   textAreaColoum={field.textAreaColoum}
+                  isDisabled={field.isDisabled}
                 />
               )}
               {field.type === FormFieldType.DropDown && (
@@ -129,6 +131,8 @@ const Form: React.FC<IFormRendererProps> = ({
                   isEditing={editMode ?? true}
                   isImage={field.isImage}
                   srMode={srMode ?? false}
+                  validation={field.validation}
+                  isDisabled={field.isDisabled}
                 />
               )}
               {field.type === FormFieldType.DropDownWithSearch && (
@@ -152,6 +156,8 @@ const Form: React.FC<IFormRendererProps> = ({
                   filteredOptions={field.filteredOptions || []}
                   isLoading={field.isLoading}
                   customInfoMessage={field.customInfoMessage}
+                  isDisabled={field.isDisabled}
+                  validation={field.validation}
                 />
               )}
               {field.type === FormFieldType.DateRange && (
@@ -170,6 +176,7 @@ const Form: React.FC<IFormRendererProps> = ({
                   type={field.type}
                   isEditing={editMode ?? true}
                   srMode={srMode ?? false}
+                  validation={field.validation}
                 />
               )}
               {field.type === FormFieldType.Date && (
@@ -189,6 +196,7 @@ const Form: React.FC<IFormRendererProps> = ({
                   isEditing={editMode ?? true}
                   srMode={srMode ?? false}
                   isDisabled={field.isDisabled ?? false}
+                  validation={field.validation}
                 />
               )}
               {field.type === FormFieldType.Group && (
@@ -202,6 +210,7 @@ const Form: React.FC<IFormRendererProps> = ({
                     placeholder: child.placeholder,
                     value: formData[child.graphQLPropertyName ?? ''] || '',
                     suffix: child.suffix,
+                    isDisabled: child.isDisabled,
                     onChange: (value: any) =>
                       handleInputChange(child.graphQLPropertyName, value),
                   }))}
@@ -219,6 +228,8 @@ const Form: React.FC<IFormRendererProps> = ({
                   customEditInputTextCss={field.customEditInputTextCss}
                   customPlaceholderCss={field.customPlaceholderCss}
                   customInfoMessage={field.customInfoMessage}
+                  validation={field.validation}
+                  isDisabled={field.isDisabled}
                 />
               )}
               {field.type === FormFieldType.Checkbox && (
@@ -236,6 +247,7 @@ const Form: React.FC<IFormRendererProps> = ({
                     handleInputChange(field.graphQLPropertyName, value)
                   }
                   srMode={srMode}
+                  validation={field.validation}
                 />
               )}
             </div>