Skip to content

Commit 8cb6668

Browse files
committed
Merge branch 'google-docs-document-outline' into feat/cell-level-mappings
2 parents dc485fe + 72ee8de commit 8cb6668

19 files changed

Lines changed: 506 additions & 590 deletions

File tree

apps/google-docs/src/fixtures/googleDocsReview/fixture-loader.ts

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import {
2-
type ReviewAsset,
3-
type ReviewEntryBlockGraph,
4-
type ReviewNormalizedDocument,
5-
type GoogleDocsReviewData,
6-
} from './types';
1+
import type {
2+
AssetToCreate,
3+
EntryBlockGraph,
4+
GoogleDocsPreviewData,
5+
NormalizedDocument,
6+
WorkflowContentType,
7+
} from '@types';
78

89
const FIXTURE_LOG_PREFIX = '[google-docs][fixture]';
910

@@ -16,15 +17,15 @@ function isRecord(value: unknown): value is Record<string, unknown> {
1617
return typeof value === 'object' && value !== null && !Array.isArray(value);
1718
}
1819

19-
function isNormalizedDocumentLike(value: unknown): value is ReviewNormalizedDocument {
20+
function isNormalizedDocumentLike(value: unknown): value is NormalizedDocument {
2021
return isRecord(value) && Array.isArray(value.contentBlocks) && Array.isArray(value.tables);
2122
}
2223

23-
function isEntryBlockGraphLike(value: unknown): value is ReviewEntryBlockGraph {
24+
function isEntryBlockGraphLike(value: unknown): value is EntryBlockGraph {
2425
return isRecord(value) && Array.isArray(value.entries) && Array.isArray(value.excludedSourceRefs);
2526
}
2627

27-
function hasReviewFixtureShape(value: unknown): value is GoogleDocsReviewData {
28+
function hasReviewFixtureShape(value: unknown): value is GoogleDocsPreviewData {
2829
return (
2930
isRecord(value) &&
3031
Array.isArray(value.entries) &&
@@ -36,12 +37,12 @@ function hasReviewFixtureShape(value: unknown): value is GoogleDocsReviewData {
3637
}
3738

3839
function hasNormalizedDocumentPayloadShape(value: unknown): value is {
39-
normalizedDocument: ReviewNormalizedDocument;
40-
entryBlockGraph: ReviewEntryBlockGraph;
41-
contentTypes?: Array<Record<string, unknown>>;
42-
assets?: ReviewAsset[];
43-
cmaAssets?: ReviewAsset[];
44-
referenceGraph?: GoogleDocsReviewData['referenceGraph'];
40+
normalizedDocument: NormalizedDocument;
41+
entryBlockGraph: EntryBlockGraph;
42+
contentTypes?: WorkflowContentType[];
43+
assets?: AssetToCreate[];
44+
cmaAssets?: AssetToCreate[];
45+
referenceGraph?: GoogleDocsPreviewData['referenceGraph'];
4546
} {
4647
return (
4748
isRecord(value) &&
@@ -51,9 +52,9 @@ function hasNormalizedDocumentPayloadShape(value: unknown): value is {
5152
}
5253

5354
function buildEntriesFromEntryBlockGraph(
54-
entryBlockGraph: ReviewEntryBlockGraph,
55-
contentTypes: Array<Record<string, unknown>> = []
56-
): GoogleDocsReviewData['entries'] {
55+
entryBlockGraph: EntryBlockGraph,
56+
contentTypes: WorkflowContentType[] = []
57+
): GoogleDocsPreviewData['entries'] {
5758
const contentTypeNameById = new Map<string, string>();
5859

5960
contentTypes.forEach((contentType) => {
@@ -80,7 +81,7 @@ function buildEntriesFromEntryBlockGraph(
8081
}));
8182
}
8283

83-
export function coerceGoogleDocsReviewData(value: unknown): GoogleDocsReviewData | null {
84+
export function coerceGoogleDocsReviewData(value: unknown): GoogleDocsPreviewData | null {
8485
if (hasReviewFixtureShape(value)) {
8586
return value;
8687
}
@@ -105,7 +106,7 @@ export function coerceGoogleDocsReviewData(value: unknown): GoogleDocsReviewData
105106
return null;
106107
}
107108

108-
export const loadGoogleDocsReviewData = (): GoogleDocsReviewData | null => {
109+
export const loadGoogleDocsReviewData = (): GoogleDocsPreviewData | null => {
109110
const availableFixtureFiles = Object.keys(fixtureModules)
110111
.map((path) => path.replace('./', ''))
111112
.sort();
Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1 @@
11
export { loadGoogleDocsReviewData } from './fixture-loader';
2-
export type {
3-
GoogleDocsReviewData,
4-
ReviewContentBlock,
5-
ReviewTextRun,
6-
ReviewTable,
7-
ReviewUsageItem,
8-
ReviewFieldMapping,
9-
ReviewSourceRef,
10-
ReviewTablePart,
11-
ReviewEntryBlockGraph,
12-
} from './types';

apps/google-docs/src/fixtures/googleDocsReview/types.ts

Lines changed: 0 additions & 191 deletions
This file was deleted.

apps/google-docs/src/locations/Page/Page.tsx

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,12 @@ const Page = () => {
7171
return (
7272
<>
7373
<Layout withBoxShadow={true} offsetTop={10}>
74-
{previewPayload || mappingReviewPayload || isMappingPrototypeVisible ? (
75-
isMappingPrototypeVisible ? (
76-
<PreviewPageView mode="fixture" onCancel={handlePreviewCancel} sdk={sdk} />
77-
) : mappingReviewPayload ? (
78-
<PreviewPageView
79-
mode="mappingReview"
80-
payload={mappingReviewPayload}
81-
onCancel={handlePreviewCancel}
82-
onContinue={handleMappingReviewContinue}
83-
sdk={sdk}
84-
/>
85-
) : (
86-
<PreviewPageView
87-
mode="workflow"
88-
payload={previewPayload!}
89-
onCancel={handlePreviewCancel}
90-
sdk={sdk}
91-
/>
92-
)
74+
{previewPayload ? (
75+
<PreviewPageView
76+
payload={previewPayload}
77+
oauthToken={oauthToken}
78+
onLeavePreview={handleReturnToMainPage}
79+
/>
9380
) : (
9481
<MainPageView
9582
oauthToken={oauthToken}

apps/google-docs/src/locations/Page/components/mainpage/MainPageView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export const MainPageView = ({
6060
<Flex flexDirection="column" alignItems="flex-start">
6161
<Heading marginBottom="spacingS">Select your file</Heading>
6262
<Paragraph>
63-
Create entries using existing content types from a Drive Integration file.
63+
Create entries using existing content types from a Google Drive file.
6464
<br />
6565
Get started by selecting the file you would like to use.
6666
</Paragraph>

0 commit comments

Comments
 (0)