Fiks for uthenting av prosjektinformasjon for brukere uten tilgang til hubområdet

CHANGELOG.md

@@ -15,6 +15,7 @@ Sjekk ut [release notes](./releasenotes/1.8.0.md) for høydepunkter og mer detal
 
 ### Feilrettinger
 
+- Fiks for uthenting av prosjektinformasjon for brukere uten tilgang til hubområdet [#1080](https://github.com/Puzzlepart/prosjektportalen365/issues/1080)
 - Håndterer deaktiverte/stengte kontoer i kopiering av tillatelseskonfigurasjon [#1085](https://github.com/Puzzlepart/prosjektportalen365/issues/1085)
 
 ## 1.8.1 - 31.03.2023

SharePointFramework/ProjectWebParts/src/components/ProjectInformation/types.ts

@@ -106,12 +106,12 @@ export interface IProjectInformationState
   properties?: ProjectPropertyModel[]
 
   /**
-   * All Properties
+   * All properties (used for the properties panel)
    */
   allProperties?: ProjectPropertyModel[]
 
   /**
-   * Progress
+   * Progress dialog props
    */
   progress?: IProgressDialogProps
 
@@ -151,7 +151,7 @@ export interface IProjectInformationState
   userHasEditPermission?: boolean
 
   /**
-   * Is Project data synced
+   * Is project data synced
    */
   isProjectDataSynced?: boolean
 }

SharePointFramework/ProjectWebParts/src/components/ProjectInformation/useProjectInformationDataFetch.ts

@@ -1,9 +1,10 @@
 import { MessageBarType } from '@fluentui/react'
 import { LogLevel } from '@pnp/logging'
+import strings from 'ProjectWebPartsStrings'
 import _ from 'lodash'
 import { ProjectAdminPermission } from 'pp365-shared/lib/data/SPDataAdapterBase/ProjectAdminPermission'
 import { ListLogger } from 'pp365-shared/lib/logging'
-import strings from 'ProjectWebPartsStrings'
+import { ProjectColumnConfig, SectionModel, StatusReport } from 'pp365-shared/lib/models'
 import { useEffect } from 'react'
 import { isEmpty } from 'underscore'
 import { ProjectInformation } from '.'
@@ -78,6 +79,35 @@ const checkProjectDataSynced: DataFetchFunction<IProjectInformationProps, boolea
   }
 }
 
+/**
+ * Fetch project status reports, sections and column config  if `props.hideStatusReport` is false.
+ * Catches errors and returns empty arrays to support e.g. the case where the user does not have
+ * access to the hub site.
+ *
+ * @param props Component properties for `ProjectInformation`
+ */
+const fetchProjectStatusReports: DataFetchFunction<
+  IProjectInformationProps,
+  [StatusReport[], SectionModel[], ProjectColumnConfig[]]
+> = async (props) => {
+  if (props.hideStatusReport) {
+    return [[], [], []]
+  }
+  try {
+    const [reports, sections, columnConfig] = await Promise.all([
+      SPDataAdapter.portal.getStatusReports({
+        filter: `(GtSiteId eq '${props.siteId}') and GtModerationStatus eq '${strings.GtModerationStatus_Choice_Published}'`,
+        publishedString: strings.GtModerationStatus_Choice_Published
+      }),
+      SPDataAdapter.portal.getProjectStatusSections(),
+      SPDataAdapter.portal.getProjectColumnConfig()
+    ])
+    return [reports, sections, columnConfig]
+  } catch (error) {
+    return [[], [], []]
+  }
+}
+
 /**
  * Fetch data for `ProjectInformation` component. This function is used in
  * `useProjectInformationDataFetch` hook.
@@ -103,9 +133,7 @@ const fetchData: DataFetchFunction<
       columns,
       propertiesData,
       parentProjects,
-      reports,
-      sections,
-      columnConfig
+      [reports, sections, columnConfig]
     ] = await Promise.all([
       SPDataAdapter.portal.getProjectColumns(),
       SPDataAdapter.project.getPropertiesData(),
@@ -115,16 +143,7 @@ const fetchData: DataFetchFunction<
             ProjectInformationParentProject
           )
         : Promise.resolve([]),
-      props.hideStatusReport
-        ? Promise.resolve([])
-        : SPDataAdapter.portal.getStatusReports({
-            filter: `(GtSiteId eq '${props.siteId}') and GtModerationStatus eq '${strings.GtModerationStatus_Choice_Published}'`,
-            publishedString: strings.GtModerationStatus_Choice_Published
-          }),
-      props.hideStatusReport
-        ? Promise.resolve([])
-        : SPDataAdapter.portal.getProjectStatusSections(),
-      props.hideStatusReport ? Promise.resolve([]) : SPDataAdapter.portal.getProjectColumnConfig()
+      fetchProjectStatusReports(props)
     ])
     const data: IProjectInformationData = {
       columns,