Merge branch 'dev' of https://github.com/Varuuna/sp-dev-fx-controls-react into Varuuna-dev

Author: estruyf

src/controls/securityTrimmedControl/ISecurityTrimmedControlProps.ts

@@ -25,4 +25,12 @@ export interface ISecurityTrimmedControlProps {
    * The relative URL of the list or library. Required when you want to check permissions on remote list.
    */
   relativeLibOrListUrl?: string;
+  /**
+   * Optional. Specify the name of a folder to check the user permissions against. Will be overridden if itemId is present.
+   */
+  folderPath?: string;
+  /**
+   * Optional. Specify the ID of the item to check the user permissions against. Takes precedence over folder.
+   */
+  itemId?: number;
 }

src/controls/securityTrimmedControl/SecurityTrimmedControl.tsx

@@ -28,9 +28,11 @@ export class SecurityTrimmedControl extends React.Component<ISecurityTrimmedCont
   public componentDidUpdate(prevProps: ISecurityTrimmedControlProps, prevState: ISecurityTrimmedControlState): void {
     // Check permissions only if necessary
     if (prevProps.level !== this.props.level ||
-        prevProps.permissions !== this.props.permissions ||
-        prevProps.relativeLibOrListUrl !== this.props.relativeLibOrListUrl ||
-        prevProps.remoteSiteUrl !== this.props.remoteSiteUrl) {
+      prevProps.permissions !== this.props.permissions ||
+      prevProps.relativeLibOrListUrl !== this.props.relativeLibOrListUrl ||
+      prevProps.remoteSiteUrl !== this.props.remoteSiteUrl ||
+      prevProps.folderPath !== this.props.folderPath ||
+      prevProps.itemId !== this.props.itemId) {
       this.checkPermissions();
     }
   }
@@ -113,7 +115,7 @@ export class SecurityTrimmedControl extends React.Component<ISecurityTrimmedCont
     const { context, remoteSiteUrl, relativeLibOrListUrl, permissions } = this.props;
     // Check if all properties are provided
     if (remoteSiteUrl && relativeLibOrListUrl && permissions) {
-      const apiUrl = `${remoteSiteUrl}/_api/web/GetList(@listUrl)/EffectiveBasePermissions?@listUrl='${encodeURIComponent(relativeLibOrListUrl)}'`;
+      const apiUrl = this.getUrlByResource();
       const result = await context.spHttpClient.get(apiUrl, SPHttpClient.configurations.v1).then(data => data.json());
       // Check if a result was retrieved
       if (result) {
@@ -148,6 +150,28 @@ export class SecurityTrimmedControl extends React.Component<ISecurityTrimmedCont
     }
   }
 
+  private getUrlByResource() {
+    const { remoteSiteUrl, relativeLibOrListUrl, folderPath, itemId } = this.props;
+
+    // Check permission on a specific item.
+    if (itemId) {
+      const splitUrl = relativeLibOrListUrl.split('/');
+      var lastSegment = splitUrl.pop() || splitUrl.pop();  // Trims trailing slash if it exists.
+
+      return `${remoteSiteUrl}/_api/web/Lists/GetByTitle(@listTitle)/items(@itemId)/EffectiveBasePermissions?@listTitle='${encodeURIComponent(lastSegment)}'&@itemId='${itemId}'`;
+    }
+    // Check permission on a specific folder.
+    else if (folderPath) {
+      const folderByServerRelativeUrl: string = `${encodeURIComponent(relativeLibOrListUrl)}/${encodeURIComponent(folderPath)}`;
+
+      return `${remoteSiteUrl}/_api/web/GetFolderByServerRelativeUrl(@folderByServerRelativeUrl)/ListItemAllFields/EffectiveBasePermissions?@folderByServerRelativeUrl='${folderByServerRelativeUrl}'`;
+    }
+    // Check permission on the list or library.
+    else {
+      return `${remoteSiteUrl}/_api/web/GetList(@listUrl)/EffectiveBasePermissions?@listUrl='${encodeURIComponent(relativeLibOrListUrl)}'`;
+    }
+  }
+
   /**
    * Default React render method
    */