From 1e9a40a8d806becc0f9e0d731bc3042494f17b16 Mon Sep 17 00:00:00 2001
From: dlpzx <dlpzx@amazon.com>
Date: Wed, 27 Nov 2024 10:19:01 +0100
Subject: [PATCH 1/4] Use isAdmin for Dashboards upVote

---
 .../src/modules/Dashboards/views/DashboardView.js    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/src/modules/Dashboards/views/DashboardView.js b/frontend/src/modules/Dashboards/views/DashboardView.js
index 03abaa021..e82270af4 100644
--- a/frontend/src/modules/Dashboards/views/DashboardView.js
+++ b/frontend/src/modules/Dashboards/views/DashboardView.js
@@ -222,11 +222,13 @@ const DashboardView = () => {
             </Grid>
             <Grid item>
               <Box sx={{ m: -1 }}>
-                <UpVoteButton
-                  upVoted={isUpVoted}
-                  onClick={() => upVoteDashboard(dashboard.dashboardUri)}
-                  upVotes={upVotes || 0}
-                />
+                {isAdmin && (
+                  <UpVoteButton
+                    upVoted={isUpVoted}
+                    onClick={() => upVoteDashboard(dashboard.dashboardUri)}
+                    upVotes={upVotes || 0}
+                  />
+                )}
                 <Button
                   color="primary"
                   startIcon={<ForumOutlined fontSize="small" />}

From e3ba1e9eb0f49a2da43ad3e70e93cb57aa7260f0 Mon Sep 17 00:00:00 2001
From: dlpzx <dlpzx@amazon.com>
Date: Wed, 27 Nov 2024 10:42:23 +0100
Subject: [PATCH 2/4] Disable upVote for non admins. Implement BE checks in
 upvote

---
 .../dataall/modules/dashboards/__init__.py    |  3 ++-
 .../modules/redshift_datasets/__init__.py     |  3 ++-
 .../dataall/modules/s3_datasets/__init__.py   |  2 +-
 .../modules/vote/services/vote_service.py     | 20 ++++++++++++++-----
 .../modules/Dashboards/views/DashboardView.js | 13 ++++++------
 .../Redshift_Datasets/views/RSDatasetView.js  | 11 +++++-----
 .../modules/S3_Datasets/views/DatasetView.js  | 11 +++++-----
 7 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/backend/dataall/modules/dashboards/__init__.py b/backend/dataall/modules/dashboards/__init__.py
index ffbc8e92d..eca274c9e 100644
--- a/backend/dataall/modules/dashboards/__init__.py
+++ b/backend/dataall/modules/dashboards/__init__.py
@@ -33,6 +33,7 @@ def __init__(self):
         from dataall.modules.catalog.indexers.registry import GlossaryRegistry, GlossaryDefinition
         from dataall.modules.vote.services.vote_service import add_vote_type
         from dataall.modules.dashboards.indexers.dashboard_indexer import DashboardIndexer
+        from dataall.modules.dashboards.services.dashboard_permissions import GET_DASHBOARD
 
         FeedRegistry.register(FeedDefinition('Dashboard', Dashboard))
 
@@ -42,7 +43,7 @@ def __init__(self):
             )
         )
 
-        add_vote_type('dashboard', DashboardIndexer)
+        add_vote_type('dashboard', DashboardIndexer, GET_DASHBOARD)
 
         EnvironmentResourceManager.register(DashboardRepository())
         log.info('Dashboard API has been loaded')
diff --git a/backend/dataall/modules/redshift_datasets/__init__.py b/backend/dataall/modules/redshift_datasets/__init__.py
index cd9e73f68..edcf675b2 100644
--- a/backend/dataall/modules/redshift_datasets/__init__.py
+++ b/backend/dataall/modules/redshift_datasets/__init__.py
@@ -53,6 +53,7 @@ def __init__(self):
         )
 
         import dataall.modules.redshift_datasets.api
+        from dataall.modules.redshift_datasets.services.redshift_dataset_permissions import GET_REDSHIFT_DATASET
 
         FeedRegistry.register(FeedDefinition(FEED_REDSHIFT_DATASET_TABLE_NAME, RedshiftTable))
         FeedRegistry.register(FeedDefinition(FEED_REDSHIFT_DATASET_NAME, RedshiftDataset))
@@ -75,7 +76,7 @@ def __init__(self):
             )
         )
 
