Merge pull request #1052 from AI4Bharat/ssi

Ssi
AI4Bharat · Jun 21, 2024 · 3289c7e · 3289c7e
2 parents 0113caf + 6289e08
commit 3289c7e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/ui/pages/component/Tabs/AdvancedOperation.jsx b/src/ui/pages/component/Tabs/AdvancedOperation.jsx
@@ -569,7 +569,7 @@ const AdvancedOperation = (props) => {
                 }}
                 onClick={handleOpenExportProjectDialog}
                 label="Export Project into Dataset"
-                disabled={userRole.WorkspaceManager === loggedInUserData?.role ? true : false}
+                disabled={userRole.WorkspaceManager === loggedInUserData?.role || userRole.OrganizationOwner === loggedInUserData?.role  ? true : false}
 
               />
             ) : (
@@ -583,7 +583,7 @@ const AdvancedOperation = (props) => {
                 }}
                 onClick={handleExportProject}
                 label="Export Project into Dataset"
-                disabled={userRole.WorkspaceManager === loggedInUserData?.role ? true : false}
+                disabled={userRole.WorkspaceManager === loggedInUserData?.role || userRole.OrganizationOwner === loggedInUserData?.role  ? true : false}
 
               />
             )}
@@ -659,7 +659,8 @@ const AdvancedOperation = (props) => {
                   value={taskReviews}
                   label="Task Reviews"
                   onChange={handleReviewToggle}
-                // getOptionDisabled={(option) => option.disabled}
+                  disabled ={userRole.WorkspaceManager === loggedInUserData?.role || userRole.OrganizationOwner === loggedInUserData?.role ?true:false}
+                  // getOptionDisabled={(option) => option.disabled}
                 >
                   {projectStage.map((type, index) => (
                     <MenuItem value={type.value} key={index} disabled={type.disabled} >

diff --git a/src/ui/pages/component/Tabs/DatasetProjectsTable.jsx b/src/ui/pages/component/Tabs/DatasetProjectsTable.jsx
@@ -207,7 +207,7 @@ export default function DatasetProjectsTable({ datasetId }) {
 					>
 						<CustomButton sx={{ borderRadius: 2 }} label="View" />
 					</Link>
-					{userRole.Admin === loggedInUserData?.role || userRole.OrganizationOwner === loggedInUserData?.role ?<CustomButton sx={{ borderRadius: 2, height: 37 }} onClick={() => getExportProjectButton(project)} label="Export" />:null}					<CustomButton sx={{ borderRadius: 2 }} onClick={() => getPullNewDataAPI(project)} label="Pull New Data Items" />
+					{userRole.Admin === loggedInUserData?.role ?<CustomButton sx={{ borderRadius: 2, height: 37 }} onClick={() => getExportProjectButton(project)} label="Export" />:null}					<CustomButton sx={{ borderRadius: 2 }} onClick={() => getPullNewDataAPI(project)} label="Pull New Data Items" />
 				</Stack>
 			),
 		})):[]