Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion spfx/config/package-solution.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"solution": {
"name": "site-admin-tool",
"id": "9c7bcdac-024d-4ffe-b63a-cef526bc1930",
"version": "0.9.7.8",
"version": "0.9.7.9",
"includeClientSideAssets": true,
"skipFeatureDeployment": true,
"isDomainIsolated": false,
Expand Down
7 changes: 5 additions & 2 deletions src/reports/dlp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -383,11 +383,14 @@ export class DLP {
// Hide the loading dialog
LoadingDialog.hide();

// Determine the webs to target
let siteItems: Components.IDropdownItem[] = values["TargetWeb"] && values["TargetWeb"]["value"] ? [values["TargetWeb"]] as any : DataSource.SiteItems;

// Parse the webs
let counter = 0;
Helper.Executor(DataSource.SiteItems, siteItem => {
Helper.Executor(siteItems, siteItem => {
// Update the status
this._elSubNav.children[0].innerHTML = `Searching Site ${++counter} of ${DataSource.SiteItems.length}`;
this._elSubNav.children[0].innerHTML = `Searching Site ${++counter} of ${siteItems.length}`;

// Return a promise
return new Promise(resolve => {
Expand Down
4 changes: 2 additions & 2 deletions src/reports/externalUsers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,8 @@ export class ExternalUsers {

// Runs the report
static run(el: HTMLElement, auditOnly: boolean, values: { [key: string]: string }, onClose: () => void) {
let users: IUserInfo[] = [];

// Show a loading dialog
LoadingDialog.setHeader("Loading Security Groups");
LoadingDialog.setBody("Loading the permissions for this site...");
Expand All @@ -407,8 +409,6 @@ export class ExternalUsers {
// Clear the items
this._items = [];

let users: IUserInfo[] = [];

// Load the group information
Web(DataSource.SiteContext.SiteFullUrl, { requestDigest: DataSource.SiteContext.FormDigestValue }).query({
Expand: [
Expand Down
9 changes: 6 additions & 3 deletions src/reports/permissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -650,11 +650,14 @@ export class Permissions {
this._items = [];
this._roleMapper = {};

// Determine the webs to target
let siteItems: Components.IDropdownItem[] = values["TargetWeb"] && values["TargetWeb"]["value"] ? [values["TargetWeb"]] as any : DataSource.SiteItems;

// Parse all webs
let counter = 0;
Helper.Executor(DataSource.SiteItems, siteItem => {
Helper.Executor(siteItems, siteItem => {
// Update the loading dialog
LoadingDialog.setBody(`Getting the roles for web ${++counter} of ${DataSource.SiteItems.length}...`);
LoadingDialog.setBody(`Getting the roles for web ${++counter} of ${siteItems.length}...`);

// See if this is a sub-web and doesn't have unique role assignments
// The sub-webs have the data property set for them
Expand All @@ -669,7 +672,7 @@ export class Permissions {
]
}).execute(roles => {
// Update the loading dialog
LoadingDialog.setBody(`Analyzing the roles for web ${counter} of ${DataSource.SiteItems.length}...`);
LoadingDialog.setBody(`Analyzing the roles for web ${counter} of ${siteItems.length}...`);

// Analyze the roles
this.analyzeRoles(roles.results, siteItem.text, siteItem.data ? siteItem.data.Title : DataSource.Site.RootWeb.Title).then(resolve);
Expand Down
9 changes: 6 additions & 3 deletions src/reports/searchEEEU.ts
Original file line number Diff line number Diff line change
Expand Up @@ -634,11 +634,14 @@ export class SearchEEEU {
// See if we are showing hidden lists
let searchLists = values["SearchLists"];

// Determine the webs to target
let siteItems: Components.IDropdownItem[] = values["TargetWeb"] && values["TargetWeb"]["value"] ? [values["TargetWeb"]] as any : DataSource.SiteItems;

// Parse all webs
let counter = 0;
Helper.Executor(DataSource.SiteItems, siteItem => {
Helper.Executor(siteItems, siteItem => {
// Update the loading dialog
LoadingDialog.setBody(`Getting the info for web ${++counter} of ${DataSource.SiteItems.length}...`);
LoadingDialog.setBody(`Getting the info for web ${++counter} of ${siteItems.length}...`);

// Return a promise
return new Promise(resolve => {
Expand All @@ -650,7 +653,7 @@ export class SearchEEEU {
]
}).execute(web => {
// Update the loading dialog
LoadingDialog.setBody(`Analyzing web ${counter} of ${DataSource.SiteItems.length}...`);
LoadingDialog.setBody(`Analyzing web ${counter} of ${siteItems.length}...`);

// Analyze the site
this.analyzeSite(web, searchLists).then(resolve);
Expand Down
9 changes: 6 additions & 3 deletions src/reports/searchUsers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -618,11 +618,14 @@ export class SearchUsers {
let userName: string = values["UserName"].trim();
let user: Types.SP.User = values["PeoplePicker"][0];

// Determine the webs to target
let siteItems: Components.IDropdownItem[] = values["TargetWeb"] && values["TargetWeb"]["value"] ? [values["TargetWeb"]] as any : DataSource.SiteItems;

// Parse all webs
let counter = 0;
Helper.Executor(DataSource.SiteItems, siteItem => {
Helper.Executor(siteItems, siteItem => {
// Update the loading dialog
LoadingDialog.setBody(`Getting the info for web ${++counter} of ${DataSource.SiteItems.length}...`);
LoadingDialog.setBody(`Getting the info for web ${++counter} of ${siteItems.length}...`);

// Return a promise
return new Promise(resolve => {
Expand All @@ -634,7 +637,7 @@ export class SearchUsers {
]
}).execute(web => {
// Update the loading dialog
LoadingDialog.setBody(`Analyzing web ${counter} of ${DataSource.SiteItems.length}...`);
LoadingDialog.setBody(`Analyzing web ${counter} of ${siteItems.length}...`);

// Analyze the site
this.analyzeSite(web, userName || user).then(resolve);
Expand Down
7 changes: 5 additions & 2 deletions src/reports/sensitivityLabels.ts
Original file line number Diff line number Diff line change
Expand Up @@ -371,11 +371,14 @@ export class SensitivityLabels {
LoadingDialog.setBody("Loading the libraries...");
LoadingDialog.show();

// Determine the webs to target
let siteItems: Components.IDropdownItem[] = values["TargetWeb"] && values["TargetWeb"]["value"] ? [values["TargetWeb"]] as any : DataSource.SiteItems;

// Parse the webs
let counter = 0;
Helper.Executor(DataSource.SiteItems, siteItem => {
Helper.Executor(siteItems, siteItem => {
// Update the dialog
LoadingDialog.setHeader(`Searching Site ${++counter} of ${DataSource.SiteItems.length}`);
LoadingDialog.setHeader(`Searching Site ${++counter} of ${siteItems.length}`);

// Return a promise
return new Promise(resolve => {
Expand Down
7 changes: 5 additions & 2 deletions src/reports/uniquePermissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,14 @@ export class UniquePermissions {
// Clear the items
this._items = [];

// Determine the webs to target
let siteItems: Components.IDropdownItem[] = values["TargetWeb"] && values["TargetWeb"]["value"] ? [values["TargetWeb"]] as any : DataSource.SiteItems;

// Parse all the webs
let counter = 0;
Helper.Executor(DataSource.SiteItems, siteItem => {
Helper.Executor(siteItems, siteItem => {
// Update the loading dialog
LoadingDialog.setHeader(`Site ${++counter} of ${DataSource.SiteItems.length}`);
LoadingDialog.setHeader(`Site ${++counter} of ${siteItems.length}`);

// Return a promise
return new Promise(resolve => {
Expand Down
3 changes: 2 additions & 1 deletion src/tabs/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ export class Tabs {

// Event when the webs are loaded
onWebsLoaded(webs: Components.IDropdownItem[]) {
// Update the list tab
// Update the tabs
this._tabLists.setWebs(webs);
this._tabReports.setWebs(webs);
}

// Renders the tabs
Expand Down
Loading