Revert "feat: tup-414 help users "View all …" (#317)" (#330)

This reverts commit 7482c88.
TACC · Oct 5, 2023 · 8b3578d · 8b3578d
1 parent 7482c88
commit 8b3578d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 30 deletions.
diff --git a/apps/tup-ui/src/pages/Dashboard/Dashboard.module.css b/apps/tup-ui/src/pages/Dashboard/Dashboard.module.css
@@ -44,8 +44,8 @@
   display: grid;
   gap: 25px;
   grid-template-columns: 1fr;
-  grid-template-rows: auto 1fr;
-  grid-template-areas:
+  grid-template-rows: 1fr 1fr;
+  grid-template-areas: 
     "projects"
     "tickets";
 

diff --git a/libs/tup-components/src/news/UserNews.tsx b/libs/tup-components/src/news/UserNews.tsx
@@ -7,8 +7,6 @@ import {
 } from '@tacc/core-components';
 import styles from './UserNews.module.css';
 
-const NEWS_DASHBOARD_DISPLAY_LIMIT = 3;
-
 const formatDate = (datestring: string): string => {
   const date = new Date(datestring);
   return date.toLocaleDateString('en-US', {
@@ -29,13 +27,13 @@ const ViewAllUpdates = () => (
     target="_blank"
     rel="noopener noreferrer"
   >
-    View all Updates
+    View All Updates
   </a>
 );
 
 const UserNews: React.FC = () => {
   const { data, isLoading } = useUserNews();
-  const maxItems = NEWS_DASHBOARD_DISPLAY_LIMIT;
+  const maxItems = 5;
 
   if (isLoading) return <LoadingSpinner />;
   return (

diff --git a/libs/tup-components/src/projects/ProjectsTable.tsx b/libs/tup-components/src/projects/ProjectsTable.tsx
@@ -4,8 +4,6 @@ import { ProjectsAllocations, useProjects } from '@tacc/tup-hooks';
 import { Link } from 'react-router-dom';
 import { EmptyTablePlaceholder } from '../utils';
 
-const PROJECTS_DASHBOARD_DISPLAY_LIMIT = 7;
-
 const allocationDisplay = (allocations: ProjectsAllocations[]) => {
   return allocations.length
     ? Array.from(
@@ -20,11 +18,9 @@ const allocationDisplay = (allocations: ProjectsAllocations[]) => {
 
 export const ProjectsTable: React.FC = () => {
   const { data, isLoading, error } = useProjects();
-  const projectData = data
-    ?.filter((prj) =>
-      prj.allocations?.some((alloc) => alloc.status === 'Active')
-    )
-    .slice(0, PROJECTS_DASHBOARD_DISPLAY_LIMIT);
+  const projectData = data?.filter((prj) =>
+    prj.allocations?.some((alloc) => alloc.status === 'Active')
+  );
 
   if (isLoading) {
     return <LoadingSpinner />;

diff --git a/libs/tup-components/src/tickets/TicketsDashboard.module.css b/libs/tup-components/src/tickets/TicketsDashboard.module.css
diff --git a/libs/tup-components/src/tickets/TicketsDashboard.tsx b/libs/tup-components/src/tickets/TicketsDashboard.tsx
@@ -1,24 +1,16 @@
-import React from 'react';
-import { Link } from 'react-router-dom';
 import { SectionTableWrapper } from '@tacc/core-components';
+import React from 'react';
 import TicketCreateModal from './TicketCreateModal';
 import { TicketsTable } from './TicketsTable';
 
-import styles from './TicketsDashboard.module.css';
-
 const TicketsDashboard: React.FC = () => {
   return (
     <SectionTableWrapper
       header="My Tickets"
       headerActions={
-        <>
-          <Link to="/tickets" className={styles['viewall-action']}>
-            View all Tickets
-          </Link>
-          <TicketCreateModal display="secondary" size="small">
-            + New Ticket
-          </TicketCreateModal>
-        </>
+        <TicketCreateModal display="secondary" size="small">
+          + New Ticket
+        </TicketCreateModal>
       }
       contentShouldScroll
     >

diff --git a/libs/tup-components/src/tickets/TicketsTable.tsx b/libs/tup-components/src/tickets/TicketsTable.tsx
@@ -6,7 +6,7 @@ import './TicketsTable.global.css';
 import { formatDate } from '../utils/timeFormat';
 import { EmptyTablePlaceholder } from '../utils';
 
-const TICKETS_DASHBOARD_DISPLAY_LIMIT = 7;
+const TICKETS_DASHBOARD_DISPLAY_LIMIT = 12;
 
 export const getStatusText = (status: string) => {
   switch (status) {