Upgrade dashboard weekly (#549)

philipdouble · sdstolworthy · web-flow · commit c089b73ef6a2 · 2021-10-04T12:27:13.000-04:00
* Removing the old dashboard code

* one last line to clean

* commit for review and collab

* people enabled

* removing practice count from test

Co-authored-by: Spencer Stolworthy &lt;sdstolworthy@gmail.com&gt;
diff --git a/src/components/dashboard/widgets/dw_last_weekly_report2.tsx b/src/components/dashboard/widgets/dw_last_weekly_report2.tsx
@@ -0,0 +1,85 @@
+import { Artifact, Engagement } from '../../../schemas/engagement';
+import {
+  Card,
+  CardBody,
+  CardFooter,
+  CardHeader,
+  Text,
+  TextContent,
+  TextVariants,
+} from '@patternfly/react-core';
+import { Table, TableBody, TableHeader } from '@patternfly/react-table';
+
+import CustomRowWrapper from '../../../components/custom_row_wrapper/custom_row_wrapper';
+import {ReactComponent as HeartbeatIcon} from '../../../assets/images/heart-rate.svg';
+import { Link } from 'react-router-dom';
+import { LinkOrSpan } from '../../link_or_span/link_or_span';
+import React from 'react';
+
+export interface DwLastWeeklyReportProps {
+  artifacts: Artifact[];
+  engagements: Partial<Engagement>[];
+}
+const columns = ['Weekly Report', 'Engagement'];
+export function DwLastWeeklyReport2({
+  artifacts = [],
+  engagements = [],
+}: DwLastWeeklyReportProps) {
+  const engagementsById = artifacts.reduce(
+    (acc, curr) => ({
+      ...acc,
+      [curr.engagement_uuid]: engagements.find(
+        e => e.uuid === curr.engagement_uuid
+      ),
+    }),
+    {}
+  );
+  const rows = artifacts.map(artifact => {
+    return [
+      {
+        title: (
+          <LinkOrSpan href={artifact?.linkAddress}>
+            {artifact?.description}
+          </LinkOrSpan>
+        ),
+      },
+      {
+        title: (
+          <Link to={`/app/engagements/${artifact.engagement_uuid}`}>
+            {engagementsById[artifact.engagement_uuid]?.customer_name}
+            &nbsp;—&nbsp;
+            {engagementsById[artifact.engagement_uuid]?.project_name}
+          </Link>
+        ),
+      },
+    ];
+  });
+  return (
+    <Card>
+      <CardHeader>
+      <HeartbeatIcon
+          width="25"
+          fill="#EE0000"
+          stroke="#EE0000"
+          style={{marginRight:"5px"}}
+        ></HeartbeatIcon>
+        <TextContent>
+          <Text component={TextVariants.h2}>Weekly Reports <span style={{fontSize:"12px", color:"#999999", verticalAlign:"middle"}}>(last 5)</span></Text>
+        </TextContent>
+      </CardHeader>
+      <CardBody>
+        <Table
+          aria-label="Last 5 Weekly Reports"
+          rows={rows}
+          cells={columns}
+          gridBreakPoint={'grid-lg'}
+          rowWrapper={({trRef, rowProps, ...props}) => <CustomRowWrapper trref={trRef} rowprops={rowProps} {...props}/>}
+        >
+          <TableHeader />
+          <TableBody />
+        </Table>
+      </CardBody>
+      <CardFooter></CardFooter>
+    </Card>
+  );
+}
diff --git a/src/hooks/use_practice_count.tsx b/src/hooks/use_practice_count.tsx
@@ -2,8 +2,8 @@ import { useEffect, useState } from 'react';
 
 import { PracticeCount } from '../schemas/engagement';
 
-export const usePracticeCount = (fetcher: () => Promise<PracticeCount>) => {
-  const [practiceCount, setPracticeCount] = useState<PracticeCount | undefined>(
+export const usePracticeCount = (fetcher: () => Promise<PracticeCount[]>) => {
+  const [practiceCount, setPracticeCount] = useState<PracticeCount[] | undefined>(
     undefined
   );
   const [isLoading, setIsLoading] = useState(false);
diff --git a/src/packages/api_v1_sdk/apiv1_practice_count_service.ts b/src/packages/api_v1_sdk/apiv1_practice_count_service.ts
@@ -37,7 +37,7 @@ export class Apiv1PracticeCountService implements PracticeCountService {
   }
   async getPracticeCount(filter?: PracticeCountFilter): Promise<PracticeCount[]> {
     const { data } = await this.axios.get(
-      `https://word-analyzer-engagements-dev.apps.hivec.sandbox1405.opentlc.com/aggregate-for-engagement?uuid=999`
+      `https://word-analyzer-engagements-dev.apps.openshift-4813-7bsw4.do500.redhatlabs.dev/aggregate-for-engagement?uuid=999`
     );
     
     let sorted = data.data.slice().sort((a, b) => b.value - a.value).splice(1, 5).reverse();
diff --git a/src/routes/dashboard/index.tsx b/src/routes/dashboard/index.tsx
@@ -23,12 +23,13 @@ import { DwLastDemo } from '../../components/dashboard/widgets/dw_last_demo';
 import { DwLastUpdated } from '../../components/dashboard/widgets/dw_last_updated_engagements';
 import { DwLastUseCases } from '../../components/dashboard/widgets/dw_last_use_cases';
 import { DwLastWeeklyReport } from '../../components/dashboard/widgets/dw_last_weekly_report';
-import { DwTopPractices } from '../../components/dashboard/widgets/dw_top_practices';
+//import { DwLastWeeklyReport2 } from '../../components/dashboard/widgets/dw_last_weekly_report2';
+//import { DwTopPractices } from '../../components/dashboard/widgets/dw_top_practices';
 import { DwTopTags } from '../../components/dashboard/widgets/dw_top_tags';
 import { EnabledUsersFilter } from '../../services/enabled_users_service/enabled_users_service';
 import { EngagementQueryMediator } from '../../components/dashboard/widgets/engagement_query_mediator';
 import { Feature } from '../../components/feature/feature';
-import { PracticeCountFilter } from '../../services/practice_count_service/practice_count_service';
+//import { PracticeCountFilter } from '../../services/practice_count_service/practice_count_service';
 import { SortOrder } from '../../services/engagement_service/engagement_service';
 import { SummaryCountFilter } from '../../services/summary_count_service/summary_count_service';
 import { createBase64ParseableFilter } from '../engagement_list/engagement_list_route';
@@ -37,7 +38,7 @@ import { useEnabledUsers } from '../../hooks/use_enabled_users';
 import { useEngagementCollection } from '../../hooks/engagement_collection_hook';
 import { useEngagementFormConfig } from '../../context/engagement_config_context/engagement_config_hook';
 import { useHistory } from 'react-router';
-import { usePracticeCount } from '../../hooks/use_practice_count';
+//import { usePracticeCount } from '../../hooks/use_practice_count';
 import { useServiceProviders } from '../../context/service_provider_context/service_provider_context';
 import { useSummaryCount } from '../../hooks/use_summary_count';
 import { useVersion } from '../../context/version_context/version_context';
@@ -70,7 +71,7 @@ export function Dashboard() {
     artifactService,
     useCaseService,
     enabledUsersService,
-    practiceCountService,
+ //   practiceCountService,
     summaryCountService,
   } = useServiceProviders();
   const [isRegionSelectOpen, setIsRegionSelectOpen] = useState(false);
@@ -89,16 +90,16 @@ export function Dashboard() {
     undefined
   );
 
-  const practiceFetcher = useCallback(() => {
-    const filter: PracticeCountFilter = {
-      regions: selectedRegions,
-    };
-    return practiceCountService.getPracticeCount(filter);
-  }, [practiceCountService, selectedRegions]);
+  // const practiceFetcher = useCallback(() => {
+  //   const filter: PracticeCountFilter = {
+  //     regions: selectedRegions,
+  //   };
+  //   return practiceCountService.getPracticeCount(filter);
+  // }, [practiceCountService, selectedRegions]);
 
-  const { practiceCount, isLoading: isLoadingPractices } = usePracticeCount(
-    practiceFetcher
-  );
+  // const { practiceCount, isLoading: isLoadingPractices } = usePracticeCount(
+  //   practiceFetcher
+  // );
 
   const categoryFetcher = useCallback(() => {
     const filter: CategoryFilter = {
@@ -239,18 +240,36 @@ export function Dashboard() {
                   }}
                 />
               </GridItem>
+              {/* <GridItem sm={12} xl={12} xl2={6}>
+                {withArtifacts(
+                  DwLastWeeklyReport2,
+                  () =>
+                    artifactService.getArtifacts({
+                      page: 1,
+                      perPage: 5,
+                      type: 'weeklyReport',
+                      startDate: dateFilter?.startDate,
+                      endDate: dateFilter?.endDate,
+                      regions: selectedRegions,
+                      sortOrder: 'DESC',
+                      sortFields: 'updated',
+                    }),
+
+                  engagementService.getEngagementById
+                )}
+              </GridItem> */}
               <GridItem colSpan={1} sm={12} md={6} xl={6} xl2={6}>
                 <DashboardPeopleEnabledCard
                   usersEnabled={enabledUsers}
                   isLoading={isLoadingEnabledUsers}
                 />
               </GridItem>
-              <GridItem colSpan={1} sm={12} md={6} xl={6} xl2={6}>
+              {/* <GridItem colSpan={1} sm={12} md={6} xl={6} xl2={6}>
                 <DwTopPractices
                   practices={practiceCount}
                   isLoading={isLoadingPractices}
                 />
-              </GridItem>
+              </GridItem> */}
               <GridItem colSpan={1} sm={12} md={6} xl={6} xl2={6}>
                 <DwTopTags
                   categories={categories}

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ export class Apiv1PracticeCountService implements PracticeCountService {`
`37`	`37`	`}`
`38`	`38`	`async getPracticeCount(filter?: PracticeCountFilter): Promise<PracticeCount[]> {`
`39`	`39`	`const { data } = await this.axios.get(`
`40`		- `https://word-analyzer-engagements-dev.apps.hivec.sandbox1405.opentlc.com/aggregate-for-engagement?uuid=999`
	`40`	+ `https://word-analyzer-engagements-dev.apps.openshift-4813-7bsw4.do500.redhatlabs.dev/aggregate-for-engagement?uuid=999`
`41`	`41`	`);`
`42`	`42`
`43`	`43`	`let sorted = data.data.slice().sort((a, b) => b.value - a.value).splice(1, 5).reverse();`