Merge pull request #91 from containerum/develop

Develop
containerum · Sep 4, 2018 · 30fee86 · 30fee86
2 parents 8a0493b + b0f857d
commit 30fee86
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 47 deletions.
diff --git a/src/components/VolumesList/index.js b/src/components/VolumesList/index.js
@@ -85,52 +85,52 @@ const VolumesList = ({
                     onKeyPress={e => handleClose(e)}
                     role="presentation"
                   >
-                    {handleClickDeleteVolume &&
-                      accessToNamespace !== 'read' && (
-                        <i
-                          className={`${globalStyles.contentBlockTableMore} ${
-                            globalStyles.dropdownToggle
-                          }
+                    {((handleClickDeleteVolume && role === 'admin') ||
+                      accessToNamespace === 'owner') && (
+                      <i
+                        className={`${globalStyles.contentBlockTableMore} ${
+                          globalStyles.dropdownToggle
+                        }
                              ${globalStyles.ellipsisRoleMore} ion-more `}
-                          data-toggle="dropdown"
-                          aria-haspopup="true"
-                          aria-expanded="false"
-                        />
-                      )}
-                    {handleClickDeleteVolume &&
-                      accessToNamespace !== 'read' && (
-                        <ul
-                          className={` dropdown-menu dropdown-menu-right ${
-                            globalStyles.dropdownMenu
-                          }`}
-                          role="menu"
-                        >
-                          {role === 'admin' && (
-                            <NavLink
-                              activeClassName="active"
-                              className={`dropdown-item  ${
-                                globalStyles.dropdownItem
-                              }`}
-                              to={routerLinks.updateCustomVolumeLink(
-                                idName,
-                                name
-                              )}
-                            >
-                              Resize
-                            </NavLink>
-                          )}
-                          {role === 'admin' && (
-                            <button
-                              className={`dropdown-item text-danger ${
-                                globalStyles.dropdownItem
-                              }`}
-                              onClick={() => handleClickDeleteVolume(name)}
-                            >
-                              Delete
-                            </button>
-                          )}
-                        </ul>
-                      )}
+                        data-toggle="dropdown"
+                        aria-haspopup="true"
+                        aria-expanded="false"
+                      />
+                    )}
+                    {((handleClickDeleteVolume && role === 'admin') ||
+                      accessToNamespace === 'owner') && (
+                      <ul
+                        className={` dropdown-menu dropdown-menu-right ${
+                          globalStyles.dropdownMenu
+                        }`}
+                        role="menu"
+                      >
+                        {role === 'admin' && (
+                          <NavLink
+                            activeClassName="active"
+                            className={`dropdown-item  ${
+                              globalStyles.dropdownItem
+                            }`}
+                            to={routerLinks.updateCustomVolumeLink(
+                              idName,
+                              name
+                            )}
+                          >
+                            Resize
+                          </NavLink>
+                        )}
+                        {role === 'admin' && (
+                          <button
+                            className={`dropdown-item text-danger ${
+                              globalStyles.dropdownItem
+                            }`}
+                            onClick={() => handleClickDeleteVolume(name)}
+                          >
+                            Delete
+                          </button>
+                        )}
+                      </ul>
+                    )}
                   </td>
                 </tr>
               );

diff --git a/src/containers/CheckEmail/index.js b/src/containers/CheckEmail/index.js
@@ -46,8 +46,8 @@ class CheckEmail extends PureComponent<Props> {
                   textTransform: 'initial'
                 }}
               >
-                Check your inbox {''}
-                <strong>{email}</strong> and follow the password reset link.
+                Check your inbox <strong>{email}</strong> and follow the
+                password reset link.
               </div>
               <div
                 style={{