Fixed collection upload permissions and css styling (#3571)

* fixed collection upload permission and css styling

Issue: AAH-2276

* fix tests

Issue: AAH-2276

Author: jerabekjiri

CHANGES/2276.bug

@@ -0,0 +1 @@
+Fixed user permissions for uploading collections

src/components/cards/cards.scss

@@ -65,3 +65,7 @@
     overflow: hidden;
   }
 }
+
+.hidden-menu-space {
+  margin-right: 8px;
+}

src/containers/search/search.tsx

@@ -1,5 +1,6 @@
 import { t } from '@lingui/macro';
 import { Button, DataList, DropdownItem, Switch } from '@patternfly/react-core';
+import cx from 'classnames';
 import * as React from 'react';
 import { Navigate } from 'react-router-dom';
 import {
@@ -385,33 +386,33 @@ class Search extends React.Component<RouteProps, IState> {
           {collection.is_deprecated ? t`Undeprecate` : t`Deprecate`}
         </DropdownItem>
       ),
-    ];
-
-    if (!list) {
-      menuItems.push(
+      !list && hasPermission('galaxy.upload_to_namespace') && (
         <DropdownItem
           onClick={() => this.checkUploadPrivilleges(collection)}
           key='upload new version'
         >
           {t`Upload new version`}
-        </DropdownItem>,
-      );
-    }
+        </DropdownItem>
+      ),
+    ].filter(Boolean);
+
+    const displayMenu = menuItems.length > 0;
 
     return (
       <React.Fragment>
-        {list && (
+        {list && hasPermission('galaxy.upload_to_namespace') && (
           <Button
             onClick={() => this.checkUploadPrivilleges(collection)}
             variant='secondary'
           >
             {t`Upload new version`}
           </Button>
         )}
-        <StatefulDropdown
-          items={menuItems.filter(Boolean)}
-          ariaLabel='collection-kebab'
-        />
+        <span className={cx(!displayMenu && 'hidden-menu-space')}>
+          {displayMenu && (
+            <StatefulDropdown items={menuItems} ariaLabel='collection-kebab' />
+          )}
+        </span>
       </React.Fragment>
     );
   }

test/cypress/e2e/collections/collection_upload.js

@@ -25,8 +25,7 @@ describe('Collection Upload Tests', () => {
         `${uiPrefix}collections?page_size=10&view_type=list&keywords=testcollection`,
       );
       cy.contains('testcollection');
-      cy.contains('Upload new version').click();
-      cy.contains("You don't have rights to do this operation.");
+      cy.contains('Upload new version').should('not.exist');
     });
 
     it('should not upload new collection version in collection list/cards when user does not have permissions', () => {
@@ -35,9 +34,7 @@ describe('Collection Upload Tests', () => {
         `${uiPrefix}collections?page_size=10&view_type=card&keywords=testcollection`,
       );
       cy.contains('testcollection');
-      cy.get('[aria-label="Actions"]').click();
-      cy.contains('Upload new version').click();
-      cy.contains("You don't have rights to do this operation.");
+      cy.get('[aria-label="Actions"]').should('not.exist');
     });
 
     it('should not upload new collection version in collection detail when user does not have permissions', () => {