fix: revert overview section changes

Author: harikakondur

apps/google-docs/src/locations/Page/components/overview/OverviewSection.tsx

@@ -15,13 +15,13 @@ import type { EntryProps } from 'contentful-management';
 import { SummaryModal } from '../modals/SummaryModal';
 import { isPreviewPayload } from '../../../../utils/utils';
 
-type OverviewSectionProps = {
+interface OverviewSectionProps {
   sdk: PageAppSDK;
   payload: PreviewPayload | MappingReviewSuspendPayload;
   oauthToken: string;
   onReturnToMainPage: () => void;
   onCreateSelected?: () => Promise<void>;
-};
+}
 
 const OverviewSection = ({
   sdk,
@@ -168,16 +168,14 @@ const OverviewSection = ({
         )}
       </Flex>
 
-      {sdk ? (
-        <SummaryModal
-          isOpen={summaryEntries !== null}
-          sdk={sdk}
-          entries={summaryEntries ?? []}
-          contentTypeDisplayInfoMap={contentTypeDisplayInfoMap}
-          defaultLocale={sdk.locales.default}
-          onDone={handleSummaryDone}
-        />
-      ) : null}
+      <SummaryModal
+        isOpen={summaryEntries !== null}
+        sdk={sdk}
+        entries={summaryEntries ?? []}
+        contentTypeDisplayInfoMap={contentTypeDisplayInfoMap}
+        defaultLocale={sdk.locales.default}
+        onDone={handleSummaryDone}
+      />
     </Box>
   );
 };

apps/google-docs/src/utils/checkboxEntryList.ts

@@ -1,9 +1,8 @@
-import type { EntryToCreate, MappingReviewSuspendPayload, PreviewPayload } from '@types';
+import type { EntryToCreate, PreviewPayload } from '@types';
 import { collectReferencedTempIdsFromEntry } from '../services/referenceResolution';
 import { type ContentTypeDisplayInfo } from '../services/contentTypeService';
 import { orderEntriesByCreationOrder } from './previewPayload';
 import { getEntryDisplayTitle } from './getEntryDisplayTitle';
