Merge pull request #498 from alleslabs/fix/schema-tab-and-url

fix: automatically switch to schema tab and show 404 not found error
alleslabs · Aug 25, 2023 · 2018c76 · 2018c76
2 parents 800f39d + 5c9491b
commit 2018c76
Show file tree

Hide file tree

Showing 6 changed files with 243 additions and 223 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -62,6 +62,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Improvements
 
+- [#498](https://github.com/alleslabs/celatone-frontend/pull/498) Automatically switch to schema tab and show 404 not found error
 - [#491](https://github.com/alleslabs/celatone-frontend/pull/491) Improve scrolling into view by delaying scroll function
 - [#489](https://github.com/alleslabs/celatone-frontend/pull/489) Improve jsonschema query response UI and fix jsonschema incorrect oneOf behavior
 - [#484](https://github.com/alleslabs/celatone-frontend/pull/484) Fix text size consistency in txs message

diff --git a/src/lib/components/json-schema/UploadTemplate.tsx b/src/lib/components/json-schema/UploadTemplate.tsx
@@ -204,7 +204,8 @@ export const UploadTemplate = ({
           return dispatchJsonState({
             type: ActionType.SET_ERROR,
             method,
-            error: response.statusText,
+            error:
+              response.status === 404 ? "404 Not Found" : response.statusText,
           });
         }
         schemaString = JSON.stringify(await response.json());

diff --git a/src/lib/components/json-schema/section/SchemaInputSection.tsx b/src/lib/components/json-schema/section/SchemaInputSection.tsx
@@ -7,12 +7,14 @@ import { AttachSchemaCard } from "../AttachSchemaCard";
 import { JsonSchemaForm } from "../form";
 import { JsonSchemaDrawer } from "../JsonSchemaDrawer";
 import { ViewSchemaButton } from "../ViewSchemaButton";
-import { useSchemaStore } from "lib/providers/store";
+import type { CodeSchema } from "lib/stores/schema";
+import type { Option } from "lib/types";
 
 interface SchemaSectionProps {
   type: "migrate" | "instantiate";
   codeHash: string;
   codeId: string;
+  jsonSchema: Option<CodeSchema>;
   initialFormData?: Record<string, unknown>;
   setSchemaInput: (input: string) => void;
 }
@@ -22,11 +24,10 @@ export const SchemaInputSection = observer(
     type,
     codeHash,
     codeId,
+    jsonSchema,
     initialFormData,
     setSchemaInput,
   }: SchemaSectionProps) => {
-    const { getSchemaByCodeHash } = useSchemaStore();
-    const jsonSchema = getSchemaByCodeHash(codeHash);
     const { isOpen, onClose, onOpen } = useDisclosure();
     const prettyType = capitalize(type);
 

diff --git a/src/lib/pages/home/components/DevShortcut.tsx b/src/lib/pages/home/components/DevShortcut.tsx
@@ -29,7 +29,7 @@ const shortcutList: ShortcutMetadata[] = [
   {
     title: "Deploy",
     subtitle: "Upload code or instantiate contract",
-    slug: "/deploy",
+    slug: "deploy",
     icon: "add-new",
   },
   {

diff --git a/src/lib/pages/instantiate/instantiate.tsx b/src/lib/pages/instantiate/instantiate.tsx
@@ -37,6 +37,7 @@ import JsonInput from "lib/components/json/JsonInput";
 import { CodeSelectSection } from "lib/components/select-code";
 import { Stepper } from "lib/components/stepper";
 import WasmPageContainer from "lib/components/WasmPageContainer";
+import { useSchemaStore } from "lib/providers/store";
 import { useTxBroadcast } from "lib/providers/tx-broadcast";
 import {
   AmpEvent,
@@ -91,7 +92,7 @@ const Instantiate = ({ onComplete }: InstantiatePageProps) => {
   const { broadcast } = useTxBroadcast();
   const { validateUserAddress, validateContractAddress } = useValidateAddress();
   const getAttachFunds = useAttachFunds();
-
+  const { getSchemaByCodeHash } = useSchemaStore();
   // ------------------------------------------//
   // ------------------STATES------------------//
   // ------------------------------------------//
@@ -139,6 +140,7 @@ const Instantiate = ({ onComplete }: InstantiatePageProps) => {
   });
   const { assetsSelect, assetsJsonStr, attachFundsOption } = watchAssets();
 
+  const jsonSchema = getSchemaByCodeHash(codeHash);
   const funds = getAttachFunds(attachFundsOption, assetsJsonStr, assetsSelect);
   const enableInstantiate = useMemo(
     () =>
@@ -234,6 +236,7 @@ const Instantiate = ({ onComplete }: InstantiatePageProps) => {
   useEffect(() => {
     setValue("codeHash", "");
     setTab(MessageTabs.JSON_INPUT);
+    setValue(`msgInput.${yourSchemaInputFormKey}`, "{}");
     if (codeId.length) {
       setStatus({ state: "loading" });
       const timer = setTimeout(() => {
@@ -307,6 +310,10 @@ const Instantiate = ({ onComplete }: InstantiatePageProps) => {
     }
   }, [codeIdQuery, msgQuery, setAssets, setValue]);
 
+  useEffect(() => {
+    if (jsonSchema) setTab(MessageTabs.YOUR_SCHEMA);
+  }, [jsonSchema]);
+
   useEffect(() => {
     if (router.isReady) AmpTrackToInstantiate(!!msgQuery, !!codeIdQuery);
   }, [router.isReady, msgQuery, codeIdQuery]);
@@ -400,6 +407,7 @@ const Instantiate = ({ onComplete }: InstantiatePageProps) => {
                 type="instantiate"
                 codeHash={codeHash}
                 codeId={codeId}
+                jsonSchema={jsonSchema}
                 setSchemaInput={(msg: string) =>
                   setValue(`msgInput.${yourSchemaInputFormKey}`, msg)
                 }