Skip to content

fix: import config default selection #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DarianM merged 2 commits into from
Mar 14, 2025
Merged

fix: import config default selection #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d695d3
prevent overwriting of existing config by same name
lengyel-arpad85 Mar 13, 2025
668a517
force trigger setting default config values
lengyel-arpad85 Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion frontend/app/components/modals/NewVersion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ type NewVersionModalProps = {
onClose: () => void
toolConfig: ElementConfigType
setToolConfig: React.Dispatch<React.SetStateAction<ElementConfigType>>
fullConfig?: Record<string, ElementConfigType>
}

export const NewVersionModal = ({
Expand All @@ -22,7 +23,8 @@ export const NewVersionModal = ({
errors,
isSubmitting,
toolConfig,
setToolConfig
setToolConfig,
fullConfig
}: NewVersionModalProps) => {
const [versionName, setVersionName] = useState('')

Expand Down Expand Up @@ -76,6 +78,11 @@ export const NewVersionModal = ({
withBorder
/>
</div>
<input
type="hidden"
name="fullconfig"
value={JSON.stringify(fullConfig)}
/>
</div>
<div className="flex justify-end space-x-4">
<Button
Expand Down
27 changes: 22 additions & 5 deletions frontend/app/routes/create.$type.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ export default function Create() {
const [versionOptions, setVersionOptions] = useState<SelectOption[]>([
{ label: 'Default', value: 'default' }
])
const [configUpdateTrigger, setConfigUpdateTrigger] = useState(0)

const wa = (toolConfig?.walletAddress || '')
.replace('$', '')
Expand Down Expand Up @@ -149,10 +150,12 @@ export default function Create() {
setVersionOptions(versionLabels)
setFullConfig(response.apiResponse.payload)

const selVersion = response.apiResponse.newversion
setSelectedVersion(selVersion)
setNewVersionModalOpen(false)
setInfoModalOpen(true)
const selVersion = response.apiResponse.newversion
setSelectedVersion(selVersion)
// make sure the update is triggered
setConfigUpdateTrigger((prev) => prev + 1)
} else if (
response &&
response.apiResponse &&
Expand All @@ -169,11 +172,13 @@ export default function Create() {
setVersionOptions(versionLabels)

setFullConfig(response.apiResponse.payload)
setSelectedVersion('default')
setImportModalOpen(false)
if (response.intent != 'remove') {
setInfoModalOpen(true)
}
setSelectedVersion('default')
// make sure the update is triggered
setConfigUpdateTrigger((prev) => prev + 1)
}
}, [response])

Expand All @@ -190,7 +195,7 @@ export default function Create() {
const config = fullConfig[selectedVersion]
setToolConfig(config)
}
}, [selectedVersion])
}, [selectedVersion, configUpdateTrigger])

return (
<div className="flex flex-col gap-6 min-w-128 max-w-prose mx-auto my-8">
Expand Down Expand Up @@ -270,6 +275,7 @@ export default function Create() {
errors={response?.errors}
toolConfig={toolConfig}
setToolConfig={setToolConfig}
fullConfig={fullConfig}
/>
<InfoModal
title="Available configs"
Expand Down Expand Up @@ -315,7 +321,10 @@ export async function action({ request, params }: ActionFunctionArgs) {

return json({ errors, apiResponse, displayScript, intent }, { status: 200 })
} else if (intent == 'newversion') {
const result = versionSchema.merge(walletSchema).safeParse(formData)
const result = versionSchema
.merge(walletSchema)
.merge(fullConfigSchema)
.safeParse(formData)

if (!result.success) {
errors.fieldErrors = result.error.flatten().fieldErrors
Expand All @@ -327,6 +336,14 @@ export async function action({ request, params }: ActionFunctionArgs) {

const payload = result.data
const versionName = payload.version.replaceAll(' ', '-')
const configKeys = Object.keys(JSON.parse(payload.fullconfig))
if (configKeys.indexOf(versionName) !== -1) {
errors.fieldErrors = { version: ['Already exists'] }
return json(
{ errors, apiResponse, displayScript, intent },
{ status: 400 }
)
}
apiResponse = await ApiClient.createUserConfig(
versionName,
payload.walletAddress
Expand Down