hasCreateFileRole

espresso-org · Mar 8, 2019 · f629497 · f629497
1 parent f23969d
commit f629497
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/app/frontend/src/components/app.js b/app/frontend/src/components/app.js
@@ -41,7 +41,7 @@ inject("mainStore", "configStore")(
                 <span style={{ cursor: 'pointer' }} onClick={() => mainStore.isGroupsSectionOpen = true}><GroupsSectionBtn /></span>
                 <span style={{ cursor: 'pointer' }} onClick={() => mainStore.isDeletedFilesScreenOpen = true}><TrashSectionBtn /> </span>
                 <span style={{ cursor: 'pointer' }} onClick={() => configStore.isConfigSectionOpen = true}><ConfigurationSectionBtn /></span>
-                { mainStore.selectedFolder && mainStore.selectedFolder.permissions && mainStore.selectedFolder.permissions.write && <MainDropDown mainStore={mainStore} />}
+                { mainStore.isNewButtonVisible && <MainDropDown mainStore={mainStore} />}
               </div>
             }
           />

diff --git a/app/frontend/src/stores/main-store.js b/app/frontend/src/stores/main-store.js
@@ -37,6 +37,8 @@ export class MainStore {
 
   @observable hasDeleteRole = false
 
+  @observable hasCreateFileRole = false
+
   @observable isLabelScreenOpen = false
 
   @observable isDeletedFilesScreenOpen = false
@@ -79,6 +81,11 @@ export class MainStore {
       return this.files.toJS().filter(file => file && !file.isDeleted)
   }
 
+  @computed get isNewButtonVisible() {
+    return this.hasCreateFileRole ||
+      (this.selectedFolder && this.selectedFolder.permissions && this.selectedFolder.permissions.write)
+  }
+
   selectedFilePermissions = asyncComputed([], 100, async () =>
     this.selectedFile ?
       this._datastore.getFilePermissions(this.selectedFile.id)
@@ -289,6 +296,7 @@ export class MainStore {
       this._refreshFiles()
       this._refreshAvailableGroups()
       this.hasDeleteRole = await this._datastore.hasDeleteRole()
+      this.hasCreateFileRole = await this._datastore.hasCreateFileRole()
       res()
     })
   }
@@ -304,6 +312,7 @@ export class MainStore {
     this.filesLoading = true
 
     this.selectedFolder = await this._datastore.getFolder(this.selectedFolderId)
+
     this.files = await Promise.all(
       this.selectedFolder.files
         .sort(folderFirst)

diff --git a/contracts/DriveApp.sol b/contracts/DriveApp.sol
@@ -334,8 +334,16 @@ contract Datastore is AragonApp {
     }
 
     /**
-     * @notice Returns whether an entity has the DELETE_FILE_ROLE
-     * @param _entity File id
+     * @dev Returns whether an entity has the CREATE_FILE_ROLE 
+     * @param _entity Entity address
+     */
+    function hasCreateFileRole(address _entity) external view returns (bool) {
+        return acl.hasPermission(_entity, this, CREATE_FILE_ROLE);
+    }    
+
+    /**
+     * @dev Returns whether an entity has the DELETE_FILE_ROLE
+     * @param _entity Entity address
      */
     function hasDeleteRole(address _entity) 
         external
@@ -497,7 +505,6 @@ contract Datastore is AragonApp {
     }
 }
 
-
 contract DriveApp is HasComments, Datastore {
 
     function initialize(ObjectACL _objectACL, AragonComments _comments) external {