merge: Merge branch 'THU/rename_dataset'

Author: esasova

cypress/commons/actions/generic/DatasetManager.js

@@ -112,7 +112,7 @@ export const renameDataset = (newDatasetName, options) => {
     validateRequest: options?.validateRequest,
   });
 
-  getRenameDatasetButton().click();
+  getDatasetNameInOverview().click();
   getDatasetNameEditableTextField().type('{selectAll}{backspace}' + newDatasetName + '{enter}');
 
   api.waitAlias(renameDatasetAlias);

cypress/e2e/brewery/DatasetManager_RenameDataset.cy.js

@@ -12,7 +12,6 @@ describe('rename datasets in Dataset Manager view', () => {
     stub.setOrganizations([ORGANIZATION_WITH_DEFAULT_ROLE_USER]);
     stub.setSolutions([SOLUTION]);
     stub.setWorkspaces([linkedWorkspace]);
-    console.log(EDITABLE_DATASET, NON_EDITABLE_DATASET);
     stub.setDatasets([EDITABLE_DATASET, NON_EDITABLE_DATASET]);
   });
 
@@ -23,8 +22,8 @@ describe('rename datasets in Dataset Manager view', () => {
     DatasetManager.switchToDatasetManagerView();
     DatasetManager.selectDatasetById(NON_EDITABLE_DATASET.id);
     DatasetManager.getDatasetNameInOverview().should('have.text', NON_EDITABLE_DATASET.name);
+    DatasetManager.getDatasetNameInOverview().click();
     DatasetManager.getDatasetNameEditableTextField().should('not.exist');
-    DatasetManager.getRenameDatasetButton().should('not.exist');
   });
 
   it('can rename datasets if role is editor', () => {
@@ -35,10 +34,9 @@ describe('rename datasets in Dataset Manager view', () => {
     DatasetManager.selectDatasetById(EDITABLE_DATASET.id);
     DatasetManager.getDatasetNameInOverview().should('have.text', datasetName);
     DatasetManager.getDatasetNameEditableTextField().should('not.exist');
-    DatasetManager.getRenameDatasetButton().should('exist').should('be.visible');
 
     // Edit & cancel without confirming the changes
-    DatasetManager.getRenameDatasetButton().click();
+    DatasetManager.getDatasetNameInOverview().click();
     DatasetManager.getDatasetNameInOverview().should('not.exist');
     DatasetManager.getDatasetNameEditableTextField().should('exist').should('be.visible');
     DatasetManager.getDatasetNameEditableTextField().type('{selectAll}{backspace}' + newName + '{esc}');

src/views/DatasetManager/components/DatasetOverview/components/EditableDatasetName/EditableDatasetName.js

@@ -2,9 +2,8 @@
 // Licensed under the MIT license.
 import React, { useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Edit as EditIcon } from '@mui/icons-material';
-import { FormControl, FormHelperText, IconButton, OutlinedInput, Stack, Typography } from '@mui/material';
-import { FadingTooltip, PermissionsGate } from '@cosmotech/ui';
+import { FormControl, FormHelperText, OutlinedInput, Typography } from '@mui/material';
+import { PermissionsGate } from '@cosmotech/ui';
 import { ACL_PERMISSIONS } from '../../../../../../services/config/accessControl';
 import { useEditableDatasetName } from './EditableDatasetNameHook';
 
@@ -86,37 +85,21 @@ export const EditableDatasetName = () => {
 
   const datasetNameElement = useMemo(
     () => (
-      <Typography data-cy="dataset-name" variant="h6">
+      <Typography data-cy="dataset-name" variant="h6" onClick={startEdition}>
         {datasetName}
       </Typography>
     ),
     [datasetName]
   );
 
-  const datasetNameWithEditButton = useMemo(() => {
-    return (
-      <Stack direction="row" spacing={1} alignItems="stretch" justifyContent="flex-start">
-        {datasetNameElement}
-        <FadingTooltip
-          title={t('commoncomponents.datasetmanager.overview.actions.renameButtonTooltip', 'Rename')}
-          disableInteractive={true}
-        >
-          <IconButton onClick={startEdition} data-cy="rename-dataset-button">
-            <EditIcon color="primary" />
-          </IconButton>
-        </FadingTooltip>
-      </Stack>
-    );
-  }, [datasetNameElement, t]);
-
   const userPermissions = dataset?.security?.currentUserPermissions ?? [];
   return (
     <PermissionsGate
       userPermissions={userPermissions}
       necessaryPermissions={[ACL_PERMISSIONS.DATASET.WRITE]}
       RenderNoPermissionComponent={() => datasetNameElement}
     >
-      {isEditing ? editableTextField : datasetNameWithEditButton}
+      {isEditing ? editableTextField : datasetNameElement}
     </PermissionsGate>
   );
 };