Merge branch 'develop'

equinor · Sep 3, 2024 · ecb0175 · ecb0175
2 parents 5134c42 + 1683ff1
commit ecb0175
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/modules/InvitationForPunchOut/views/CreateAndEditIPO/CreateAndEditIPO.tsx b/src/modules/InvitationForPunchOut/views/CreateAndEditIPO/CreateAndEditIPO.tsx
@@ -38,7 +38,7 @@ const validateGeneralInfo = (
     // when function is called with 'confirmationChecked', additional validation is performed
     // that would produce errors on initial state, or interfere when entering info
     if (typeof confirmationChecked === 'boolean') {
-        !projectName &&
+        (!projectName || projectName === 'All projects') &&
             (errors = { ...errors, projectName: 'Required field.' });
         !poType && (errors = { ...errors, poType: 'Required field.' });
 

diff --git a/src/modules/InvitationForPunchOut/views/CreateAndEditIPO/GeneralInfo/GeneralInfo.tsx b/src/modules/InvitationForPunchOut/views/CreateAndEditIPO/GeneralInfo/GeneralInfo.tsx
@@ -164,12 +164,21 @@ const GeneralInfo = ({
                         label={'Project'}
                         maxHeight="300px"
                         variant="form"
-                        text={generalInfo.projectName || 'Select'}
+                        text={
+                            generalInfo.projectName === 'All projects' ||
+                            !generalInfo.projectName
+                                ? 'Select'
+                                : generalInfo.projectName
+                        }
                         onFilter={setFilterForProjects}
                         disabled={fromMain || isEditMode || isDisabled}
                     >
                         {filteredProjects &&
                             filteredProjects.map((projectItem, index) => {
+                                if (projectItem.id === -1) {
+                                    return null;
+                                }
+
                                 return (
                                     <DropdownItem
                                         key={index}