Fixes 2975: Add template Table

content-services · Jan 2, 2024 · e07ed1f · e07ed1f
1 parent 4fd5f1f
commit e07ed1f
Show file tree

Hide file tree

Showing 24 changed files with 1,051 additions and 94 deletions.
diff --git a/deploy/frontend.yaml b/deploy/frontend.yaml
@@ -16,21 +16,35 @@ objects:
           - v1
       frontend:
         paths:
-          - /apps/content-sources  # TODO ensure this matches routes?
+          - /apps/content-sources # TODO ensure this matches routes?
       image: ${IMAGE}:${IMAGE_TAG}
       navItems:
-        - appId: "content-sources"
-          title: "Repositories"
-          href: "/settings/content"
-          product: "Content"
+        - appId: 'content-sources'
+          title: 'Repositories'
+          href: '/settings/content/repositories'
+          product: 'Content'
+        - appId: 'content-sources'
+          title: 'Templates'
+          href: '/settings/content/templates'
+          product: 'Content'
       module:
-        manifestLocation: "/apps/content-sources/fed-mods.json"
+        manifestLocation: '/apps/content-sources/fed-mods.json'
         modules:
           - id: 'insights-content-sources' # This should likely match: https://github.com/RedHatInsights/cloud-services-config/blob/ci-beta/chrome/fed-modules.json#L776
-            module: "./RootApp"
+            module: './RootApp'
             routes:
-              - pathname: /insights/content  # TODO ensure this matches routes/webpack config?
-              - pathname: /settings/content
+              - appId: 'content'
+                title: 'Repositories'
+                href: '/settings/content/repositories'
+              - appId: 'content'
+                title: 'Repositories'
+                href: '/insights/content/repositories'
+              - appId: 'content'
+                title: 'Templates'
+                href: '/settings/content/templates'
+              - appId: 'content'
+                title: 'Templates'
+                href: '/insights/content/templates'
 
 parameters:
   - name: ENV_NAME

diff --git a/src/Pages/AdminTaskTable/AdminTaskTable.test.tsx b/src/Pages/AdminTaskTable/AdminTaskTable.test.tsx
@@ -1,7 +1,8 @@
 import { render } from '@testing-library/react';
 import { ReactQueryTestWrapper, defaultIntrospectTask } from '../../testingHelpers';
-import AdminTaskTable, { formatDate } from './AdminTaskTable';
+import AdminTaskTable from './AdminTaskTable';
 import { useAdminTaskListQuery } from '../../services/AdminTasks/AdminTaskQueries';
