From 2c117044ab17887dd2bec9837629240787e5383c Mon Sep 17 00:00:00 2001 From: highonhopium Date: Sat, 15 Feb 2025 22:40:44 +0000 Subject: [PATCH] updated registry and fixed title on deployment page --- .../src/__tests__/DeploymentSteps.test.ts | 25 +++++++++++++++++++ .../deployment/DeploymentSteps.svelte | 6 +++-- packages/webapp/src/lib/constants.ts | 2 +- .../routes/deploy/[strategyName]/+layout.ts | 13 +++++++--- .../[deploymentKey]/+page.svelte | 3 ++- 5 files changed, 42 insertions(+), 7 deletions(-) diff --git a/packages/ui-components/src/__tests__/DeploymentSteps.test.ts b/packages/ui-components/src/__tests__/DeploymentSteps.test.ts index 6836d4e63..993434cb9 100644 --- a/packages/ui-components/src/__tests__/DeploymentSteps.test.ts +++ b/packages/ui-components/src/__tests__/DeploymentSteps.test.ts @@ -632,6 +632,11 @@ describe('DeploymentSteps', () => { render(DeploymentSteps, { props: { dotrain, + strategyDetail: { + name: 'SFLR<>WFLR on Flare', + description: 'Rotate sFLR (Sceptre staked FLR) and WFLR on Flare.', + short_description: 'Rotate sFLR (Sceptre staked FLR) and WFLR on Flare.' + }, deployment: mockDeployment, wagmiConfig: mockWagmiConfigStore, wagmiConnected: mockConnectedStore, @@ -661,6 +666,11 @@ describe('DeploymentSteps', () => { render(DeploymentSteps, { props: { dotrain, + strategyDetail: { + name: 'SFLR<>WFLR on Flare', + description: 'Rotate sFLR (Sceptre staked FLR) and WFLR on Flare.', + short_description: 'Rotate sFLR (Sceptre staked FLR) and WFLR on Flare.' + }, deployment: mockDeployment, wagmiConfig: mockWagmiConfigStore, wagmiConnected: mockConnectedStore, @@ -690,6 +700,11 @@ describe('DeploymentSteps', () => { render(DeploymentSteps, { props: { dotrain, + strategyDetail: { + name: 'SFLR<>WFLR on Flare', + description: 'Rotate sFLR (Sceptre staked FLR) and WFLR on Flare.', + short_description: 'Rotate sFLR (Sceptre staked FLR) and WFLR on Flare.' + }, deployment: mockDeployment, wagmiConfig: mockWagmiConfigStore, wagmiConnected: mockConnectedStore, @@ -730,6 +745,11 @@ describe('DeploymentSteps', () => { render(DeploymentSteps, { props: { dotrain, + strategyDetail: { + name: 'SFLR<>WFLR on Flare', + description: 'Rotate sFLR (Sceptre staked FLR) and WFLR on Flare.', + short_description: 'Rotate sFLR (Sceptre staked FLR) and WFLR on Flare.' + }, deployment: mockDeployment, wagmiConfig: mockWagmiConfigStore, wagmiConnected: mockConnectedStore, @@ -768,6 +788,11 @@ describe('DeploymentSteps', () => { render(DeploymentSteps, { props: { dotrain, + strategyDetail: { + name: 'SFLR<>WFLR on Flare', + description: 'Rotate sFLR (Sceptre staked FLR) and WFLR on Flare.', + short_description: 'Rotate sFLR (Sceptre staked FLR) and WFLR on Flare.' + }, deployment: mockDeployment, wagmiConfig: mockWagmiConfigStore, wagmiConnected: mockConnectedStore, diff --git a/packages/ui-components/src/lib/components/deployment/DeploymentSteps.svelte b/packages/ui-components/src/lib/components/deployment/DeploymentSteps.svelte index de13b4f6c..9e2a1f910 100644 --- a/packages/ui-components/src/lib/components/deployment/DeploymentSteps.svelte +++ b/packages/ui-components/src/lib/components/deployment/DeploymentSteps.svelte @@ -13,7 +13,8 @@ type GuiFieldDefinition, type GuiDeployment, type OrderIO, - type SelectTokens + type SelectTokens, + type NameAndDescription } from '@rainlanguage/orderbook/js_api'; import { fade } from 'svelte/transition'; import { Button, Toggle, Spinner } from 'flowbite-svelte'; @@ -46,6 +47,7 @@ export let settings: Writable; export let dotrain: string; export let deployment: GuiDeployment; + export let strategyDetail: NameAndDescription; export let handleDeployModal: (args: DeploymentArgs) => void; export let handleDisclaimerModal: (args: Omit, 'open'>) => void; @@ -284,7 +286,7 @@ {#if deployment}

- {deployment.name} + {strategyDetail.name}

{deployment.description} diff --git a/packages/webapp/src/lib/constants.ts b/packages/webapp/src/lib/constants.ts index 87a85bbde..0a1a08635 100644 --- a/packages/webapp/src/lib/constants.ts +++ b/packages/webapp/src/lib/constants.ts @@ -1,2 +1,2 @@ export const REGISTRY_URL = - 'https://raw.githubusercontent.com/rainlanguage/rain.strategies/refs/heads/main/ports/registry'; + 'https://raw.githubusercontent.com/rainlanguage/rain.strategies/78ac82f2a6c74381ef4b79a67784281935c8d840/ports/registry'; diff --git a/packages/webapp/src/routes/deploy/[strategyName]/+layout.ts b/packages/webapp/src/routes/deploy/[strategyName]/+layout.ts index e92072783..74f098bde 100644 --- a/packages/webapp/src/routes/deploy/[strategyName]/+layout.ts +++ b/packages/webapp/src/routes/deploy/[strategyName]/+layout.ts @@ -1,11 +1,12 @@ import type { LayoutLoad } from './$types'; import { redirect } from '@sveltejs/kit'; - +import type { NameAndDescription } from '@rainlanguage/orderbook/js_api'; export const load: LayoutLoad = async ({ params, parent }) => { const { strategyName } = params; - const { registryDotrains } = await parent(); + const { registryDotrains, strategyDetails } = await parent(); let dotrain: string; + let strategyDetail: NameAndDescription; try { const _dotrain = registryDotrains.find((dotrain) => dotrain.name === strategyName)?.dotrain; @@ -13,12 +14,18 @@ export const load: LayoutLoad = async ({ params, parent }) => { throw redirect(307, '/deploy'); } dotrain = _dotrain; + const _strategyDetail = strategyDetails.find((detail) => detail.name === strategyName)?.details; + if (!_strategyDetail) { + throw redirect(307, '/deploy'); + } + strategyDetail = _strategyDetail; } catch { throw redirect(307, '/deploy'); } return { dotrain, - strategyName + strategyName, + strategyDetail }; }; diff --git a/packages/webapp/src/routes/deploy/[strategyName]/[deploymentKey]/+page.svelte b/packages/webapp/src/routes/deploy/[strategyName]/[deploymentKey]/+page.svelte index 3a012b5cc..3b387c040 100644 --- a/packages/webapp/src/routes/deploy/[strategyName]/[deploymentKey]/+page.svelte +++ b/packages/webapp/src/routes/deploy/[strategyName]/[deploymentKey]/+page.svelte @@ -6,7 +6,7 @@ import { handleDeployModal, handleDisclaimerModal } from '$lib/services/modal'; import { handleUpdateGuiState } from '$lib/services/handleUpdateGuiState'; const { settings } = $page.data.stores; - const { dotrain, deployment } = $page.data; + const { dotrain, deployment, strategyDetail } = $page.data; if (!dotrain || !deployment) { setTimeout(() => { @@ -24,6 +24,7 @@

Deployment not found. Redirecting to deployments page...
{:else}