Fix for #1332

Puzzlepart · Dec 19, 2023 · 3c169f3 · 3c169f3
1 parent 5202093
commit 3c169f3
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 43 deletions.
diff --git a/...k/PortfolioWebParts/src/components/PortfolioAggregation/ViewFormPanel/useViewFormPanel.ts b/...k/PortfolioWebParts/src/components/PortfolioAggregation/ViewFormPanel/useViewFormPanel.ts
@@ -30,43 +30,50 @@ export function useViewFormPanel() {
       GtSearchQuery: view.get('searchQuery'),
       GtIconName: view.get('iconName')
     }
-    if (isEditing) {
-      await context.props.dataAdapter.portalDataService.updateItemInList(
-        'DATA_SOURCES',
-        currentView.id as number,
-        properties
-      )
-      context.dispatch(
-        SET_VIEW_FORM_PANEL({
-          isOpen: false,
-          submitAction: 'edit',
-          view: currentView.update(properties)
-        })
-      )
-    } else {
-      properties = {
-        ...properties,
-        GtProjectContentColumnsId: {
-          results: currentView.columnIds
-        },
-        GtProjectContentRefinersId: {
-          results: currentView.refinerIds
-        },
-        GtProjectContentGroupById: currentView.groupById,
-        GtDataSourceCategory: context.props.dataSourceCategory,
-        GtDataSourceLevel: {
-          results: [context.props.configuration?.level].filter(Boolean)
+    try {
+      if (isEditing) {
+        await context.props.dataAdapter.portalDataService.updateItemInList(
+          'DATA_SOURCES',
+          currentView.id as number,
+          properties
+        )
+        context.dispatch(
+          SET_VIEW_FORM_PANEL({
+            isOpen: false,
+            submitAction: 'edit',
+            view: currentView.update(properties)
+          })
+        )
+      } else {
+        properties = {
+          ...properties,
+          GtProjectContentColumnsId: currentView.columnIds,
+          GtProjectContentRefinersId: currentView.refinerIds,
+          GtProjectContentGroupById: currentView.groupById,
+          GtDataSourceCategory: context.props.dataSourceCategory,
+          GtDataSourceLevel: [context.props.configuration?.level]
         }
+        const newView = await context.props.dataAdapter.portalDataService.addItemToList(
+          'DATA_SOURCES',
+          properties
+        )
+
+        context.dispatch(
+          SET_VIEW_FORM_PANEL({
+            isOpen: false,
+            submitAction: 'add',
+            view: new DataSource(
+              {
+                ...properties,
+                Id: newView.Id
+              },
+              currentView.columns
+            )
+          })
+        )
       }
-      await context.props.dataAdapter.portalDataService.addItemToList('DATA_SOURCES', properties)
-      const newView = new DataSource(properties, currentView.columns)
-      context.dispatch(
-        SET_VIEW_FORM_PANEL({
-          isOpen: false,
-          submitAction: 'add',
-          view: newView
-        })
-      )
+    } catch (error) {
+      throw new Error(error)
     }
   }
 

diff --git a/...work/PortfolioWebParts/src/components/PortfolioOverview/ViewFormPanel/useViewFormPanel.ts b/...work/PortfolioWebParts/src/components/PortfolioOverview/ViewFormPanel/useViewFormPanel.ts
@@ -40,20 +40,16 @@ export function useViewFormPanel() {
       GtPortfolioFabricIcon: view.get('iconName')
     }
     if (isEditing) {
-      context.props.dataAdapter.portalDataService.updateItemInList(
+      await context.props.dataAdapter.portalDataService.updateItemInList(
         'PORTFOLIO_VIEWS',
         currentView.id as number,
         properties
       )
     } else {
       properties = {
         ...properties,
-        GtPortfolioColumnsId: {
-          results: currentView.columnIds
-        },
-        GtPortfolioRefinersId: {
-          results: currentView.refinerIds
-        },
+        GtPortfolioColumnsId: currentView.columnIds,
+        GtPortfolioRefinersId: currentView.refinerIds,
         GtPortfolioGroupById: currentView.groupById,
         GtPortfolioColumnOrder: JSON.stringify(currentView.columnOrder)
       }

diff --git a/SharePointFramework/shared-library/src/models/PortfolioOverviewView.ts b/SharePointFramework/shared-library/src/models/PortfolioOverviewView.ts
@@ -221,7 +221,7 @@ export class PortfolioOverviewView {
    * Configure the view from another view (copies the columns, refiners,
    * groupBy, scope and searchQuery properties).
    *
-   * @param view View to configure from≤
+   * @param view View to configure from
    */
   public configureFrom(view: PortfolioOverviewView): PortfolioOverviewView {
     this.columns = view.columns