Merge branch 'dev' into master

Crimson1st · Feb 3, 2022 · 18fa12e · 18fa12e
2 parents 6ee7fce + a206ba9
commit 18fa12e
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 23 deletions.
diff --git a/provisioning/starterkit-spfx-only.pnp b/provisioning/starterkit-spfx-only.pnp
diff --git a/provisioning/starterkit.pnp b/provisioning/starterkit.pnp
diff --git a/source/react-application-alerts/sharepoint/solution/react-application-alerts.sppkg b/source/react-application-alerts/sharepoint/solution/react-application-alerts.sppkg
diff --git a/...application-alerts/src/extensions/hubOrSiteAlerts/HubOrSiteAlertsApplicationCustomizer.ts b/...application-alerts/src/extensions/hubOrSiteAlerts/HubOrSiteAlertsApplicationCustomizer.ts
@@ -101,7 +101,7 @@ export default class HubOrSiteAlertsApplicationCustomizer
         // from the Alerts list in the hub site, load the list of upcoming alerts sorted
         // ascending by their end time so that alerts that expire first, are shown on top
         this.context.spHttpClient
-          .get(hubSiteUrl + '/_api/web/lists/getByTitle(\'Alerts\')/items?' +
+          .get(hubSiteUrl + `/_api/web/GetList('${hubSiteUrl.replace(window.location.origin,"")}/Lists/Alerts')/items?` +
             '$filter=PnPAlertStartDateTime le datetime\'' + nowString + '\' ' +
             'and PnPAlertEndDateTime ge datetime\'' + nowString + '\' ' +
             '&$select=PnPAlertType,PnPAlertMessage,PnPAlertMoreInformation&$orderby=PnPAlertEndDateTime',

diff --git a/...react-application-portal-footer/sharepoint/solution/react-application-portal-footer.sppkg b/...react-application-portal-footer/sharepoint/solution/react-application-portal-footer.sppkg
diff --git a/...pplication-portal-footer/src/extensions/portalFooter/PortalFooterApplicationCustomizer.ts b/...pplication-portal-footer/src/extensions/portalFooter/PortalFooterApplicationCustomizer.ts
@@ -202,6 +202,10 @@ export default class PortalFooterApplicationCustomizer
           });
         }
       }
+      else {
+        // if there are no personal items for my links, just provide an empty array that can be customized
+        this._myLinks = [];
+      }
     }
 
     return (result);

diff --git a/...pplication-portal-footer/src/extensions/portalFooter/components/myLinks/MyLinksDialog.tsx b/...pplication-portal-footer/src/extensions/portalFooter/components/myLinks/MyLinksDialog.tsx
@@ -97,7 +97,7 @@ class MyLinksDialogContent extends
     });
 
     this.state = {
-      links: this.props.links,
+      links: this.props.links && this.props.links.length > 0 ? this.props.links : [],
       showDetailPanel: false,
     };
   }

