Fix: some fixes to make studio useable again, probably fixes #2139

This commit is contained in:
Pieter Vander Vennet 2024-09-14 22:43:09 +02:00
parent f2fca2dad8
commit 6672fc87b4
4 changed files with 89 additions and 65 deletions

View file

@ -30,7 +30,7 @@
.getSchemaStartingWith(schema.path) .getSchemaStartingWith(schema.path)
.filter((part) => part.path.length - 1 === schema.path.length) .filter((part) => part.path.length - 1 === schema.path.length)
let usesOverride = value["builtin"] !== undefined let usesOverride = value?.["builtin"] !== undefined
function schemaForMultitype() { function schemaForMultitype() {
const sch = { ...schema } const sch = { ...schema }
@ -138,7 +138,7 @@
</div> </div>
{:else if typeof value === "string"} {:else if typeof value === "string"}
Builtin: <b>{value}</b> Builtin: <b>{value}</b>
{:else if value["builtin"]} {:else if value?.["builtin"]}
reused tagrendering <span class="font-bold">{JSON.stringify(value["builtin"])}</span> reused tagrendering <span class="font-bold">{JSON.stringify(value["builtin"])}</span>
{:else} {:else}
<Tr cls="font-bold" t={Translations.T(value?.question ?? value?.render)} /> <Tr cls="font-bold" t={Translations.T(value?.question ?? value?.render)} />

View file

@ -159,6 +159,9 @@ export abstract class EditJsonState<T> {
} }
public getSchemaStartingWith(path: string[]) { public getSchemaStartingWith(path: string[]) {
if(path === undefined){
return undefined
}
return this.schema.filter( return this.schema.filter(
(sch) => (sch) =>
!path.some((part, i) => !(sch.path.length > path.length && sch.path[i] === part)) !path.some((part, i) => !(sch.path.length > path.length && sch.path[i] === part))

View file

@ -5,18 +5,23 @@
import { TrashIcon } from "@babeard/svelte-heroicons/mini" import { TrashIcon } from "@babeard/svelte-heroicons/mini"
import ShowConversionMessage from "./ShowConversionMessage.svelte" import ShowConversionMessage from "./ShowConversionMessage.svelte"
import Markdown from "../Base/Markdown.svelte" import Markdown from "../Base/Markdown.svelte"
import type { QuestionableTagRenderingConfigJson } from "../../Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson" import type {
QuestionableTagRenderingConfigJson
} from "../../Models/ThemeConfig/Json/QuestionableTagRenderingConfigJson"
import CollapsedTagRenderingPreview from "./CollapsedTagRenderingPreview.svelte" import CollapsedTagRenderingPreview from "./CollapsedTagRenderingPreview.svelte"
import { Accordion } from "flowbite-svelte" import { Accordion } from "flowbite-svelte"
import { Utils } from "../../Utils"
export let state: EditJsonState<any> export let state: EditJsonState<any>
export let path: (string | number)[] = [] export let path: (string | number)[] = []
let schema: ConfigMeta = state.getSchema(path)[0] let schema: ConfigMeta = state.getSchema(path)[0]
console.log("SBA got schema", schema, "for path", path)
let title = schema.path.at(-1)
let title = schema?.path?.at(-1)
let singular = title let singular = title
if (title?.endsWith("s")) { if (title?.endsWith("s")) {
singular = title.slice(0, title.length - 1) singular = title?.slice(0, title.length - 1)
} }
let article = "a" let article = "a"
if (singular?.match(/^[aeoui]/)) { if (singular?.match(/^[aeoui]/)) {
@ -25,18 +30,20 @@
const isTagRenderingBlock = path.length === 1 && path[0] === "tagRenderings" const isTagRenderingBlock = path.length === 1 && path[0] === "tagRenderings"
if (isTagRenderingBlock) { if (isTagRenderingBlock && schema !== undefined) {
schema = { ...schema } schema = { ...schema }
schema.description = undefined schema.description = undefined
} }
const subparts: ConfigMeta[] = state const subparts: ConfigMeta[] = state
.getSchemaStartingWith(schema.path) .getSchemaStartingWith(schema?.path)
.filter((part) => part.path.length - 1 === schema.path.length) ?.filter((part) => part.path.length - 1 === schema?.path?.length)
let messages = state.messagesFor(path) let messages = state.messagesFor(path)
let datapath = path let datapath = path
const currentValue = state.getStoreFor<(string | QuestionableTagRenderingConfigJson)[]>(datapath) const currentValue = state.getStoreFor<(string | QuestionableTagRenderingConfigJson)[]>(datapath)
currentValue.set(Utils.DedupT(currentValue.data))
console.log("Current value is", currentValue.data)
if (currentValue.data === undefined) { if (currentValue.data === undefined) {
currentValue.setData([]) currentValue.setData([])
} }
@ -62,8 +69,8 @@
currentValue.ping() currentValue.ping()
} }
</script> </script>
{#if schema !== undefined}
<div class="pl-2"> <div class="pl-2">
<h3>{schema.path.at(-1)}</h3> <h3>{schema.path.at(-1)}</h3>
{#if subparts.length > 0} {#if subparts.length > 0}
@ -99,7 +106,7 @@
{/each} {/each}
{:else} {:else}
<Accordion> <Accordion>
{#each $currentValue as value, i (value)} {#each $currentValue as value, i}
<CollapsedTagRenderingPreview <CollapsedTagRenderingPreview
{state} {state}
{isTagRenderingBlock} {isTagRenderingBlock}
@ -126,4 +133,5 @@
{/if} {/if}
<slot name="extra-button" /> <slot name="extra-button" />
</div> </div>
</div> </div>
{/if}

View file

@ -401,6 +401,19 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
return newArr return newArr
} }
public static DedupT<T>(arr: T[]): T[]{
if(!arr){
return arr
}
const items = []
for (const item of arr) {
if(items.indexOf(item) < 0){
items.push(item)
}
}
return items
}
/** /**
* Finds all duplicates in a list of strings * Finds all duplicates in a list of strings
* *