From 1ba3a13e7302ecf9ba45402f317446ab45681b73 Mon Sep 17 00:00:00 2001
From: Sofia Sazonova <sazonova@amazon.co.uk>
Date: Mon, 29 Apr 2024 12:49:21 +0100
Subject: [PATCH 1/6] Add text to the Lock Icon in Catalog View

---
 .../components/GlossarySearchResultItem.js    | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/frontend/src/modules/Catalog/components/GlossarySearchResultItem.js b/frontend/src/modules/Catalog/components/GlossarySearchResultItem.js
index 48d665bde..0ad8a281f 100644
--- a/frontend/src/modules/Catalog/components/GlossarySearchResultItem.js
+++ b/frontend/src/modules/Catalog/components/GlossarySearchResultItem.js
@@ -7,6 +7,7 @@ import {
   Divider,
   Grid,
   IconButton,
+  Button,
   Link,
   Tooltip,
   Typography
@@ -281,19 +282,24 @@ export const GlossarySearchResultItem = ({ hit }) => {
           {isOpeningModal || isOpeningDashboardModal ? (
             <CircularProgress size={20} />
           ) : (
-            <Tooltip title="Request Access">
-              <IconButton
-                color="primary"
-                edge="end"
-                onClick={() =>
-                  hit.resourceKind === 'dashboard'
-                    ? handleRequestDashboardAccessModalOpen()
-                    : handleRequestAccessModalOpen()
-                }
+            <Button
+              color="primary"
+              edge="end"
+              onClick={() =>
+                hit.resourceKind === 'dashboard'
+                  ? handleRequestDashboardAccessModalOpen()
+                  : handleRequestAccessModalOpen()
+              }
+            >
+              <LockOpen fontSize="small" />
+              <Typography
+                color="PrimaryContrastText"
+                variant="subtitle2"
+                sx={{ ml: 0.5 }}
               >
-                <LockOpen fontSize="small" />
-              </IconButton>
-            </Tooltip>
+                Request Access
+              </Typography>
+            </Button>
           )}
           <RequestAccessModal
             hit={hit}

From d54ac2e760a4405c8e92f87c4ed2efb38798e2cf Mon Sep 17 00:00:00 2001
From: Sofia Sazonova <sazonova@amazon.co.uk>
Date: Mon, 29 Apr 2024 13:15:35 +0100
Subject: [PATCH 2/6] "Request access" button instead 'Learn more' on DataSet
 list page

---
 .../Datasets/components/DatasetListItem.js    | 49 +++++++++++++++----
 1 file changed, 40 insertions(+), 9 deletions(-)

diff --git a/frontend/src/modules/Datasets/components/DatasetListItem.js b/frontend/src/modules/Datasets/components/DatasetListItem.js
index e3f72f822..ae7684b30 100644
--- a/frontend/src/modules/Datasets/components/DatasetListItem.js
+++ b/frontend/src/modules/Datasets/components/DatasetListItem.js
@@ -2,6 +2,7 @@ import {
   Box,
   Button,
   Card,
+  CircularProgress,
   Divider,
   Grid,
   Link,
@@ -9,13 +10,12 @@ import {
   Typography
 } from '@mui/material';
 import PropTypes from 'prop-types';
-import React from 'react';
+import React, { useState } from 'react';
 import * as BsIcons from 'react-icons/bs';
 import { BsTable } from 'react-icons/bs';
 import * as FaIcons from 'react-icons/fa';
 import * as FiIcons from 'react-icons/fi';
 import { useNavigate } from 'react-router';
-import { Link as RouterLink } from 'react-router-dom';
 import {
   IconAvatar,
   Label,
@@ -23,8 +23,21 @@ import {
   UpVotesReadOnly,
   useCardStyle
 } from 'design';
+import { LockOpen } from '@mui/icons-material';
+import { RequestAccessModal } from '../../Catalog/components';
 
 export const DatasetListItem = (props) => {
+  const [isRequestAccessOpen, setIsRequestAccessOpen] = useState(false);
+  const [isOpeningModal, setIsOpeningModal] = useState(false);
+  const handleRequestAccessModalOpen = () => {
+    setIsOpeningModal(true);
+    setIsRequestAccessOpen(true);
+  };
+
+  const handleRequestAccessModalClose = () => {
+    setIsRequestAccessOpen(false);
+  };
+
   const { dataset } = props;
   const classes = useCardStyle();
   const navigate = useNavigate();
@@ -246,13 +259,31 @@ export const DatasetListItem = (props) => {
               display: 'flex'
             }}
           >
-            <Button
-              color="primary"
-              component={RouterLink}
-              to={`/console/datasets/${dataset.datasetUri}`}
-            >
-              Learn More
-            </Button>
+            {isOpeningModal ? (
+              <CircularProgress size={20} />
+            ) : (
+              <Button
+                color="primary"
+                edge="end"
+                onClick={handleRequestAccessModalOpen}
+              >
+                <LockOpen fontSize="small" />
+                <Typography
+                  color="PrimaryContrastText"
+                  variant="subtitle2"
+                  sx={{ ml: 0.5 }}
+                >
+                  Request Access
+                </Typography>
+              </Button>
+            )}
+            <RequestAccessModal
+              onApply={handleRequestAccessModalClose}
+              onClose={handleRequestAccessModalClose}
+              open={isRequestAccessOpen}
+              stopLoader={() => setIsOpeningModal(false)}
+              hit={{ _id: dataset.datasetUri, resourceKind: 'dataset' }}
+            />
           </Box>
           <Box sx={{ flexGrow: 1 }} />
           <UpVotesReadOnly upvotes={dataset.statistics.upvotes} />

From 25bb8633ea08a218d193519f981d2be2c2842634 Mon Sep 17 00:00:00 2001
From: Sofia Sazonova <sazonova@amazon.co.uk>
Date: Mon, 29 Apr 2024 13:37:39 +0100
Subject: [PATCH 3/6] "Request access" button on DatasetView page, if user is
 not Admin

---
 .../components/GlossarySearchResultItem.js    | 12 ++---
 .../Datasets/components/DatasetListItem.js    | 12 ++---
 .../src/modules/Datasets/views/DatasetView.js | 45 +++++++++++++++++--
 3 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/frontend/src/modules/Catalog/components/GlossarySearchResultItem.js b/frontend/src/modules/Catalog/components/GlossarySearchResultItem.js
index 0ad8a281f..88f53efb6 100644
--- a/frontend/src/modules/Catalog/components/GlossarySearchResultItem.js
+++ b/frontend/src/modules/Catalog/components/GlossarySearchResultItem.js
@@ -284,21 +284,15 @@ export const GlossarySearchResultItem = ({ hit }) => {
           ) : (
             <Button
               color="primary"
-              edge="end"
+              startIcon={<LockOpen fontSize="small" />}
               onClick={() =>
                 hit.resourceKind === 'dashboard'
                   ? handleRequestDashboardAccessModalOpen()
                   : handleRequestAccessModalOpen()
               }
+              type="button"
             >
-              <LockOpen fontSize="small" />
-              <Typography
-                color="PrimaryContrastText"
-                variant="subtitle2"
-                sx={{ ml: 0.5 }}
-              >
-                Request Access
-              </Typography>
+              Request Access
             </Button>
           )}
           <RequestAccessModal
diff --git a/frontend/src/modules/Datasets/components/DatasetListItem.js b/frontend/src/modules/Datasets/components/DatasetListItem.js
index ae7684b30..a8480b389 100644
--- a/frontend/src/modules/Datasets/components/DatasetListItem.js
+++ b/frontend/src/modules/Datasets/components/DatasetListItem.js
@@ -264,17 +264,11 @@ export const DatasetListItem = (props) => {
             ) : (
               <Button
                 color="primary"
-                edge="end"
+                startIcon={<LockOpen fontSize="small" />}
                 onClick={handleRequestAccessModalOpen}
+                type="button"
               >
-                <LockOpen fontSize="small" />
-                <Typography
-                  color="PrimaryContrastText"
-                  variant="subtitle2"
-                  sx={{ ml: 0.5 }}
-                >
-                  Request Access
-                </Typography>
+                Request Access
               </Button>
             )}
             <RequestAccessModal
diff --git a/frontend/src/modules/Datasets/views/DatasetView.js b/frontend/src/modules/Datasets/views/DatasetView.js
index c6ef26f19..7bd2c7e49 100644
--- a/frontend/src/modules/Datasets/views/DatasetView.js
+++ b/frontend/src/modules/Datasets/views/DatasetView.js
@@ -2,6 +2,7 @@ import {
   ForumOutlined,
   Info,
   LocalOffer,
+  LockOpen,
   ShareOutlined,
   Upload,
   ViewArrayOutlined
@@ -49,6 +50,7 @@ import {
   DatasetUpload
 } from '../components';
 import { isFeatureEnabled } from 'utils';
+import { RequestAccessModal } from '../../Catalog/components';
 
 const DatasetView = () => {
   const dispatch = useDispatch();
@@ -122,6 +124,16 @@ const DatasetView = () => {
     [client]
   );
 
+  const [isRequestAccessOpen, setIsRequestAccessOpen] = useState(false);
+  const [isOpeningModal, setIsOpeningModal] = useState(false);
+  const handleRequestAccessModalOpen = () => {
+    setIsOpeningModal(true);
+    setIsRequestAccessOpen(true);
+  };
+
+  const handleRequestAccessModalClose = () => {
+    setIsRequestAccessOpen(false);
+  };
   const reloadVotes = async () => {
     const response = await client.query(countUpVotes(params.uri, 'dataset'));
     if (!response.errors && response.data.countUpVotes !== null) {
@@ -262,8 +274,9 @@ const DatasetView = () => {
                 </Link>
               </Breadcrumbs>
             </Grid>
-            {isAdmin && (
-              <Grid item>
+
+            <Grid item>
+              {isAdmin ? (
                 <Box sx={{ m: -1 }}>
                   <UpVoteButton
                     upVoted={isUpVoted}
@@ -304,8 +317,32 @@ const DatasetView = () => {
                     Delete
                   </Button>
                 </Box>
-              </Grid>
-            )}
+              ) : (
+                <Box sx={{ m: -1 }}>
+                  {isOpeningModal ? (
+                    <CircularProgress size={20} />
+                  ) : (
+                    <Button
+                      color="primary"
+                      startIcon={<LockOpen size={15} />}
+                      onClick={handleRequestAccessModalOpen}
+                      type="button"
+                      sx={{ mt: 1 }}
+                      variant="outlined"
+                    >
+                      Request Access
+                    </Button>
+                  )}
+                  <RequestAccessModal
+                    onApply={handleRequestAccessModalClose}
+                    onClose={handleRequestAccessModalClose}
+                    open={isRequestAccessOpen}
+                    stopLoader={() => setIsOpeningModal(false)}
+                    hit={{ _id: dataset.datasetUri, resourceKind: 'dataset' }}
+                  />
+                </Box>
+              )}
+            </Grid>
           </Grid>
           <Box sx={{ mt: 3 }}>
             <Tabs

From aa580c126bd806034f398b59b3cf9f47634b740d Mon Sep 17 00:00:00 2001
From: Sofia Sazonova <sazonova@amazon.co.uk>
Date: Mon, 29 Apr 2024 14:14:51 +0100
Subject: [PATCH 4/6] "Request access" button on DatasetView page in all cases

---
 .../src/modules/Datasets/views/DatasetView.js | 117 +++++++++---------
 1 file changed, 58 insertions(+), 59 deletions(-)

diff --git a/frontend/src/modules/Datasets/views/DatasetView.js b/frontend/src/modules/Datasets/views/DatasetView.js
index 7bd2c7e49..3824ee44b 100644
--- a/frontend/src/modules/Datasets/views/DatasetView.js
+++ b/frontend/src/modules/Datasets/views/DatasetView.js
@@ -276,72 +276,71 @@ const DatasetView = () => {
             </Grid>
 
             <Grid item>
-              {isAdmin ? (
-                <Box sx={{ m: -1 }}>
-                  <UpVoteButton
-                    upVoted={isUpVoted}
-                    onClick={() => upVoteDataset(dataset.datasetUri)}
-                    upVotes={upVotes}
-                  />
-                  <Button
-                    color="primary"
-                    startIcon={<ForumOutlined fontSize="small" />}
-                    sx={{ mt: 1, mr: 1 }}
-                    onClick={() => setOpenFeed(true)}
-                    type="button"
-                    variant="outlined"
-                  >
-                    Chat
-                  </Button>
-                  {isFeatureEnabled('datasets', 'aws_actions') && (
-                    <DatasetAWSActions dataset={dataset} isAdmin={isAdmin} />
-                  )}
-                  <Button
-                    color="primary"
-                    component={RouterLink}
-                    startIcon={<PencilAltIcon fontSize="small" />}
-                    sx={{ mt: 1, mr: 1 }}
-                    to={`/console/datasets/${dataset.datasetUri}/edit`}
-                    variant="outlined"
-                  >
-                    Edit
-                  </Button>
-                  <Button
-                    color="primary"
-                    startIcon={<FaTrash size={15} />}
-                    sx={{ mt: 1 }}
-                    onClick={handleDeleteObjectModalOpen}
-                    type="button"
-                    variant="outlined"
-                  >
-                    Delete
-                  </Button>
-                </Box>
-              ) : (
-                <Box sx={{ m: -1 }}>
-                  {isOpeningModal ? (
-                    <CircularProgress size={20} />
-                  ) : (
+              <Box sx={{ m: -1 }}>
+                {isAdmin && (
+                  <span>
+                    <UpVoteButton
+                      upVoted={isUpVoted}
+                      onClick={() => upVoteDataset(dataset.datasetUri)}
+                      upVotes={upVotes}
+                    />
                     <Button
                       color="primary"
-                      startIcon={<LockOpen size={15} />}
-                      onClick={handleRequestAccessModalOpen}
+                      startIcon={<ForumOutlined fontSize="small" />}
+                      sx={{ mt: 1, mr: 1 }}
+                      onClick={() => setOpenFeed(true)}
                       type="button"
+                      variant="outlined"
+                    >
+                      Chat
+                    </Button>
+                    {isFeatureEnabled('datasets', 'aws_actions') && (
+                      <DatasetAWSActions dataset={dataset} isAdmin={isAdmin} />
+                    )}
+                    <Button
+                      color="primary"
+                      component={RouterLink}
+                      startIcon={<PencilAltIcon fontSize="small" />}
+                      sx={{ mt: 1, mr: 1 }}
+                      to={`/console/datasets/${dataset.datasetUri}/edit`}
+                      variant="outlined"
+                    >
+                      Edit
+                    </Button>
+                    <Button
+                      color="primary"
+                      startIcon={<FaTrash size={15} />}
                       sx={{ mt: 1 }}
+                      onClick={handleDeleteObjectModalOpen}
+                      type="button"
                       variant="outlined"
                     >
-                      Request Access
+                      Delete
                     </Button>
-                  )}
-                  <RequestAccessModal
-                    onApply={handleRequestAccessModalClose}
-                    onClose={handleRequestAccessModalClose}
-                    open={isRequestAccessOpen}
-                    stopLoader={() => setIsOpeningModal(false)}
-                    hit={{ _id: dataset.datasetUri, resourceKind: 'dataset' }}
-                  />
-                </Box>
-              )}
+                  </span>
+                )}
+                {isOpeningModal ? (
+                  <CircularProgress size={20} />
+                ) : (
+                  <Button
+                    color="primary"
+                    startIcon={<LockOpen size={15} />}
+                    onClick={handleRequestAccessModalOpen}
+                    type="button"
+                    sx={{ mt: 1, ml: 1 }}
+                    variant="outlined"
+                  >
+                    Request Access
+                  </Button>
+                )}
+                <RequestAccessModal
+                  onApply={handleRequestAccessModalClose}
+                  onClose={handleRequestAccessModalClose}
+                  open={isRequestAccessOpen}
+                  stopLoader={() => setIsOpeningModal(false)}
+                  hit={{ _id: dataset.datasetUri, resourceKind: 'dataset' }}
+                />
+              </Box>
             </Grid>
           </Grid>
           <Box sx={{ mt: 3 }}>

From af8fc231e93cdb9ee2122d437fb5b4d5250dd1c3 Mon Sep 17 00:00:00 2001
From: Sofia Sazonova <sazonova@amazon.co.uk>
Date: Wed, 15 May 2024 13:04:05 +0100
Subject: [PATCH 5/6] Dataset Name text field gets populated appropriately

---
 frontend/src/modules/S3_Datasets/views/DatasetView.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/modules/S3_Datasets/views/DatasetView.js b/frontend/src/modules/S3_Datasets/views/DatasetView.js
index 1c9074f34..d4b049a14 100644
--- a/frontend/src/modules/S3_Datasets/views/DatasetView.js
+++ b/frontend/src/modules/S3_Datasets/views/DatasetView.js
@@ -338,7 +338,11 @@ const DatasetView = () => {
                   onClose={handleRequestAccessModalClose}
                   open={isRequestAccessOpen}
                   stopLoader={() => setIsOpeningModal(false)}
-                  hit={{ _id: dataset.datasetUri, resourceKind: 's3_datasets' }}
+                  hit={{
+                    _id: dataset.datasetUri,
+                    resourceKind: 'dataset',
+                    label: dataset.label
+                  }}
                 />
               </Box>
             </Grid>

From e47814903b69b10a737bd5aa3af99f60b10486bd Mon Sep 17 00:00:00 2001
From: Sofia Sazonova <sazonova@amazon.co.uk>
Date: Wed, 15 May 2024 13:28:17 +0100
Subject: [PATCH 6/6] Revert ""Request access" button instead 'Learn more' on
 DataSet list page" This reverts commit d54ac2e7

---
 .../S3_Datasets/components/DatasetListItem.js | 43 ++++---------------
 1 file changed, 9 insertions(+), 34 deletions(-)

diff --git a/frontend/src/modules/S3_Datasets/components/DatasetListItem.js b/frontend/src/modules/S3_Datasets/components/DatasetListItem.js
index a8480b389..e3f72f822 100644
--- a/frontend/src/modules/S3_Datasets/components/DatasetListItem.js
+++ b/frontend/src/modules/S3_Datasets/components/DatasetListItem.js
@@ -2,7 +2,6 @@ import {
   Box,
   Button,
   Card,
-  CircularProgress,
   Divider,
   Grid,
   Link,
@@ -10,12 +9,13 @@ import {
   Typography
 } from '@mui/material';
 import PropTypes from 'prop-types';
-import React, { useState } from 'react';
+import React from 'react';
 import * as BsIcons from 'react-icons/bs';
 import { BsTable } from 'react-icons/bs';
 import * as FaIcons from 'react-icons/fa';
 import * as FiIcons from 'react-icons/fi';
 import { useNavigate } from 'react-router';
+import { Link as RouterLink } from 'react-router-dom';
 import {
   IconAvatar,
   Label,
@@ -23,21 +23,8 @@ import {
   UpVotesReadOnly,
   useCardStyle
 } from 'design';
-import { LockOpen } from '@mui/icons-material';
-import { RequestAccessModal } from '../../Catalog/components';
 
 export const DatasetListItem = (props) => {
-  const [isRequestAccessOpen, setIsRequestAccessOpen] = useState(false);
-  const [isOpeningModal, setIsOpeningModal] = useState(false);
-  const handleRequestAccessModalOpen = () => {
-    setIsOpeningModal(true);
-    setIsRequestAccessOpen(true);
-  };
-
-  const handleRequestAccessModalClose = () => {
-    setIsRequestAccessOpen(false);
-  };
-
   const { dataset } = props;
   const classes = useCardStyle();
   const navigate = useNavigate();
@@ -259,25 +246,13 @@ export const DatasetListItem = (props) => {
               display: 'flex'
             }}
           >
-            {isOpeningModal ? (
-              <CircularProgress size={20} />
-            ) : (
-              <Button
-                color="primary"
-                startIcon={<LockOpen fontSize="small" />}
-                onClick={handleRequestAccessModalOpen}
-                type="button"
-              >
-                Request Access
-              </Button>
-            )}
-            <RequestAccessModal
-              onApply={handleRequestAccessModalClose}
-              onClose={handleRequestAccessModalClose}
-              open={isRequestAccessOpen}
-              stopLoader={() => setIsOpeningModal(false)}
-              hit={{ _id: dataset.datasetUri, resourceKind: 'dataset' }}
-            />
+            <Button
+              color="primary"
+              component={RouterLink}
+              to={`/console/datasets/${dataset.datasetUri}`}
+            >
+              Learn More
+            </Button>
           </Box>
           <Box sx={{ flexGrow: 1 }} />
           <UpVotesReadOnly upvotes={dataset.statistics.upvotes} />