dattatable 2.9.37 → 2.9.39

package/build/common/installRequired.d.ts

@@ -19,13 +19,14 @@ export interface IShowDialogProps {
 export declare class InstallationRequired {
     private static _cfg;
     private static _report;
+    private static _webUrl;
     private static _customActionsExist;
     static get CustomActionsExist(): boolean;
     private static checkCustomActions;
-    private static isOwnerOrAdmin;
     private static _listsExist;
     static get ListsExist(): boolean;
     private static checkLists;
+    private static checkUserPermissions;
     static requiresInstall(props: IInstallProps): PromiseLike<boolean>;
     static showDialog(props?: IShowDialogProps): void;
     private static showErrorDialog;

package/build/common/installRequired.js

@@ -32,7 +32,7 @@ var InstallationRequired = /** @class */ (function () {
                     return;
                 }
                 // Load the web custom actions
-                var web = (0, gd_sprest_bs_1.Web)();
+                var web = (0, gd_sprest_bs_1.Web)(_this._webUrl);
                 web.UserCustomActions().execute(function (webCustomActions) {
                     // Parse the web custom actions
                     for (var i = 0; i < cfg._configuration.CustomActionCfg.Web.length; i++) {
@@ -69,7 +69,7 @@ var InstallationRequired = /** @class */ (function () {
                     return;
                 }
                 // Load the site custom actions
-                (0, gd_sprest_bs_1.Site)().UserCustomActions().execute(function (siteCustomActions) {
+                (0, gd_sprest_bs_1.Site)(_this._webUrl).UserCustomActions().execute(function (siteCustomActions) {
                     // Parse the site custom actions
                     for (var i = 0; i < cfg._configuration.CustomActionCfg.Site.length; i++) {
                         var customAction = cfg._configuration.CustomActionCfg.Site[i];
@@ -107,37 +107,6 @@ var InstallationRequired = /** @class */ (function () {
             });
         });
     };
-    // Determines if the user is an owner or admin
-    InstallationRequired.isOwnerOrAdmin = function () {
-        // Return a promise
-        return new Promise(function (resolve) {
-            // Get the current user
-            (0, gd_sprest_bs_1.Web)().CurrentUser().execute(function (user) {
-                // See if they are an admin
-                if (user.IsSiteAdmin) {
-                    // Resolve the request
-                    resolve(true);
-                }
-                else {
-                    // See if the user is part of the owner's group
-                    (0, gd_sprest_bs_1.Web)().AssociatedOwnerGroup().Users().getById(user.Id).execute(
-                    // Is an owner
-                    function () {
-                        // Resolve the request
-                        resolve(true);
-                    }, 
-                    // Not an owner
-                    function () {
-                        // Resolve the request
-                        resolve(false);
-                    });
-                }
-            }, function () {
-                // Resolve the request
-                resolve(false);
-            });
-        });
-    };
     Object.defineProperty(InstallationRequired, "ListsExist", {
         get: function () { return this._listsExist; },
         enumerable: false,
@@ -161,7 +130,7 @@ var InstallationRequired = /** @class */ (function () {
                 // Return a promise
                 return new Promise(function (resolve) {
                     // Get the list
-                    (0, gd_sprest_bs_1.Web)().Lists(listCfg.ListInformation.Title).query({
+                    (0, gd_sprest_bs_1.Web)(_this._webUrl).Lists(listCfg.ListInformation.Title).query({
                         Expand: ["Fields"]
                     }).execute(
                     // Success
@@ -204,6 +173,35 @@ var InstallationRequired = /** @class */ (function () {
             });
         });
     };
+    // Determines if the user is an owner or admin
+    InstallationRequired.checkUserPermissions = function () {
+        var _this = this;
+        // Return a promise
+        return new Promise(function (resolve) {
+            // Get the current user information
+            (0, gd_sprest_bs_1.Web)(_this._webUrl).CurrentUser().execute(
+            // Success
+            function (user) {
+                // Get the current user permissions
+                (0, gd_sprest_bs_1.Web)(_this._webUrl).getUserEffectivePermissions(user.LoginName).execute(
+                // Success
+                function (permissions) {
+                    // See if the user has manage web rights
+                    resolve(gd_sprest_bs_1.Helper.hasPermissions(permissions.GetUserEffectivePermissions, gd_sprest_bs_1.SPTypes.BasePermissionTypes.ManageLists));
+                }, 
+                // Error
+                function () {
+                    // Resolve the request
+                    resolve(false);
+                });
+            }, 
+            // Error
+            function () {
+                // Resolve the request
+                resolve(false);
+            });
+        });
+    };
     // Checks the configuration to see if an installation is required
     InstallationRequired.requiresInstall = function (props) {
         var _this = this;
@@ -213,8 +211,8 @@ var InstallationRequired = /** @class */ (function () {
         this._report = [];
         // Return a promise
         return new Promise(function (resolve, reject) {
-            // Ensure this is an admin or owner
-            _this.isOwnerOrAdmin().then(function (hasPermissions) {
+            // Check the user permissions
+            _this.checkUserPermissions().then(function (hasPermissions) {
                 // See if they are not an owner or admin
                 if (!hasPermissions) {
                     // Reject the request
@@ -320,6 +318,9 @@ var InstallationRequired = /** @class */ (function () {
                     gd_sprest_bs_1.Helper.Executor(cfgs, function (cfg) {
                         // Return a promise
                         return new Promise(function (resolve) {
+                            // Set the web url
+                            _this._webUrl = cfg.getWebUrl();
+                            // Add the components
                             cfg.install().then(function () {
                                 // Hide the button
                                 btnInstall.hide();
@@ -373,6 +374,7 @@ var InstallationRequired = /** @class */ (function () {
     };
     InstallationRequired._cfg = null;
     InstallationRequired._report = null;
+    InstallationRequired._webUrl = null;
     // Custom Actions exists
     InstallationRequired._customActionsExist = null;
     // Lists exists

package/build/common/listSecurity.d.ts

@@ -39,6 +39,7 @@ export declare class ListSecurity {
     private removeUser;
     constructor(props: IListSecurity);
     addToGroup(userId: number, groupName: string): PromiseLike<void>;
+    private checkUserPermissions;
     private configureList;
     private configureLists;
     private createGroups;
@@ -50,5 +51,5 @@ export declare class ListSecurity {
     removeFromGroup(userId: number, groupName: string): PromiseLike<void>;
     private renderModal;
     private resetPermissions;
-    show(createFl?: boolean, onComplete?: () => void): void;
+    show(createFl?: boolean, onComplete?: () => void, onError?: () => void): void;
 }

package/build/common/listSecurity.js

@@ -104,6 +104,25 @@ var ListSecurity = /** @class */ (function () {
             }, reject);
         });
     };
+    // Determines if the user is an owner or admin
+    ListSecurity.prototype.checkUserPermissions = function () {
+        var _this = this;
+        // Return a promise
+        return new Promise(function (resolve) {
+            // Get the current user permissions
+            (0, gd_sprest_bs_1.Web)().getUserEffectivePermissions(_this.CurrentUser.LoginName).execute(
+            // Success
+            function (permissions) {
+                // See if the user has manage web rights
+                resolve(gd_sprest_bs_1.Helper.hasPermissions(permissions.GetUserEffectivePermissions, gd_sprest_bs_1.SPTypes.BasePermissionTypes.ManageWeb));
+            }, 
+            // Error
+            function () {
+                // Resolve the request
+                resolve(false);
+            });
+        });
+    };
     // Configures a list
     ListSecurity.prototype.configureList = function (listInfo) {
         var _this = this;
@@ -560,41 +579,55 @@ var ListSecurity = /** @class */ (function () {
         });
     };
     // Shows the modal
-    ListSecurity.prototype.show = function (createFl, onComplete) {
+    ListSecurity.prototype.show = function (createFl, onComplete, onError) {
         var _this = this;
         if (createFl === void 0) { createFl = true; }
         // Show a loading dialog
-        loadingDialog_1.LoadingDialog.setHeader("Loading the Security Information");
-        loadingDialog_1.LoadingDialog.setBody("Loading the security group information...");
+        loadingDialog_1.LoadingDialog.setHeader("Loading the User Permissions");
+        loadingDialog_1.LoadingDialog.setBody("Checking to see if the user can manage this web...");
         loadingDialog_1.LoadingDialog.show();
-        // Create the groups
-        this.createGroups(createFl).then(function () {
+        // Check the user permissions
+        this.checkUserPermissions().then(function (hasPermissions) {
+            // Ensure they have permissions
+            if (!hasPermissions) {
+                // Close the dialog
+                loadingDialog_1.LoadingDialog.hide();
+                // Call the event and do nothing
+                onError ? onError() : null;
+                return;
+            }
             // Update the loading dialog
-            loadingDialog_1.LoadingDialog.setBody("Waiting for the permission types to be loaded...");
-            // Ensure the permissions are loaded
-            var loopId = setInterval(function () {
-                // See if the permissions exist
-                if (_this._ddlItems && _this._permissionTypes) {
-                    // Hide the loading dialog
-                    loadingDialog_1.LoadingDialog.hide();
-                    // Show the modal
-                    _this.renderModal(function () {
+            loadingDialog_1.LoadingDialog.setHeader("Loading the Security Information");
+            loadingDialog_1.LoadingDialog.setBody("Loading the security group information...");
+            // Create the groups
+            _this.createGroups(createFl).then(function () {
+                // Update the loading dialog
+                loadingDialog_1.LoadingDialog.setBody("Waiting for the permission types to be loaded...");
+                // Ensure the permissions are loaded
+                var loopId = setInterval(function () {
+                    // See if the permissions exist
+                    if (_this._ddlItems && _this._permissionTypes) {
                         // Hide the loading dialog
                         loadingDialog_1.LoadingDialog.hide();
-                        // Call the event
-                        onComplete ? onComplete() : null;
-                    });
-                    // Stop the loop
-                    clearInterval(loopId);
-                }
-            }, 10);
-        }, function () {
-            // Hide the loading dialog
-            loadingDialog_1.LoadingDialog.hide();
-            // Show an error
-            modal_1.Modal.setHeader("Security Groups");
-            modal_1.Modal.setBody("Error loading/creating the security groups. Please contact your admin.");
-            modal_1.Modal.show();
+                        // Show the modal
+                        _this.renderModal(function () {
+                            // Hide the loading dialog
+                            loadingDialog_1.LoadingDialog.hide();
+                            // Call the event
+                            onComplete ? onComplete() : null;
+                        });
+                        // Stop the loop
+                        clearInterval(loopId);
+                    }
+                }, 10);
+            }, function () {
+                // Hide the loading dialog
+                loadingDialog_1.LoadingDialog.hide();
+                // Show an error
+                modal_1.Modal.setHeader("Security Groups");
+                modal_1.Modal.setBody("Error loading/creating the security groups. Please contact your admin.");
+                modal_1.Modal.show();
+            });
         });
     };
     return ListSecurity;