fix: iterate result (#1549)

* fix: iterate result * fix: lab developers see provision data
redhat-cop · Nov 2, 2023 · e85734a · e85734a
1 parent eba316b
commit e85734a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/catalog/ui/src/app/Admin/RatingsList.tsx b/catalog/ui/src/app/Admin/RatingsList.tsx
@@ -33,8 +33,8 @@ async function fetchCatalog(namespaces: string[]): Promise<CatalogItem[]> {
 
 const RatingsModal: React.FC<{ assetUuid: string }> = ({ assetUuid }) => {
   const { data: ratingsHistory } = useSWR<{
-    ratings: { comment: string; rating: number; email: string; useful: boolean }[];
-  }>(assetUuid !== '' ? apiPaths.RATINGS_HISTORY({ assetUuid }) : null, fetcher);
+    comment: string; rating: number; email: string; useful: boolean;
+  }[]>(assetUuid !== '' ? apiPaths.RATINGS_HISTORY({ assetUuid }) : null, fetcher);
 
   return (
     <Table
@@ -43,7 +43,7 @@ const RatingsModal: React.FC<{ assetUuid: string }> = ({ assetUuid }) => {
       cells={['Email', 'Comment', 'Rating', 'Useful']}
       rows={
         ratingsHistory
-          ? ratingsHistory.ratings.map((r) => {
+          ? ratingsHistory.map((r) => {
               const cells: any[] = [];
               cells.push(
                 // Name

diff --git a/catalog/ui/src/app/Services/ServicesItem.tsx b/catalog/ui/src/app/Services/ServicesItem.tsx
@@ -50,7 +50,6 @@ import {
   K8sObject,
   NamespaceList,
   ResourceClaim,
-  ResourceHandleResource,
   ServiceActionActions,
   Workshop,
 } from '@app/types';
@@ -64,6 +63,7 @@ import {
   getStageFromK8sObject,
   compareK8sObjects,
   namespaceToServiceNamespaceMapper,
+  isLabDeveloper,
 } from '@app/util';
 import useSession from '@app/utils/useSession';
 import Modal, { useModal } from '@app/Modal/Modal';
@@ -95,8 +95,7 @@ import './services-item.css';
 const ComponentDetailsList: React.FC<{
   resourceState: AnarchySubject;
   isAdmin: boolean;
-  resourceClaim: ResourceClaim;
-  resourceStatus: ResourceHandleResource;
+  groups: string[];
   externalPlatformUrl: string;
   isPartOfWorkshop: boolean;
   startDate: Date;
@@ -108,8 +107,7 @@ const ComponentDetailsList: React.FC<{
 }> = ({
   resourceState,
   isAdmin,
-  resourceClaim,
-  resourceStatus,
+  groups,
   externalPlatformUrl,
   isPartOfWorkshop,
   startDate,
@@ -171,7 +169,7 @@ const ComponentDetailsList: React.FC<{
               <DescriptionListDescription>{provisionMessagesHtml}</DescriptionListDescription>
             </DescriptionListGroup>
           ) : null}
-          {isAdmin || (provisionDataEntries && provisionDataEntries.length > 0) ? (
+          {isAdmin || isLabDeveloper(groups) || (provisionDataEntries && provisionDataEntries.length > 0) ? (
             <ExpandableSection toggleText="Advanced settings">
               {provisionDataEntries && provisionDataEntries.length > 0 ? (
                 <DescriptionListGroup>
@@ -202,7 +200,7 @@ const ComponentDetailsList: React.FC<{
                   </DescriptionListDescription>
                 </DescriptionListGroup>
               ) : null}
-              {isAdmin ? (
+              {isAdmin || isLabDeveloper(groups) ? (
                 <DescriptionListGroup>
                   <DescriptionListTerm>UUID</DescriptionListTerm>
                   <DescriptionListDescription>
@@ -254,7 +252,7 @@ const ComponentDetailsList: React.FC<{
                   </DescriptionListDescription>
                 </DescriptionListGroup>
               ) : null}
-              {isAdmin && resourceState?.status?.towerJobs ? (
+              {(isAdmin || isLabDeveloper(groups)) && resourceState?.status?.towerJobs ? (
                 <DescriptionListGroup key="tower-jobs">
                   <DescriptionListTerm>Ansible Jobs</DescriptionListTerm>
                   <DescriptionListDescription>
@@ -291,7 +289,7 @@ const ServicesItemComponent: React.FC<{
 }> = ({ activeTab, resourceClaimName, serviceNamespaceName }) => {
   const navigate = useNavigate();
   const location = useLocation();
-  const { isAdmin, serviceNamespaces: sessionServiceNamespaces } = useSession().getSession();
+  const { isAdmin, groups, serviceNamespaces: sessionServiceNamespaces } = useSession().getSession();
   const { mutate: globalMutate, cache } = useSWRConfig();
   const [expanded, setExpanded] = useState([]);
 
@@ -859,8 +857,7 @@ const ServicesItemComponent: React.FC<{
                             <ComponentDetailsList
                               resourceState={resourceState}
                               isAdmin={isAdmin}
-                              resourceClaim={resourceClaim}
-                              resourceStatus={resourceStatus}
+                              groups={groups}
                               externalPlatformUrl={externalPlatformUrl}
                               isPartOfWorkshop={isPartOfWorkshop}
                               startDate={startDate}