-        add_vote_type(VOTE_REDSHIFT_DATASET_NAME, DatasetIndexer)
+        add_vote_type(VOTE_REDSHIFT_DATASET_NAME, DatasetIndexer, GET_REDSHIFT_DATASET)
 
         EnvironmentResourceManager.register(RedshiftDatasetEnvironmentResource())
         EnvironmentResourceManager.register(RedshiftConnectionEnvironmentResource())
diff --git a/backend/dataall/modules/s3_datasets/__init__.py b/backend/dataall/modules/s3_datasets/__init__.py
index dbd4f458c..2307607fa 100644
--- a/backend/dataall/modules/s3_datasets/__init__.py
+++ b/backend/dataall/modules/s3_datasets/__init__.py
@@ -75,7 +75,7 @@ def __init__(self):
             )
         )
 
-        add_vote_type('dataset', DatasetIndexer)
+        add_vote_type('dataset', DatasetIndexer, GET_DATASET)
 
         TargetType('dataset', GET_DATASET, UPDATE_DATASET, MANAGE_DATASETS)
 
diff --git a/backend/dataall/modules/vote/services/vote_service.py b/backend/dataall/modules/vote/services/vote_service.py
index 380d9728d..7cf6914b9 100644
--- a/backend/dataall/modules/vote/services/vote_service.py
+++ b/backend/dataall/modules/vote/services/vote_service.py
@@ -7,12 +7,13 @@
 from dataall.base.context import get_context
 from dataall.modules.catalog.indexers.base_indexer import BaseIndexer
 from dataall.modules.vote.db.vote_repositories import VoteRepository
+from dataall.core.permissions.services.resource_policy_service import ResourcePolicyService
 
-_VOTE_TYPES: Dict[str, Type[BaseIndexer]] = {}
+_VOTE_TYPES: Dict[str, Dict[Type[BaseIndexer], str]] = {}
 
 
-def add_vote_type(target_type: str, indexer: Type[BaseIndexer]):
-    _VOTE_TYPES[target_type] = indexer
+def add_vote_type(target_type: str, indexer: Type[BaseIndexer], permission: str):
+    _VOTE_TYPES[target_type] = {'indexer': indexer, 'permission': permission}
 
 
 def _session():
@@ -26,9 +27,18 @@ class VoteService:
 
     @staticmethod
     def upvote(targetUri: str, targetType: str, upvote: bool):
-        with _session() as session:
+        context = get_context()
+        target_type = _VOTE_TYPES[targetType]
+        with context.db_engine.scoped_session() as session:
+            ResourcePolicyService.check_user_resource_permission(
+                session=session,
+                username=context.username,
+                groups=context.groups,
+                resource_uri=targetUri,
+                permission_name=target_type.get('permission'),
+            )
             vote = VoteRepository.upvote(session=session, targetUri=targetUri, targetType=targetType, upvote=upvote)
-            _VOTE_TYPES[vote.targetType].upsert(session, vote.targetUri)
+            target_type.get('indexer').upsert(session, vote.targetUri)
             return vote
 
     @staticmethod
