refactor: rename profile journal page (#654)

* fix(web-ui): fix typo * refactor(web-ui): rename page
johanbook · Dec 4, 2023 · dc8d964 · dc8d964
1 parent 34098d1
commit dc8d964
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/services/web-ui/src/Router.tsx b/services/web-ui/src/Router.tsx
@@ -11,10 +11,10 @@ import { ConnectionsPage } from "src/pages/ConnectionsPage";
 import { CreateOrganizationPage } from "src/pages/CreateOrganizationPage";
 import { CurrentOrganizationPage } from "src/pages/CurrentOrganizationPage";
 import { CurrentProfilePage } from "src/pages/CurrentProfilePage";
-import { JournalPage } from "src/pages/JournalPage";
 import { NotFoundPage } from "src/pages/NotFoundPage";
 import { OrganizationListPage } from "src/pages/OrganizationListPage";
 import { ProfileGuard } from "src/pages/ProfileGuard";
+import { ProfileJournalPage } from "src/pages/ProfileJournalPage";
 import { ProfilePage } from "src/pages/ProfilePage";
 import { SettingsPage } from "src/pages/SettingsPage";
 import { LoadingView } from "src/views/LoadingView";
@@ -67,7 +67,7 @@ const router = createBrowserRouter([
       },
       {
         path: "/profile/journal",
-        element: <JournalPage />,
+        element: <ProfileJournalPage />,
       },
       {
         path: "/profile/:id",

diff --git a/services/web-ui/src/pages/JournalPage/index.ts b/services/web-ui/src/pages/JournalPage/index.ts
diff --git a/...ges/JournalPage/JournalPage.component.tsx → ...rnalPage/ProfileJournalPage.component.tsx b/...ges/JournalPage/JournalPage.component.tsx → ...rnalPage/ProfileJournalPage.component.tsx
@@ -13,22 +13,22 @@ const columns: Column<JournalEntryDetails>[] = [
     width: 400,
   },
   {
-    field: "created",
+    field: "createdAt",
     headerName: "Date",
     valueGetter: (params) => params.value.toLocaleString(),
     width: 400,
   },
 ];
 
-interface JournalPageComponentProps {
+interface ProfileJournalPageComponentProps {
   data: JournalEntryDetails[];
   loading?: boolean;
 }
 
-export function JournalPageComponent({
+export function ProfileJournalPageComponent({
   data,
   loading,
-}: JournalPageComponentProps): ReactElement {
+}: ProfileJournalPageComponentProps): ReactElement {
   return (
     <Table
       columns={columns}

diff --git a/...ges/JournalPage/JournalPage.container.tsx → ...rnalPage/ProfileJournalPage.container.tsx b/...ges/JournalPage/JournalPage.container.tsx → ...rnalPage/ProfileJournalPage.container.tsx
@@ -7,10 +7,10 @@ import { ErrorMessage } from "src/components/ui/ErrorMessage";
 import { CacheKeysConstants, useQuery } from "src/core/query";
 import { getDateDaysAgo } from "src/utils/time";
 
-import { JournalPageComponent } from "./JournalPage.component";
-import { JournalPageNav } from "./JournalPage.nav";
+import { ProfileJournalPageComponent } from "./ProfileJournalPage.component";
+import { ProfileJournalPageNav } from "./ProfileJournalPage.nav";
 
-export function JournalPageContainer(): React.ReactElement {
+export function ProfileJournalPageContainer(): React.ReactElement {
   const [dateRange, setDateRange] = useState({
     to: new Date(),
     from: getDateDaysAgo(2),
@@ -23,35 +23,35 @@ export function JournalPageContainer(): React.ReactElement {
 
   if (error) {
     return (
-      <JournalPageNav onDateChange={setDateRange} values={dateRange}>
+      <ProfileJournalPageNav onDateChange={setDateRange} values={dateRange}>
         <ErrorMessage error={error} />
-      </JournalPageNav>
+      </ProfileJournalPageNav>
     );
   }
 
   if (isLoading) {
     return (
-      <JournalPageNav onDateChange={setDateRange} values={dateRange}>
+      <ProfileJournalPageNav onDateChange={setDateRange} values={dateRange}>
         <Box sx={{ marginTop: 2 }}>
-          <JournalPageComponent data={[]} loading />
+          <ProfileJournalPageComponent data={[]} loading />
         </Box>
-      </JournalPageNav>
+      </ProfileJournalPageNav>
     );
   }
 
   if (!data) {
     return (
-      <JournalPageNav onDateChange={setDateRange} values={dateRange}>
+      <ProfileJournalPageNav onDateChange={setDateRange} values={dateRange}>
         <Typography>No entries found in journal</Typography>
-      </JournalPageNav>
+      </ProfileJournalPageNav>
     );
   }
 
   return (
-    <JournalPageNav onDateChange={setDateRange} values={dateRange}>
+    <ProfileJournalPageNav onDateChange={setDateRange} values={dateRange}>
       <Box sx={{ marginTop: 2 }}>
-        <JournalPageComponent data={data.entries} />
+        <ProfileJournalPageComponent data={data.entries} />
       </Box>
-    </JournalPageNav>
+    </ProfileJournalPageNav>
   );
 }
diff --git a/...src/pages/JournalPage/JournalPage.nav.tsx → ...ileJournalPage/ProfileJournalPage.nav.tsx b/...src/pages/JournalPage/JournalPage.nav.tsx → ...ileJournalPage/ProfileJournalPage.nav.tsx
@@ -11,17 +11,17 @@ export interface DateRange {
   to: Date;
 }
 
-interface JournalPageNavProps {
+interface ProfileJournalPageNavProps {
   children: ReactNode;
   onDateChange: (value: DateRange) => void;
   values: DateRange;
 }
 
-export function JournalPageNav({
+export function ProfileJournalPageNav({
   children,
   onDateChange,
   values,
-}: JournalPageNavProps): ReactElement {
+}: ProfileJournalPageNavProps): ReactElement {
   const { t } = useTranslation("journal");
 
   return (

diff --git a/...pages/JournalPage/JournalPage.stories.tsx → ...ournalPage/ProfileJournalPage.stories.tsx b/...pages/JournalPage/JournalPage.stories.tsx → ...ournalPage/ProfileJournalPage.stories.tsx
@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from "@storybook/react";
 
 import { JournalEntryDetails } from "src/api";
 
-import { JournalPageComponent } from "./JournalPage.component";
+import { ProfileJournalPageComponent } from "./ProfileJournalPage.component";
 
 const JOURNAL_ENTRIES: JournalEntryDetails[] = [
   {
@@ -27,10 +27,10 @@ const JOURNAL_ENTRIES: JournalEntryDetails[] = [
 
 export default {
   title: "Pages/Journal/View",
-  component: JournalPageComponent,
+  component: ProfileJournalPageComponent,
 } as Meta;
 
-type Story = StoryObj<typeof JournalPageComponent>;
+type Story = StoryObj<typeof ProfileJournalPageComponent>;
 
 export const Default: Story = {
   args: {

diff --git a/services/web-ui/src/pages/ProfileJournalPage/index.ts b/services/web-ui/src/pages/ProfileJournalPage/index.ts
@@ -0,0 +1 @@
+export { ProfileJournalPageContainer as ProfileJournalPage } from "./ProfileJournalPage.container";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export { ProfileJournalPageContainer as ProfileJournalPage } from "./ProfileJournalPage.container";