fixed import

Author: whkelvin

src/routes/(app)/app/+page.svelte

@@ -77,6 +77,10 @@
 		isContentLoading = false;
 	}
 
+	async function onImportSpec(service: yizySpec.Service) {
+		doc = yizySpecToDoc(service as yizySpec.Service);
+	}
+
 	async function createSpecDialogSaveBtnClicked() {
 		if (data.authState) {
 			const res = await yizy.createSpec(
@@ -205,7 +209,7 @@
 					<Tabs.Trigger value="code-gen">Generate Code</Tabs.Trigger>
 				</Tabs.List>
 				<Tabs.Content value="api-spec">
-					<SpecTab bind:doc onGenerateBtnClicked={updateSpecBtnClicked}></SpecTab>
+					<SpecTab bind:doc onGenerateBtnClicked={updateSpecBtnClicked} {onImportSpec}></SpecTab>
 				</Tabs.Content>
 				<Tabs.Content value="code-gen">
 					<CodeTab bind:doc version={selectedSpecDetails?.version ?? undefined} />

src/routes/(app)/app/components/ImportSpecDialog.svelte

@@ -4,6 +4,9 @@
 	import { Button } from '$lib/components/ui/button/index.js';
 	import { Label } from '$lib/components/ui/label';
 	import { importService } from '$lib/state';
+	import * as yizy from '@yizy/spec';
+
+	let { onImport }: { onImport: (service: yizy.Service) => void } = $props();
 
 	let isDialogOpen = $state(false);
 
@@ -19,7 +22,8 @@
 
 	function onUploadClicked() {
 		try {
-			importService(jsonInput);
+			const service: yizy.Service = JSON.parse(jsonInput);
+			onImport(service);
 			importError = '';
 			close();
 		} catch (error) {

src/routes/(app)/app/components/SpecTab.svelte

@@ -6,7 +6,8 @@
 	import YizyEditor from '$lib/components/ui/editor/YizyEditor.svelte';
 	import Button from '$lib/components/ui/button/button.svelte';
 	import { EllipsisVertical, LoaderCircle } from 'lucide-svelte';
-	import { type Document } from '$lib/components/ui/editor/models/models';
+	import { yizySpecToDoc, type Document } from '$lib/components/ui/editor/models/models';
+	import * as yizy from '@yizy/spec';
 
 	let importDialog: ReturnType<typeof ImportSpecDialog>;
 	let exportDialog: ReturnType<typeof ExportSpecDialog>;
@@ -17,14 +18,24 @@
 
 	let {
 		doc = $bindable(),
-		onGenerateBtnClicked
-	}: { doc: Document; onGenerateBtnClicked: (content: string) => Promise<void> } = $props();
+		onGenerateBtnClicked,
+		onImportSpec
+	}: {
+		doc: Document;
+		onGenerateBtnClicked: (content: string) => Promise<void>;
+		onImportSpec: (service: yizy.Service) => void;
+	} = $props();
 
 	async function onSaveAndGenerateClicked() {
 		isSaving = true;
 		await onGenerateBtnClicked(JSON.stringify(editor.toYizySpec()));
 		isSaving = false;
 	}
+
+	function onImportSpecBtnClicked(service: yizy.Service) {
+		onImportSpec(service);
+		editor.updateDoc(yizySpecToDoc(service));
+	}
 </script>
 
 <Card.Root class="border-none">
@@ -77,5 +88,5 @@
 		<YizyEditor bind:this={editor} bind:doc />
 	</Card.Content>
 </Card.Root>
-<ImportSpecDialog bind:this={importDialog} />
+<ImportSpecDialog bind:this={importDialog} onImport={onImportSpecBtnClicked} />
 <ExportSpecDialog bind:this={exportDialog} bind:doc />

src/routes/api/auth/loginWithGoogle/callback/+server.ts

@@ -41,7 +41,6 @@ export async function GET(event: RequestEvent): Promise<Response> {
   const username: string = claims.name ?? "";
   const email: string | null = claims.email ?? null;
 
-  console.log(claims);
   if (!googleUserId || !email) {
     return new Response(null, {
       status: 400,