Page Generator

.gitignore

@@ -1,3 +1,4 @@
 dist
 node_modules
+src/**/*.html
 *lock*

package.json

@@ -19,7 +19,7 @@
     "adm-zip": "^0.5.18",
     "datatables.net": "^3.0.0",
     "datatables.net-bs5": "^3.0.0",
-    "dattatable": "^2.11.76",
+    "dattatable": "^2.11.81",
     "exceljs": "^4.4.0",
     "fast-xml-parser": "^5.9.3",
     "gd-sprest-bs": "^10.15.91",

spfx/src/webparts/siteAdmin/SiteAdminWebPart.ts

@@ -8,28 +8,62 @@ import { BaseClientSideWebPart, WebPartContext } from '@microsoft/sp-webpart-bas
 import type { IReadonlyTheme } from '@microsoft/sp-component-base';
 import * as strings from 'SiteAdminWebPartStrings';
 
-// Include the asset files for the page generator
+// Images to include in the SPFx package
 const imageReferences = [
-  require("./assets/956444907.png"),
+  require("./assets/4222049231.png"),
+  require("./assets/34722779.png"),
+  require("./assets/82759635.png"),
+  require("./assets/178240801.png"),
+  require("./assets/394511437.png"),
+  require("./assets/459558559.png"),
   require("./assets/704156399.png"),
+  require("./assets/734992370.png"),
+  require("./assets/782453716.png"),
+  require("./assets/860781773.png"),
+  require("./assets/878621426.png"),
+  require("./assets/926485291.png"),
+  require("./assets/956444907.png"),
+  require("./assets/1004145298.png"),
+  require("./assets/1034045247.png"),
+  require("./assets/1036008522.png"),
+  require("./assets/1051374010.png"),
+  require("./assets/1366143702.png"),
+  require("./assets/1392219256.png"),
   require("./assets/1439995666.png"),
-  require("./assets/2403381788.png"),
+  require("./assets/1539840079.png"),
+  require("./assets/1753774094.png"),
+  require("./assets/1920538907.png"),
+  require("./assets/1937731342.png"),
+  require("./assets/1952315463.png"),
   require("./assets/2009954068.png"),
-  require("./assets/394511437.png"),
-  require("./assets/178240801.png"),
+  require("./assets/2243122120.png"),
+  require("./assets/2299432232.png"),
+  require("./assets/2403381788.png"),
   require("./assets/2492974796.png"),
-  require("./assets/878621426.png"),
-  require("./assets/3639654909.png"),
+  require("./assets/2498076700.png"),
+  require("./assets/2892564598.png"),
+  require("./assets/2897641524.png"),
+  require("./assets/2928770881.png"),
+  require("./assets/2930042662.png"),
+  require("./assets/2978296301.png"),
+  require("./assets/3004706479.png"),
+  require("./assets/3007540558.png"),
+  require("./assets/3039756776.png"),
+  require("./assets/3194998129.png"),
+  require("./assets/3249223301.png"),
   require("./assets/3423846637.png"),
-  require("./assets/734992370.png"),
+  require("./assets/3510901274.png"),
+  require("./assets/3517625209.png"),
+  require("./assets/3539902807.png"),
+  require("./assets/3602715702.png"),
+  require("./assets/3608935117.png"),
   require("./assets/3614134656.png"),
-  require("./assets/1004145298.png"),
+  require("./assets/3639654909.png"),
+  require("./assets/3672734863.png"),
   require("./assets/3707825808.png"),
-  require("./assets/3194998129.png"),
-  require("./assets/782453716.png"),
-  require("./assets/926485291.png"),
-  require("./assets/2498076700.png"),
-  require("./assets/3608935117.png"),
+  require("./assets/3772245627.png"),
+  require("./assets/3795830073.png"),
+  require("./assets/4007861782.png"),
   require("./assets/4193189816.png")
 ]
 

src/m365Groups.ts

@@ -84,53 +84,62 @@ export class M365Groups {
 
     // Loads the m365 group
     private static loadGroupById(groupId: string): PromiseLike<Types.SP.Directory.GroupOData> {
+        let group: Types.SP.Directory.GroupOData = { id: groupId } as Types.SP.Directory.GroupOData;
+
         // Return a promise
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve) => {
             // Get the group information
-            let ds = DirectorySession().group(groupId);
-            ds.query({
-                Select: ["calendarUrl", "displayName", "id", "isPublic", "mail"]
-            }).execute(group => {
-                // Save the group information
-                this._groups[group.id] = group;
-            }, () => {
-                // Error loading this group
-                this._errorGroupIds[groupId] = true;
+            let getGroupInfo = (): PromiseLike<void> => {
+                return new Promise(resolve => {
+                    DirectorySession().group(groupId).query({
+                        Select: ["calendarUrl", "displayName", "id", "isPublic", "mail"]
+                    }).execute(group => {
+                        // Update the group information
+                        group.calendarUrl = group.calendarUrl;
+                        group.displayName = group.displayName;
+                        group.id = group.id;
+                        group.isPublic = group.isPublic;
+                        group.mail = group.mail;
+
+                        // Resolve the group information
+                        resolve();
+                    }, () => {
+                        // Error loading this group
+                        this._errorGroupIds[groupId] = true;
 
-                // Reject the request
-                reject();
-            });
+                        // Resolve the group information
+                        resolve();
+                    });
+                });
+            }
+
+            // Get the group members/owner information
+            let getGroupUsers = (member: boolean): PromiseLike<void> => {
+                return new Promise(resolve => {
+                    DirectorySession().group(groupId)[member ? "members" : "owners"]().query({
+                        GetAllItems: true,
+                        Top: 5000,
+                        Select: ["principalName", "id", "displayName", "mail"]
+                    }).execute(users => {
+                        // Set the users
+                        group[member ? "members" : "owners"] = users as any;
+
+                        // Resolve the users
+                        resolve();
+                    }, () => {
+                        // Resolve the request
+                        resolve();
+                    }, true);
+                });
+            }
+
+            // Get the group information, members and users
+            Promise.all([getGroupInfo(), getGroupUsers(true), getGroupUsers(false)]).then(() => {
+                // Set the group
+                this._groups[group.id] = group;
 
-            // Get the group members
-            ds.members().query({
-                GetAllItems: true,
-                Top: 5000,
-                Select: ["principalName", "id", "displayName", "mail"]
-            }).execute(members => {
-                // Add the group information to the mapper
-                this._groups[groupId].members = members as any;
-            }, () => {
-                // Try the next group
-                resolve(null);
-            }, true);
-
-            // Get the group owners
-            ds.owners().query({
-                GetAllItems: true,
-                Top: 5000,
-                Select: ["principalName", "id", "displayName", "mail"]
-            }).execute(owners => {
-                // Add the group information to the mapper
-                this._groups[groupId].owners = owners as any;
-            }, () => {
-                // Try the next group
-                resolve(null);
-            }, true);
-
-            // Wait for the requests to complete
-            ds.done(() => {
-                // Try the next group
-                resolve(this._groups[groupId]);
+                // Resolve the request
+                resolve(this._groups[group.id]);
             });
         });
     }