OpenConceptLab/ocl_issues#127 | core_user group

Author: snyaggarwal

src/components/map-projects/AICandidatesAnalysis.jsx

@@ -17,10 +17,8 @@ import DataObjectIcon from '@mui/icons-material/DataObject';
 
 import get from 'lodash/get'
 
-import { isAdminUser } from '../../common/utils'
 
-
-const AICandidatesAnalysis = ({ analysis, onClose, sx }) => {
+const AICandidatesAnalysis = ({ analysis, onClose, sx, isCoreUser }) => {
   const { t } = useTranslation();
   const [openDetails, setOpenDetails] = React.useState(false)
 
@@ -65,7 +63,7 @@ const AICandidatesAnalysis = ({ analysis, onClose, sx }) => {
         <Typography gutterBottom sx={{ color: 'text.secondary', fontSize: 13, mb: 0, textAlign: 'right' }}>
           {getModelName()}
           {
-            isAdminUser() &&
+            isCoreUser &&
               <Tooltip title={t('map_project.view_raw_json')} placement='right'>
                 <span>
                   <IconButton color='primary' size='small' disabled={!analysis} sx={{padding: '4px', marginLeft: '4px', marginTop: '-2px'}} onClick={() => setOpenDetails(!openDetails)}>

src/components/map-projects/Candidates.jsx

@@ -184,7 +184,7 @@ const SubHeader = ({count, onClick, isCollapsed, header, indicatorColor, isFirst
 }
 
 
-const CandidateList = ({candidates, header, rowIndex, orderBy, order, setShowItem, showItem, setShowHighlights, isSelectedForMap, onMap, onFetchMore, bgColor, bucketId, display, onDisplayChange, noToolbar, toolbarControl, repoVersion, alignToolbarLeft, rightControl, analysis, showAnalysis, openAnalysis, onCloseAnalysis, AIRecommendedCandidateId, locales, scispacy, showAlgo, collapsed, onCollapse, candidatesScore, algoScoreFirst, conceptCache, byAlgorithm, isFirst}) => {
+const CandidateList = ({candidates, header, rowIndex, orderBy, order, setShowItem, showItem, setShowHighlights, isSelectedForMap, onMap, onFetchMore, bgColor, bucketId, display, onDisplayChange, noToolbar, toolbarControl, repoVersion, alignToolbarLeft, rightControl, analysis, showAnalysis, openAnalysis, onCloseAnalysis, AIRecommendedCandidateId, locales, scispacy, showAlgo, collapsed, onCollapse, candidatesScore, algoScoreFirst, conceptCache, byAlgorithm, isFirst, isCoreUser}) => {
   const results = {total: onFetchMore ? candidates?.length : 1, results: candidates || []}
   const isCollapsed = collapsed.includes(bucketId)
   const onCollapseToggle = () => {
@@ -248,7 +248,7 @@ const CandidateList = ({candidates, header, rowIndex, orderBy, order, setShowIte
         subheader={
           (showAnalysis && openAnalysis) ? (
             <div className='col-xs-12 padding-0' style={{display: 'inline-flex', flexDirection: 'column'}}>
-              <AICandidatesAnalysis analysis={analysis} onClose={onCloseAnalysis} sx={{marginBottom: '4px'}}/>
+              <AICandidatesAnalysis analysis={analysis} onClose={onCloseAnalysis} sx={{marginBottom: '4px'}} isCoreUser={isCoreUser} />
               {
                 showHeader &&
                   <SubHeader count={count} onClick={onCollapseToggle} isCollapsed={isCollapsed} header={header} indicatorColor={bgColor} isFirst={isFirst} />
@@ -293,7 +293,7 @@ const CandidateList = ({candidates, header, rowIndex, orderBy, order, setShowIte
   )
 }
 
-const Candidates = ({rowIndex, alert, setAlert, candidates, setShowItem, showItem, setShowHighlights, isSelectedForMap, onMap, onFetchMore, isLoading, candidatesScore, repoVersion, analysis, onFetchRecommendation, appliedFacets, setAppliedFacets, filters, facets, columns, defaultFilters, locales, models, selectedModel, onModelChange, onRefreshClick, rowStage, inAIAssistantGroup, algosSelected, conceptCache}) => {
+const Candidates = ({rowIndex, alert, setAlert, candidates, setShowItem, showItem, setShowHighlights, isSelectedForMap, onMap, onFetchMore, isLoading, candidatesScore, repoVersion, analysis, onFetchRecommendation, appliedFacets, setAppliedFacets, filters, facets, columns, defaultFilters, locales, models, selectedModel, onModelChange, onRefreshClick, rowStage, inAIAssistantGroup, algosSelected, conceptCache, isCoreUser}) => {
   const { t } = useTranslation();
   const [sortBy, setSortBy] = React.useState('search_meta.search_normalized_score')
   const [groupBy, setGroupBy] = React.useState('quality')
@@ -331,7 +331,8 @@ const Candidates = ({rowIndex, alert, setAlert, candidates, setShowItem, showIte
     locales: locales,
     candidatesScore: candidatesScore,
     algoScoreFirst: algoScoreFirst,
-    conceptCache: conceptCache
+    conceptCache: conceptCache,
+    isCoreUser: isCoreUser
   }
 
   const onSort = option => {

src/components/map-projects/Controls.jsx

@@ -38,7 +38,7 @@ const IkonButton = ({title, icon, onClick, color, disabled, id}) => {
   )
 }
 
-const Controls = ({project, onDownload, onSave, onDelete, owner, file, isSaving, onImport, importResponse, onDownloadImportReport, onProjectLogsClick, isProjectsLogOpen, configure, setConfigure, isStaff, loadingMatches}) => {
+const Controls = ({project, onDownload, onSave, onDelete, owner, file, isSaving, onImport, importResponse, onDownloadImportReport, onProjectLogsClick, isProjectsLogOpen, configure, setConfigure, isCoreUser, loadingMatches}) => {
   const { t } = useTranslation();
   const [anchorEl, setAnchorEl] = React.useState(null);
   const downloadOpen = Boolean(anchorEl);
@@ -136,7 +136,7 @@ const Controls = ({project, onDownload, onSave, onDelete, owner, file, isSaving,
           </ListItemIcon>
           <ListItemText>{t('common.download_csv')}</ListItemText>
         </MenuItem>
-        <MenuItem onClick={() => {setAnchorEl(null); onDownload('candidates_metadata');}} disabled={!isStaff}>
+        <MenuItem onClick={() => {setAnchorEl(null); onDownload('candidates_metadata');}} disabled={!isCoreUser}>
           <ListItemIcon>
             <JSONIcon sx={{fontSize: '1.25rem'}} />
           </ListItemIcon>

src/components/map-projects/MapProject.jsx

@@ -231,7 +231,7 @@ const MapProject = () => {
   const SCISPACY_API_URL = window.SCISPACY_LOINC_API_URL || process.env.SCISPACY_LOINC_API_URL
   const OCL_ONLINE_API_URL = window.OCL_ONLINE_API_URL || process.env.OCL_ONLINE_API_URL
   const inAIAssistantGroup = Boolean(hasAuthGroup(user, 'mapper_ai_assistant') && AI_ASSISTANT_API_URL)
-  const isStaff = user?.is_staff
+  const isCoreUser = hasAuthGroup(user, 'core_user')
   const CANDIDATES_LIMIT = 15
   const canBridge = bridgeRef?.current?.canBridge()
   const canScispacy = Boolean(canBridge && SCISPACY_API_URL && toggles.SCISPACY_LOINC_TOGGLE === true)
@@ -2717,7 +2717,7 @@ const MapProject = () => {
                 </span>
             }
               <Controls
-                isStaff={isStaff}
+                isCoreUser={isCoreUser}
                 project={project}
                 onDownload={onDownloadClick}
                 onSave={onSave}
@@ -3095,6 +3095,7 @@ const MapProject = () => {
                       inAIAssistantGroup={inAIAssistantGroup}
                       algosSelected={algosSelected}
                       conceptCache={conceptCache}
+                      isCoreUser={isCoreUser}
                     />
                 }
                 {