Fix for #1449

Puzzlepart · Jan 25, 2024 · f4dfa18 · f4dfa18
1 parent 190ae6d
commit f4dfa18
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 4 deletions.
diff --git a/...mework/ProjectWebParts/src/components/ProjectStatus/EditStatusPanel/useEditStatusPanel.ts b/...mework/ProjectWebParts/src/components/ProjectStatus/EditStatusPanel/useEditStatusPanel.ts
@@ -19,6 +19,7 @@ export function useEditStatusPanel() {
     field.setValue(fieldValues)
   )
   const submit = useEditStatusPanelSubmit()
+
   return {
     headerText: activePanel?.headerText ?? strings.EditStatusPanelText,
     isOpen,

diff --git a/...c/components/ProjectStatus/Sections/ProjectPropertiesSection/ProjectPropertiesSection.tsx b/...c/components/ProjectStatus/Sections/ProjectPropertiesSection/ProjectPropertiesSection.tsx
@@ -9,7 +9,7 @@ import { useProjectPropertiesSection } from './useProjectPropertiesSection'
 
 export const ProjectPropertiesSection: FC = () => {
   const { section } = useContext(SectionContext)
-  const { fieldValues, fields } = useProjectPropertiesSection()
+  const { fieldValues, fieldValuesAsText, fields } = useProjectPropertiesSection()
 
   /**
    * Render fields specified in model.viewFields
@@ -20,12 +20,23 @@ export const ProjectPropertiesSection: FC = () => {
         const [field] = fields.filter(
           ({ InternalName, Title }) => [InternalName, Title].indexOf(fieldName) !== -1
         )
-        if (field && !stringIsNullOrEmpty(fieldValues[fieldName])) {
+        if (field && !stringIsNullOrEmpty(fieldValuesAsText[fieldName])) {
+          if (field.TypeAsString === 'DateTime' || field.TypeAsString === 'Date') {
+            const date = new Date(fieldValues[fieldName])
+            return (
+              <StatusSectionField
+                key={fieldName}
+                label={field.Title}
+                value={date.toLocaleDateString()}
+              />
+            )
+          }
+
           return (
             <StatusSectionField
               key={fieldName}
               label={field.Title}
-              value={fieldValues[fieldName]}
+              value={fieldValuesAsText[fieldName]}
             />
           )
         }

diff --git a/...omponents/ProjectStatus/Sections/ProjectPropertiesSection/useProjectPropertiesSection.tsx b/...omponents/ProjectStatus/Sections/ProjectPropertiesSection/useProjectPropertiesSection.tsx
@@ -2,8 +2,13 @@ import { useProjectStatusContext } from '../../../ProjectStatus/context'
 
 export function useProjectPropertiesSection() {
   const context = useProjectStatusContext()
+
   return {
     fieldValues: {
+      ...context.state.data.properties.fieldValues['_fieldValues'],
+      ...context.state.selectedReport?.fieldValues['_fieldValues']
+    },
+    fieldValuesAsText: {
       ...context.state.data.properties.fieldValues['_fieldValuesAsText'],
       ...context.state.selectedReport?.fieldValues['_fieldValuesAsText']
     },

diff --git a/SharePointFramework/shared-library/src/data/SPDataAdapterBase/index.ts b/SharePointFramework/shared-library/src/data/SPDataAdapterBase/index.ts
@@ -439,6 +439,7 @@ export class SPDataAdapterBase<
                 : destinationUserIds
             }
             break
+          case 'Date':
           case 'DateTime':
             properties[field.InternalName] = fieldValues.get<Date>(field.InternalName, {
               format: 'date',

diff --git a/SharePointFramework/shared-library/src/services/PortalDataService/PortalDataService.ts b/SharePointFramework/shared-library/src/services/PortalDataService/PortalDataService.ts
@@ -658,7 +658,8 @@ export class PortalDataService extends DataService<IPortalDataServiceConfigurati
       )()
       const filteredColumnItems = columnItems.filter(
         (col) =>
-          col.GtDataSourceCategory === dataSourceCategory || col.GtDataSourceCategory === null ||
+          col.GtDataSourceCategory === dataSourceCategory ||
+          col.GtDataSourceCategory === null ||
           (!col.GtDataSourceCategory && !col.GtDataSourceLevel) ||
           (!col.GtDataSourceCategory && _.contains(col.GtDataSourceLevel, level))
       )

diff --git a/SharePointFramework/shared-library/src/util/createFieldValueMap.ts b/SharePointFramework/shared-library/src/util/createFieldValueMap.ts
@@ -25,6 +25,7 @@ export const createFieldValueMap = (): Map<string, (value: EditableSPFieldValue)
           name: term.Label
         }))
     ],
+    ['Date', ({ $ }) => new Date($)],
     ['DateTime', ({ $ }) => new Date($)],
     ['MultiChoice', ({ value }) => value.split(', ')],
     [