diff --git a/frontend/src/modules/Dashboards/views/DashboardView.js b/frontend/src/modules/Dashboards/views/DashboardView.js
index e82270af4..260de952e 100644
--- a/frontend/src/modules/Dashboards/views/DashboardView.js
+++ b/frontend/src/modules/Dashboards/views/DashboardView.js
@@ -222,13 +222,12 @@ const DashboardView = () => {
             </Grid>
             <Grid item>
               <Box sx={{ m: -1 }}>
-                {isAdmin && (
-                  <UpVoteButton
-                    upVoted={isUpVoted}
-                    onClick={() => upVoteDashboard(dashboard.dashboardUri)}
-                    upVotes={upVotes || 0}
-                  />
-                )}
+                <UpVoteButton
+                  upVoted={isUpVoted}
+                  disabled={!isAdmin}
+                  onClick={() => upVoteDashboard(dashboard.dashboardUri)}
+                  upVotes={upVotes || 0}
+                />
                 <Button
                   color="primary"
                   startIcon={<ForumOutlined fontSize="small" />}
diff --git a/frontend/src/modules/Redshift_Datasets/views/RSDatasetView.js b/frontend/src/modules/Redshift_Datasets/views/RSDatasetView.js
index e0bdea6ef..d8a2d129b 100644
--- a/frontend/src/modules/Redshift_Datasets/views/RSDatasetView.js
+++ b/frontend/src/modules/Redshift_Datasets/views/RSDatasetView.js
@@ -226,13 +226,14 @@ const RSDatasetView = () => {
             </Grid>
             <Grid item>
               <Box sx={{ m: -1 }}>
+                <UpVoteButton
+                  upVoted={isUpVoted}
+                  disabled={!isAdmin}
+                  onClick={() => upVoteDataset(dataset.datasetUri)}
+                  upVotes={upVotes}
+                />
                 {isAdmin && (
                   <span>
-                    <UpVoteButton
-                      upVoted={isUpVoted}
-                      onClick={() => upVoteDataset(dataset.datasetUri)}
-                      upVotes={upVotes}
-                    />
                     <Button
                       color="primary"
                       startIcon={<ForumOutlined fontSize="small" />}
diff --git a/frontend/src/modules/S3_Datasets/views/DatasetView.js b/frontend/src/modules/S3_Datasets/views/DatasetView.js
index f47b376c1..765132ab5 100644
--- a/frontend/src/modules/S3_Datasets/views/DatasetView.js
+++ b/frontend/src/modules/S3_Datasets/views/DatasetView.js
@@ -266,13 +266,14 @@ const DatasetView = () => {
 
             <Grid item>
               <Box sx={{ m: -1 }}>
+                <UpVoteButton
+                  disabled={!isAdmin}
+                  upVoted={isUpVoted}
+                  onClick={() => upVoteDataset(dataset.datasetUri)}
+                  upVotes={upVotes}
+                />
                 {isAdmin && (
                   <span>
-                    <UpVoteButton
-                      upVoted={isUpVoted}
-                      onClick={() => upVoteDataset(dataset.datasetUri)}
-                      upVotes={upVotes}
-                    />
                     <Button
                       color="primary"
                       startIcon={<ForumOutlined fontSize="small" />}

From 94eebc02f77b4a684812754f438d6e813fad6c64 Mon Sep 17 00:00:00 2001
From: dlpzx <dlpzx@amazon.com>
Date: Wed, 4 Dec 2024 15:39:14 +0100
Subject: [PATCH 3/4] Disabled prop for vote button

---
 frontend/src/design/components/UpVoteButton.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/design/components/UpVoteButton.js b/frontend/src/design/components/UpVoteButton.js
index 9b99e3913..e4ca2dd13 100644
--- a/frontend/src/design/components/UpVoteButton.js
+++ b/frontend/src/design/components/UpVoteButton.js
@@ -4,10 +4,11 @@ import * as PropTypes from 'prop-types';
 import React from 'react';
 
 export const UpVoteButton = (props) => {
-  const { upVoted, onClick, upVotes } = props;
+  const { upVoted, onClick, upVotes, disabled } = props;
   return (
     <Button
       color="primary"
+      disabled={disabled}
       startIcon={
         upVoted ? (
           <ThumbUpAlt fontSize="small" />
@@ -27,5 +28,6 @@ export const UpVoteButton = (props) => {
 UpVoteButton.propTypes = {
   upVoted: PropTypes.bool,
   onClick: PropTypes.func,
-  upVotes: PropTypes.any
+  upVotes: PropTypes.any,
+  disabled: PropTypes.bool
 };

From 391dfbff1ab4189fbf694764fa3a7aee7ef73526 Mon Sep 17 00:00:00 2001
From: dlpzx <dlpzx@amazon.com>
Date: Wed, 4 Dec 2024 15:51:56 +0100
Subject: [PATCH 4/4] Dummy change

---
 backend/dataall/modules/redshift_datasets/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/backend/dataall/modules/redshift_datasets/__init__.py b/backend/dataall/modules/redshift_datasets/__init__.py
index edcf675b2..6edaadd94 100644
--- a/backend/dataall/modules/redshift_datasets/__init__.py
+++ b/backend/dataall/modules/redshift_datasets/__init__.py
@@ -51,9 +51,8 @@ def __init__(self):
             FEED_REDSHIFT_DATASET_TABLE_NAME,
             VOTE_REDSHIFT_DATASET_NAME,
         )
-
-        import dataall.modules.redshift_datasets.api
         from dataall.modules.redshift_datasets.services.redshift_dataset_permissions import GET_REDSHIFT_DATASET
+        import dataall.modules.redshift_datasets.api
 
         FeedRegistry.register(FeedDefinition(FEED_REDSHIFT_DATASET_TABLE_NAME, RedshiftTable))
         FeedRegistry.register(FeedDefinition(FEED_REDSHIFT_DATASET_NAME, RedshiftDataset))