diff --git a/source/templates/starterkit-spfx-only.xml b/source/templates/starterkit-spfx-only.xml
@@ -28,46 +28,46 @@
 
 
     <pnp:AppCatalog>
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-banner\sharepoint\solution\react-banner.sppkg" SkipFeatureDeployment="true"/>
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-followed-sites\sharepoint\solution\react-followed-sites.sppkg" SkipFeatureDeployment="true"/>
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-links\sharepoint\solution\react-links.sppkg" SkipFeatureDeployment="true"/>
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-lob-integration\sharepoint\solution\react-lob-integration.sppkg" SkipFeatureDeployment="true"/>
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-people-directory\sharepoint\solution\react-people-directory.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-banner\sharepoint\solution\react-banner.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-followed-sites\sharepoint\solution\react-followed-sites.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-links\sharepoint\solution\react-links.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-lob-integration\sharepoint\solution\react-lob-integration.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-people-directory\sharepoint\solution\react-people-directory.sppkg" SkipFeatureDeployment="true"/>
 
       <!--MailboxSettings.Read, Calendars.Read-->
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-personal-calendar\sharepoint\solution\react-personal-calendar.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-personal-calendar\sharepoint\solution\react-personal-calendar.sppkg" SkipFeatureDeployment="true"/>
 
       <!--Contacts.Read-->
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-personal-contacts\sharepoint\solution\react-personal-contacts.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-personal-contacts\sharepoint\solution\react-personal-contacts.sppkg" SkipFeatureDeployment="true"/>
 
       <!--Mail.Read-->
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-personal-email\sharepoint\solution\react-personal-email.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-personal-email\sharepoint\solution\react-personal-email.sppkg" SkipFeatureDeployment="true"/>
 
       <!--Group.ReadWrite.All, Tasks.ReadWrite, People.Read-->
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-personal-tasks\sharepoint\solution\react-personal-tasks.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-personal-tasks\sharepoint\solution\react-personal-tasks.sppkg" SkipFeatureDeployment="true"/>
 
       <!--People.Read, User.Read-->
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-recent-contacts\sharepoint\solution\react-recent-contacts.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-recent-contacts\sharepoint\solution\react-recent-contacts.sppkg" SkipFeatureDeployment="true"/>
 
       <!--Sites.Read.All-->
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-recently-used-documents\sharepoint\solution\react-recently-used-documents.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-recently-used-documents\sharepoint\solution\react-recently-used-documents.sppkg" SkipFeatureDeployment="true"/>
 
       <!--Sites.Read.All-->
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-recently-visited-sites\sharepoint\solution\react-recently-visited-sites.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-recently-visited-sites\sharepoint\solution\react-recently-visited-sites.sppkg" SkipFeatureDeployment="true"/>
 
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-site-information\sharepoint\solution\react-site-information.sppkg" SkipFeatureDeployment="true"/>
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-tiles\sharepoint\solution\react-tiles.sppkg" SkipFeatureDeployment="true"/>
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-weather\sharepoint\solution\react-weather.sppkg" SkipFeatureDeployment="true"/>
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-world-clock\sharepoint\solution\react-world-clock.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-site-information\sharepoint\solution\react-site-information.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-tiles\sharepoint\solution\react-tiles.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-weather\sharepoint\solution\react-weather.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-world-clock\sharepoint\solution\react-world-clock.sppkg" SkipFeatureDeployment="true"/>
 
       <!--extensions-->
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-application-collab-footer\sharepoint\solution\react-application-collab-footer.sppkg" SkipFeatureDeployment="true"/>
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-application-portal-footer\sharepoint\solution\react-application-portal-footer.sppkg" SkipFeatureDeployment="true"/>
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\js-application-redirect\sharepoint\solution\js-application-redirect.sppkg" SkipFeatureDeployment="true"/>
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-application-alerts\sharepoint\solution\react-application-alerts.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-application-collab-footer\sharepoint\solution\react-application-collab-footer.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-application-portal-footer\sharepoint\solution\react-application-portal-footer.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\js-application-redirect\sharepoint\solution\js-application-redirect.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-application-alerts\sharepoint\solution\react-application-alerts.sppkg" SkipFeatureDeployment="true"/>
 
       <!--Group.ReadWrite.All-->
-      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\source\react-command-discuss-now\sharepoint\solution\react-command-discuss-now.sppkg" SkipFeatureDeployment="true"/>
+      <pnp:Package Action="UploadAndPublish" Overwrite="true" Src="..\react-command-discuss-now\sharepoint\solution\react-command-discuss-now.sppkg" SkipFeatureDeployment="true"/>
 
       <!--depricated-->
       <!--site information (classification banner header)-->
-Original file line number
+Diff line change
@@ Expand Up / @@ -202,6 +202,10 @@ export default class PortalFooterApplicationCustomizer @@
               });
             }
           }
+          else {
+            // if there are no personal items for my links, just provide an empty array that can be customized
+            this._myLinks = [];
+          }
         }
         return (result);
@@ Expand Down @@