Skip to content

Commit 448acfc

Browse files
authored
fix: issue 80 (#95)
* fix: issue 80 * fix: github workflows
1 parent 7a31658 commit 448acfc

File tree

4 files changed

+26
-24
lines changed

4 files changed

+26
-24
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,5 @@ jobs:
6969
ACM_TEREZA_APP: ${{ secrets.ACM_TEREZA_APP }}
7070
ACM_TEREZA_TECH: ${{ secrets.ACM_TEREZA_TECH }}
7171
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
72-
TURBO_TEAM: TURBO_TEAM
72+
TURBO_TEAM: ${{ vars.TURBO_TEAM }}
7373
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}

.github/workflows/pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,5 @@ jobs:
6868
run: sh -e ./.cicd/commands/pr.sh
6969
env:
7070
CARLIN_BRANCH: ${{ github.event.pull_request.head.ref }}
71-
TURBO_TEAM: TURBO_TEAM
71+
TURBO_TEAM: ${{ vars.TURBO_TEAM }}
7272
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}

apps/tereza/src/app/my/journal/JournalSummary.tsx

+8-14
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ import { Flex } from '@ttoss/ui';
44
import { JournalMarkdown } from 'src/modules/Journal/JournalMarkdown';
55
import { JournalSummary_journalSummaryItem$key } from './__generated__/JournalSummary_journalSummaryItem.graphql';
66
import {
7-
type SerializablePreloadedQuery,
8-
useSerializablePreloadedQuery,
9-
} from 'src/relay/useSerializablePreloadedQuery';
10-
import { graphql, useFragment, usePreloadedQuery } from 'react-relay';
11-
import JournalSummaryQueryNode, {
12-
JournalSummaryQuery,
13-
} from './__generated__/JournalSummaryQuery.graphql';
7+
type PreloadedQuery,
8+
graphql,
9+
useFragment,
10+
usePreloadedQuery,
11+
} from 'react-relay';
12+
import type { JournalSummaryQuery } from './__generated__/JournalSummaryQuery.graphql';
1413

1514
const JournalSummaryItem = ({
1615
journalSummaryItemRef,
@@ -40,13 +39,8 @@ const JournalSummaryItem = ({
4039
export const JournalSummary = ({
4140
preloadedQuery,
4241
}: {
43-
preloadedQuery: SerializablePreloadedQuery<
44-
typeof JournalSummaryQueryNode,
45-
JournalSummaryQuery
46-
>;
42+
preloadedQuery: PreloadedQuery<JournalSummaryQuery>;
4743
}) => {
48-
const queryRef = useSerializablePreloadedQuery(preloadedQuery);
49-
5044
const { journal } = usePreloadedQuery(
5145
graphql`
5246
query JournalSummaryQuery($date: String!) {
@@ -58,7 +52,7 @@ export const JournalSummary = ({
5852
}
5953
}
6054
`,
61-
queryRef
55+
preloadedQuery
6256
);
6357

6458
if (!journal) {

apps/tereza/src/app/my/journal/page.tsx

+16-8
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,25 @@
1+
'use client';
2+
3+
import * as React from 'react';
14
import { JournalSummary } from './JournalSummary';
25
import { getToday } from 'src/modules/Date/getToday';
3-
import { loadSerializableQuery } from 'src/relay/loadSerializableQuery';
6+
import { useQueryLoader } from 'react-relay';
47
import JournalSummaryQueryNode, {
58
JournalSummaryQuery,
69
} from './__generated__/JournalSummaryQuery.graphql';
710

8-
const JournalSummaryPage = async () => {
9-
const preloadedQuery = await loadSerializableQuery<
10-
typeof JournalSummaryQueryNode,
11-
JournalSummaryQuery
12-
>(JournalSummaryQueryNode.params, {
13-
date: getToday(),
14-
});
11+
const JournalSummaryPage = () => {
12+
const [preloadedQuery, loadQuery] = useQueryLoader<JournalSummaryQuery>(
13+
JournalSummaryQueryNode
14+
);
15+
16+
React.useEffect(() => {
17+
loadQuery({ date: getToday() });
18+
}, [loadQuery]);
19+
20+
if (!preloadedQuery) {
21+
return null;
22+
}
1523

1624
return <JournalSummary preloadedQuery={preloadedQuery} />;
1725
};

0 commit comments

Comments
 (0)