Skip to content

Commit

Permalink
Fix SSO Settings form
Browse files Browse the repository at this point in the history
  • Loading branch information
nas-tabchiche committed Jun 18, 2024
1 parent ec43792 commit d51d485
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 16 deletions.
18 changes: 8 additions & 10 deletions frontend/src/routes/(app)/settings/+page.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,15 @@ import { z } from 'zod';
import type { PageServerLoad } from './$types';

export const load: PageServerLoad = async ({ params, fetch }) => {
const settings = await fetch(`${BASE_API_URL}/settings/`)
.then((res) => res.json())
.then((data) => data.results);
const settings = await fetch(`${BASE_API_URL}/settings/sso/object/`).then((res) => res.json());

const selectOptions: Record<string, any> = {};

const settingsModel = getModelInfo('identity-providers');
const model = getModelInfo('identity-providers');

if (settingsModel.selectFields) {
for (const selectField of settingsModel.selectFields) {
const url = `${BASE_API_URL}/risk-settingss/${selectField.field}/`;
if (model.selectFields) {
for (const selectField of model.selectFields) {
const url = `${BASE_API_URL}/settings/sso/${selectField.field}/`;
const response = await fetch(url);
if (response.ok) {
selectOptions[selectField.field] = await response.json().then((data) =>
Expand All @@ -43,10 +41,10 @@ export const load: PageServerLoad = async ({ params, fetch }) => {
}
}

settingsModel.selectOptions = selectOptions;
model.selectOptions = selectOptions;

const form = await superValidate(zod(IdentityProviderSchema));
return { settings, form, settingsModel };
const form = await superValidate(settings, zod(IdentityProviderSchema), { errors: false });
return { settings, form, model };
};

export const actions: Actions = {
Expand Down
7 changes: 1 addition & 6 deletions frontend/src/routes/(app)/settings/+page.svelte
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
<script lang="ts">
import ModelForm from '$lib/components/Forms/ModelForm.svelte';
import { getModelInfo } from '$lib/utils/crud';
import { IdentityProviderSchema } from '$lib/utils/schemas';
export let data;
</script>

<ModelForm
form={data.form}
schema={IdentityProviderSchema}
model={getModelInfo('identity-providers')}
/>
<ModelForm form={data.form} schema={IdentityProviderSchema} model={data.model} />

0 comments on commit d51d485

Please sign in to comment.