display subpages correctly on first load

apps/client/src/features/editor/components/subpages/subpages-view.tsx

@@ -13,14 +13,17 @@ import {
 import { useTranslation } from "react-i18next";
 import { sortPositionKeys } from "@/features/page/tree/utils/utils";
 import { useSharedPageSubpages } from "@/features/share/hooks/use-shared-page-subpages";
+import { extractPageSlugId } from "@/lib";
 
 export default function SubpagesView(props: NodeViewProps) {
   const { editor } = props;
-  const { spaceSlug, shareId } = useParams();
+  const { spaceSlug, shareId, pageSlug } = useParams();
   const { t } = useTranslation();
   
-  //@ts-ignore
+  // @ts-ignore
-  const currentPageId = editor.storage.pageId;
+  const storagePageId = editor.storage.pageId;
+  const routePageId = extractPageSlugId(pageSlug);
+  const currentPageId = storagePageId ?? routePageId;
 
   // Get subpages from shared tree if we're in a shared context
   const sharedSubpages = useSharedPageSubpages(currentPageId);

apps/server/src/integrations/import/utils/import-formatter.ts

@@ -97,15 +97,6 @@ export function xwikiFormatter($: CheerioAPI, $root: Cheerio<any>) {
   }
 }
 
-function isBareLink($el: Cheerio<any>): boolean {
-  const href = $el.attr("href")?.trim();
-  const text = $el.text().trim();
-
-  if(!text || !href) return false
-
-  return text === href;
-}
-
 export function defaultHtmlFormatter($: CheerioAPI, $root: Cheerio<any>) {
   normalizeTableColumnWidths($, $root);
 
@@ -113,9 +104,7 @@ export function defaultHtmlFormatter($: CheerioAPI, $root: Cheerio<any>) {
     const $el = $(el);
     const url = $el.attr('href')!;
     const { provider } = getEmbedUrlAndProvider(url);
-    if (provider === 'iframe' || !isBareLink($el)) {
+    if (provider === 'iframe') return;
-      return;
-    }
 
     const embed = `<div data-type=\"embed\" data-src=\"${url}\" data-provider=\"${provider}\" data-align=\"center\" data-width=\"640\" data-height=\"480\"></div>`;
     $el.replaceWith(embed);