+import { formatDateToHumanReadable } from '../../helpers';
 
 jest.mock('../../services/AdminTasks/AdminTaskQueries', () => ({
   useAdminTaskListQuery: jest.fn(),
@@ -72,5 +73,7 @@ it('Render with a single row', () => {
       defaultIntrospectTask.status.at(0)?.toUpperCase() + defaultIntrospectTask.status.slice(1),
     ),
   ).toBeInTheDocument();
-  expect(queryByText(formatDate(defaultIntrospectTask.queued_at))).toBeInTheDocument();
+  expect(
+    queryByText(formatDateToHumanReadable(defaultIntrospectTask.queued_at)),
+  ).toBeInTheDocument();
 });
diff --git a/src/Pages/AdminTaskTable/AdminTaskTable.tsx b/src/Pages/AdminTaskTable/AdminTaskTable.tsx
@@ -25,11 +25,11 @@ import { SkeletonTable } from '@patternfly/react-component-groups';
 import Hide from '../../components/Hide/Hide';
 import EmptyTableState from '../../components/EmptyTableState/EmptyTableState';
 import AdminTaskFilters from './components/AdminTaskFilters';
-import dayjs from 'dayjs';
 import StatusIcon from './components/StatusIcon';
 import { useAdminTaskListQuery } from '../../services/AdminTasks/AdminTaskQueries';
 import { AdminTaskFilterData, AdminTask } from '../../services/AdminTasks/AdminTaskApi';
 import { Outlet, useNavigate } from 'react-router-dom';
+import { formatDateToHumanReadable } from '../../helpers';
 
 const useStyles = createUseStyles({
   mainContainer: {
@@ -55,8 +55,6 @@ const useStyles = createUseStyles({
   },
 });
 
-export const formatDate = (date: string): string => dayjs(date).format('DD MMM YYYY HH:mm UTCZ');
-
 const perPageKey = 'adminTaskPerPage';
 
 const AdminTaskTable = () => {
@@ -215,7 +213,7 @@ const AdminTaskTable = () => {
                   <Td>{adminTask.org_id}</Td>
                   <Td>{adminTask.account_id ? adminTask.account_id : 'Unknown'}</Td>
                   <Td>{adminTask.typename}</Td>
-                  <Td>{formatDate(adminTask.queued_at)}</Td>
+                  <Td>{formatDateToHumanReadable(adminTask.queued_at)}</Td>
                   <Td>
                     <StatusIcon status={adminTask.status} />
                   </Td>

diff --git a/src/Pages/AdminTaskTable/components/ViewPayloadModal/ViewPayloadModal.tsx b/src/Pages/AdminTaskTable/components/ViewPayloadModal/ViewPayloadModal.tsx
@@ -16,8 +16,8 @@ import ReactJson from 'react18-json-view';
 import Hide from '../../../../components/Hide/Hide';
 import { useFetchAdminTaskQuery } from '../../../../services/AdminTasks/AdminTaskQueries';
 import { useNavigate, useParams } from 'react-router-dom';
-import { ADMIN_TASKS_ROUTE } from '../../../../Routes/useTabbedRoutes';
 import useRootPath from '../../../../Hooks/useRootPath';
+import { ADMIN_TASKS_ROUTE } from '../../../../Routes/constants';
 
 const useStyles = createUseStyles({
   jsonView: {

diff --git a/src/Pages/AdminTaskTable/components/ViewPayloadModal/components/AdminTaskInfo.test.tsx b/src/Pages/AdminTaskTable/components/ViewPayloadModal/components/AdminTaskInfo.test.tsx
@@ -2,7 +2,7 @@ import { render } from '@testing-library/react';
 import AdminTaskInfo from './AdminTaskInfo';
 import { AdminTask } from '../../../../../services/AdminTasks/AdminTaskApi';
 import { defaultIntrospectTask } from '../../../../../testingHelpers';
-import { formatDate } from '../../../AdminTaskTable';
+import { formatDateToHumanReadable } from '../../../../../helpers';
 
 jest.mock('../../../../../middleware/AppContext', () => ({
   useAppContext: () => ({ rbac: { read: true, write: true } }),
@@ -16,9 +16,15 @@ it('Render with all fields', () => {
   expect(queryByText(defaultIntrospectTask.org_id)).toBeInTheDocument();
   expect(queryByText(defaultIntrospectTask.typename)).toBeInTheDocument();
   expect(queryByText(defaultIntrospectTask.status)).toBeInTheDocument();
-  expect(queryByText(formatDate(defaultIntrospectTask.queued_at))).toBeInTheDocument();
-  expect(queryByText(formatDate(defaultIntrospectTask.started_at))).toBeInTheDocument();
-  expect(queryByText(formatDate(defaultIntrospectTask.finished_at))).toBeInTheDocument();
+  expect(
+    queryByText(formatDateToHumanReadable(defaultIntrospectTask.queued_at)),
+  ).toBeInTheDocument();
+  expect(
+    queryByText(formatDateToHumanReadable(defaultIntrospectTask.started_at)),
+  ).toBeInTheDocument();
+  expect(
+    queryByText(formatDateToHumanReadable(defaultIntrospectTask.finished_at)),
+  ).toBeInTheDocument();
   expect(queryByText(defaultIntrospectTask.error)).toBeInTheDocument();
 });
 
@@ -38,7 +44,7 @@ it('Render without optional fields', () => {
   expect(queryByText(missingOptional.org_id)).toBeInTheDocument();
   expect(queryByText(missingOptional.typename)).toBeInTheDocument();
   expect(queryByText(missingOptional.status)).toBeInTheDocument();
-  expect(queryByText(formatDate(missingOptional.queued_at))).toBeInTheDocument();
+  expect(queryByText(formatDateToHumanReadable(missingOptional.queued_at))).toBeInTheDocument();
   expect(queryByText('Not started')).toBeInTheDocument();
   expect(queryByText('Not finished')).toBeInTheDocument();
   expect(queryByText('None')).toBeInTheDocument();

diff --git a/src/Pages/AdminTaskTable/components/ViewPayloadModal/components/AdminTaskInfo.tsx b/src/Pages/AdminTaskTable/components/ViewPayloadModal/components/AdminTaskInfo.tsx
@@ -5,7 +5,7 @@ import {
   DescriptionListTerm,
 } from '@patternfly/react-core';
 import { AdminTask } from '../../../../../services/AdminTasks/AdminTaskApi';
-import { formatDate } from '../../../AdminTaskTable';
+import { formatDateToHumanReadable } from '../../../../../helpers';
 
 export interface AdminTaskInfoProps {
   adminTask: AdminTask;
@@ -36,18 +36,20 @@ const AdminTaskInfo = ({ adminTask }: AdminTaskInfoProps) => (
     </DescriptionListGroup>
     <DescriptionListGroup>
       <DescriptionListTerm>Queued At</DescriptionListTerm>
-      <DescriptionListDescription>{formatDate(adminTask.queued_at)}</DescriptionListDescription>
+      <DescriptionListDescription>
+        {formatDateToHumanReadable(adminTask.queued_at)}
+      </DescriptionListDescription>
     </DescriptionListGroup>
     <DescriptionListGroup>
       <DescriptionListTerm>Started At</DescriptionListTerm>
       <DescriptionListDescription>
-        {adminTask.started_at ? formatDate(adminTask.started_at) : 'Not started'}
+        {adminTask.started_at ? formatDateToHumanReadable(adminTask.started_at) : 'Not started'}
       </DescriptionListDescription>
     </DescriptionListGroup>
     <DescriptionListGroup>
       <DescriptionListTerm>Finished At</DescriptionListTerm>
       <DescriptionListDescription>
-        {adminTask.finished_at ? formatDate(adminTask.finished_at) : 'Not finished'}
+        {adminTask.finished_at ? formatDateToHumanReadable(adminTask.finished_at) : 'Not finished'}
       </DescriptionListDescription>
     </DescriptionListGroup>
     <DescriptionListGroup>

diff --git a/src/Pages/ContentListTable/components/DeleteContentModal/DeleteContentModal.tsx b/src/Pages/ContentListTable/components/DeleteContentModal/DeleteContentModal.tsx
@@ -107,7 +107,6 @@ export default function DeleteContentModal() {
         <Stack>
           <StackItem>
             <Button
-              //   className={classes.removeButton}
               key='confirm'
               ouiaId='delete_modal_confirm'
               variant='danger'
@@ -117,7 +116,7 @@ export default function DeleteContentModal() {
             >
               Remove
             </Button>
-            <Button key='cancel' variant='link' onClick={onClose} ouiaId='edit_modal_cancel'>
+            <Button key='cancel' variant='link' onClick={onClose} ouiaId='delete_modal_cancel'>
               Cancel
             </Button>
           </StackItem>