-import { isPreviewPayload } from './utils';
 
 export interface CheckboxEntryListRow {
   id: string;
@@ -15,12 +14,6 @@ export interface CheckboxEntryListRow {
 
 export type ContentTypeDisplayInfoMap = ReadonlyMap<string, ContentTypeDisplayInfo>;
 
-interface OverviewSourceEntry {
-  tempId: string;
-  contentTypeName: string;
-  entryTitle?: string;
-}
-
 interface OrderedEntriesContext {
   entries: EntryToCreate[];
   entriesByTempId: Map<string, EntryToCreate>;
@@ -34,17 +27,6 @@ interface TreeBuildContext {
   defaultLocale?: string;
 }
 
-interface OverviewSourceTreeBuildContext {
-  orderedEntriesContext: OrderedOverviewSourceEntriesContext;
-  childTempIdsByParentTempId: Map<string, string[]>;
-}
-
-interface OrderedOverviewSourceEntriesContext {
-  entries: OverviewSourceEntry[];
-  entriesByTempId: Map<string, OverviewSourceEntry>;
-  orderedIndexByTempId: Map<string, number>;
-}
-
 function resolveContentTypeLabel(
   contentTypeId: string,
   contentTypeDisplayInfoMap?: ContentTypeDisplayInfoMap
@@ -119,24 +101,6 @@ function buildOrderedEntriesContext(orderedEntries: EntryToCreate[]): OrderedEnt
   };
 }
 
-function buildOrderedOverviewSourceEntriesContext(
-  orderedEntries: OverviewSourceEntry[]
-): OrderedOverviewSourceEntriesContext {
-  const entriesByTempId = new Map<string, OverviewSourceEntry>();
-  const orderedIndexByTempId = new Map<string, number>();
-
-  orderedEntries.forEach((entry, index) => {
-    entriesByTempId.set(entry.tempId, entry);
-    orderedIndexByTempId.set(entry.tempId, index);
-  });
-
-  return {
-    entries: orderedEntries,
-    entriesByTempId,
-    orderedIndexByTempId,
-  };
-}
-
 function collectChildTempIds(childTempIdsByParentTempId: Map<string, string[]>): Set<string> {
   return new Set([...childTempIdsByParentTempId.values()].flat());
 }
@@ -163,35 +127,6 @@ function buildRowTreeForTempId(
   );
 }
 
-function buildOverviewRow(
-  entry: OverviewSourceEntry,
-  entryIndex: number,
-  children: CheckboxEntryListRow[]
-) {
-  return {
-    id: entry.tempId,
-    entryIndex,
-    contentTypeName: entry.contentTypeName,
-    entryTitle: entry.entryTitle,
-    children,
-  };
-}
-
-function buildOverviewRowTreeForTempId(
-  tempId: string,
-  context: OverviewSourceTreeBuildContext
-): CheckboxEntryListRow | undefined {
-  const entry = context.orderedEntriesContext.entriesByTempId.get(tempId);
-  if (!entry) return undefined;
-
-  const entryIndex = context.orderedEntriesContext.orderedIndexByTempId.get(tempId) ?? -1;
-  const childRows = (context.childTempIdsByParentTempId.get(tempId) ?? [])
-    .map((childTempId) => buildOverviewRowTreeForTempId(childTempId, context))
-    .filter((row): row is CheckboxEntryListRow => row !== undefined);
-
-  return buildOverviewRow(entry, entryIndex, childRows);
-}
-
 function buildTreeRootRows(
   context: TreeBuildContext,
   childTempIds: Set<string>
@@ -209,22 +144,6 @@ function buildTreeRootRows(
   return roots;
 }
 
-function buildOverviewTreeRootRows(
-  context: OverviewSourceTreeBuildContext,
-  childTempIds: Set<string>
-): CheckboxEntryListRow[] {
-  const roots: CheckboxEntryListRow[] = [];
-
-  for (const entry of context.orderedEntriesContext.entries) {
-    if (childTempIds.has(entry.tempId)) continue;
-
-    const row = buildOverviewRowTreeForTempId(entry.tempId, context);
-    if (row) roots.push(row);
-  }
-
-  return roots;
-}
-
 function buildFlatRows(
   orderedEntries: EntryToCreate[],
   contentTypeDisplayInfoMap?: ContentTypeDisplayInfoMap,
@@ -238,95 +157,12 @@ function buildFlatRows(
   return rows;
 }
 
-function buildFlatOverviewRows(orderedEntries: OverviewSourceEntry[]): CheckboxEntryListRow[] {
-  return orderedEntries.map((entry, index) => buildOverviewRow(entry, index, []));
-}
-
-function orderMappingReviewEntriesByCreationOrder(
-  entries: MappingReviewSuspendPayload['entryBlockGraph']['entries'],
-  creationOrder: string[] | undefined
-): MappingReviewSuspendPayload['entryBlockGraph']['entries'] {
-  if (!creationOrder || creationOrder.length === 0) {
-    return entries;
-  }
-
-  const byTempId = new Map<
-    string,
-    MappingReviewSuspendPayload['entryBlockGraph']['entries'][number]
-  >();
-  for (const entry of entries) {
-    if (entry.tempId) {
-      byTempId.set(entry.tempId, entry);
-    }
-  }
-
-  const ordered: MappingReviewSuspendPayload['entryBlockGraph']['entries'] = [];
-  const placed = new Set<string>();
-
-  for (const tempId of creationOrder) {
-    if (placed.has(tempId)) continue;
-    const entry = byTempId.get(tempId);
-    if (entry) {
-      ordered.push(entry);
-      placed.add(tempId);
-    }
-  }
-
-  for (const entry of entries) {
-    if (!entry.tempId || !placed.has(entry.tempId)) {
-      ordered.push(entry);
-      if (entry.tempId) {
-        placed.add(entry.tempId);
-      }
-    }
-  }
-
-  return ordered;
-}
-
-function buildChildTempIdsByParentTempIdFromReferenceGraph(
-  orderedEntriesContext: OrderedOverviewSourceEntriesContext,
-  referenceGraph: MappingReviewSuspendPayload['referenceGraph']
-): Map<string, string[]> {
-  const childTempIdsByParentTempId = new Map<string, string[]>();
-  const assignedChildIds = new Set<string>();
-  const childTempIdsByParent = new Map<string, string[]>();
-
-  for (const edge of referenceGraph.edges ?? []) {
-    if (typeof edge.from !== 'string' || typeof edge.to !== 'string') {
-      continue;
-    }
-
-    const existing = childTempIdsByParent.get(edge.from) ?? [];
-    existing.push(edge.to);
-    childTempIdsByParent.set(edge.from, existing);
-  }
-
-  for (const entry of orderedEntriesContext.entries) {
-    const referencedTempIds = childTempIdsByParent.get(entry.tempId) ?? [];
-
-    for (const referencedTempId of referencedTempIds) {
-      if (referencedTempId === entry.tempId) continue;
-      if (!orderedEntriesContext.entriesByTempId.has(referencedTempId)) continue;
-      if (assignedChildIds.has(referencedTempId)) continue;
-
-      assignedChildIds.add(referencedTempId);
-      const childTempIds = childTempIdsByParentTempId.get(entry.tempId) ?? [];
-      childTempIds.push(referencedTempId);
-      childTempIdsByParentTempId.set(entry.tempId, childTempIds);
-    }
-  }
-
-  return childTempIdsByParentTempId;
-}
-
 export function buildCheckboxEntryList(
   payload: PreviewPayload,
   contentTypeDisplayInfoMap?: ContentTypeDisplayInfoMap,
   defaultLocale?: string
 ): CheckboxEntryListRow[] {
   const { entries, referenceGraph } = payload;
-
   if (entries.length === 0) {
     return [];
   }
@@ -352,57 +188,6 @@ export function buildCheckboxEntryList(
   return roots;
 }
 
-export function buildCheckboxEntryListFromMappingReviewPayload(
-  payload: MappingReviewSuspendPayload
-): CheckboxEntryListRow[] {
-  const orderedGraphEntries = orderMappingReviewEntriesByCreationOrder(
-    payload.entryBlockGraph.entries,
-    payload.referenceGraph.creationOrder
-  );
-
-  const orderedOverviewEntries: OverviewSourceEntry[] = orderedGraphEntries
-    .map((entry) => {
-      const tempId = entry.tempId?.trim();
-      if (!tempId) {
-        return null;
-      }
-
-      const matchingContentType = payload.contentTypes.find(
-        (contentType) => contentType.sys.id === entry.contentTypeId
-      );
-
-      return {
-        tempId,
-        contentTypeName: matchingContentType?.name?.trim() || entry.contentTypeId,
-        entryTitle: tempId,
-      } satisfies OverviewSourceEntry;
-    })
-    .filter((entry): entry is OverviewSourceEntry => entry !== null);
-
-  if (orderedOverviewEntries.length === 0) {
-    return [];
-  }
-
-  const orderedEntriesContext = buildOrderedOverviewSourceEntriesContext(orderedOverviewEntries);
-  const childTempIdsByParentTempId = buildChildTempIdsByParentTempIdFromReferenceGraph(
-    orderedEntriesContext,
-    payload.referenceGraph
-  );
-  const roots = buildOverviewTreeRootRows(
-    {
-      orderedEntriesContext,
-      childTempIdsByParentTempId,
-    },
-    collectChildTempIds(childTempIdsByParentTempId)
-  );
-
-  if (roots.length === 0) {
-    return buildFlatOverviewRows(orderedOverviewEntries);
-  }
-
-  return roots;
-}
-
 export function collectCheckboxEntryListRowIds(rows: CheckboxEntryListRow[]): string[] {
   return rows.flatMap((row) => [row.id, ...collectCheckboxEntryListRowIds(row.children)]);
 }

apps/google-docs/src/utils/previewPayload.ts

@@ -1,6 +1,5 @@
 import type {
   AssetToCreate,
-  EntryBlockGraph,
   EntryToCreate,
   NormalizedDocument,
   PreviewPayload,
@@ -65,23 +64,6 @@ function parseReferenceGraph(raw: unknown): ReviewedReferenceGraph | undefined {
   };
 }
 
-function parseEntryBlockGraph(raw: unknown): EntryBlockGraph | undefined {
-  if (raw === undefined) {
-    return undefined;
-  }
-
-  if (!isRecord(raw)) {
-    throw new Error('entryBlockGraph must be an object when present.');
-  }
-
-  return {
-    entries: Array.isArray(raw.entries) ? (raw.entries as EntryBlockGraph['entries']) : [],
-    excludedSourceRefs: Array.isArray(raw.excludedSourceRefs)
-      ? (raw.excludedSourceRefs as EntryBlockGraph['excludedSourceRefs'])
-      : [],
-  };
-}
-
 /** Order entries by `referenceGraph.creationOrder`, then append any missing entries (original order). */
 export function orderEntriesByCreationOrder(
   entries: EntryToCreate[],
@@ -184,13 +166,11 @@ export function validatePayloadShape(payload: unknown): PreviewPayload {
   const referenceGraph = parseReferenceGraph(payload.referenceGraph);
 
   const normalizedDocument = parseNormalizedDocument(payload.normalizedDocument);
-  const entryBlockGraph = parseEntryBlockGraph(payload.entryBlockGraph);
 
   return {
     entries: payload.entries as EntryToCreate[],
     assets,
     referenceGraph: referenceGraph ?? {},
     normalizedDocument,
-    entryBlockGraph,
   };
 }