Making it so that schema always shows up for future work towards global variables and making it so that tabs selected can be bound to.
This commit is contained in:
mike12345567
parent
6535e61165
commit
adbbafbd53
|
|
@ -11,6 +11,8 @@
|
||||||
export let quiet = false
|
export let quiet = false
|
||||||
export let emphasized = false
|
export let emphasized = false
|
||||||
|
|
||||||
|
let thisSelected = undefined
|
||||||
|
|
||||||
let _id = id()
|
let _id = id()
|
||||||
const tab = writable({ title: selected, id: _id, emphasized })
|
const tab = writable({ title: selected, id: _id, emphasized })
|
||||||
setContext("tab", tab)
|
setContext("tab", tab)
|
||||||
|
|
@ -20,9 +22,18 @@
|
||||||
const dispatch = createEventDispatcher()
|
const dispatch = createEventDispatcher()
|
||||||
|
|
||||||
$: {
|
$: {
|
||||||
if ($tab.title !== selected) {
|
if (thisSelected !== selected) {
|
||||||
selected = $tab.title
|
thisSelected = selected
|
||||||
dispatch("select", selected)
|
dispatch("select", thisSelected)
|
||||||
|
} else if ($tab.title !== thisSelected) {
|
||||||
|
thisSelected = $tab.title
|
||||||
|
dispatch("select", thisSelected)
|
||||||
|
}
|
||||||
|
if ($tab.title !== thisSelected) {
|
||||||
|
tab.update(state => {
|
||||||
|
state.title = thisSelected
|
||||||
|
return state
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -124,6 +124,7 @@
|
||||||
notifications.info("Request did not return any data.")
|
notifications.info("Request did not return any data.")
|
||||||
} else {
|
} else {
|
||||||
response.info = response.info || { code: 200 }
|
response.info = response.info || { code: 200 }
|
||||||
|
schema = response.schema
|
||||||
notifications.success("Request sent successfully.")
|
notifications.success("Request sent successfully.")
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|
@ -243,7 +244,7 @@
|
||||||
<div class="bottom">
|
<div class="bottom">
|
||||||
<Layout paddingY="S" gap="S">
|
<Layout paddingY="S" gap="S">
|
||||||
<Divider size="S" />
|
<Divider size="S" />
|
||||||
{#if !response}
|
{#if !response && Object.keys(schema).length === 0}
|
||||||
<Heading size="M">Response</Heading>
|
<Heading size="M">Response</Heading>
|
||||||
<div class="placeholder">
|
<div class="placeholder">
|
||||||
<div class="placeholder-internal">
|
<div class="placeholder-internal">
|
||||||
|
|
@ -254,59 +255,70 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{:else}
|
{:else}
|
||||||
<Tabs selected="JSON" quiet noPadding noHorizPadding>
|
<Tabs
|
||||||
<Tab title="JSON">
|
selected={!response ? "Schema" : "JSON"}
|
||||||
<div>
|
quiet
|
||||||
<JSONPreview height="300" data={response.rows[0]} />
|
noPadding
|
||||||
|
noHorizPadding
|
||||||
|
>
|
||||||
|
{#if response}
|
||||||
|
<Tab title="JSON">
|
||||||
|
<div>
|
||||||
|
<JSONPreview height="300" data={response.rows[0]} />
|
||||||
|
</div>
|
||||||
|
</Tab>
|
||||||
|
{/if}
|
||||||
|
{#if schema || response}
|
||||||
|
<Tab title="Schema">
|
||||||
|
<KeyValueBuilder
|
||||||
|
bind:object={schema}
|
||||||
|
name="schema"
|
||||||
|
headings
|
||||||
|
options={SchemaTypeOptions}
|
||||||
|
/>
|
||||||
|
</Tab>
|
||||||
|
{/if}
|
||||||
|
{#if response}
|
||||||
|
<Tab title="Raw">
|
||||||
|
<TextArea disabled value={response.extra?.raw} height="300" />
|
||||||
|
</Tab>
|
||||||
|
<Tab title="Headers">
|
||||||
|
<KeyValueBuilder object={response.extra?.headers} readOnly />
|
||||||
|
</Tab>
|
||||||
|
<Tab title="Preview">
|
||||||
|
<div class="table">
|
||||||
|
{#if response}
|
||||||
|
<Table
|
||||||
|
schema={response?.schema}
|
||||||
|
data={response?.rows}
|
||||||
|
allowEditColumns={false}
|
||||||
|
allowEditRows={false}
|
||||||
|
allowSelectRows={false}
|
||||||
|
/>
|
||||||
|
{/if}
|
||||||
|
</div>
|
||||||
|
</Tab>
|
||||||
|
<div class="stats">
|
||||||
|
<Label size="L">
|
||||||
|
Status: <span class={responseSuccess ? "green" : "red"}
|
||||||
|
>{response?.info.code}</span
|
||||||
|
>
|
||||||
|
</Label>
|
||||||
|
<Label size="L">
|
||||||
|
Time: <span class={responseSuccess ? "green" : "red"}
|
||||||
|
>{response?.info.time}</span
|
||||||
|
>
|
||||||
|
</Label>
|
||||||
|
<Label size="L">
|
||||||
|
Size: <span class={responseSuccess ? "green" : "red"}
|
||||||
|
>{response?.info.size}</span
|
||||||
|
>
|
||||||
|
</Label>
|
||||||
|
<Button disabled={!responseSuccess} cta on:click={saveQuery}
|
||||||
|
>Save query</Button
|
||||||
|
>
|
||||||
</div>
|
</div>
|
||||||
</Tab>
|
{/if}
|
||||||
<Tab title="Schema">
|
|
||||||
<KeyValueBuilder
|
|
||||||
bind:object={response.schema}
|
|
||||||
name="schema"
|
|
||||||
headings
|
|
||||||
options={SchemaTypeOptions}
|
|
||||||
/>
|
|
||||||
</Tab>
|
|
||||||
<Tab title="Raw">
|
|
||||||
<TextArea disabled value={response.extra?.raw} height="300" />
|
|
||||||
</Tab>
|
|
||||||
<Tab title="Headers">
|
|
||||||
<KeyValueBuilder object={response.extra?.headers} readOnly />
|
|
||||||
</Tab>
|
|
||||||
<Tab title="Preview">
|
|
||||||
<div class="table">
|
|
||||||
{#if response}
|
|
||||||
<Table
|
|
||||||
schema={response?.schema}
|
|
||||||
data={response?.rows}
|
|
||||||
allowEditColumns={false}
|
|
||||||
allowEditRows={false}
|
|
||||||
allowSelectRows={false}
|
|
||||||
/>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
</Tab>
|
|
||||||
<div class="stats">
|
|
||||||
<Label size="L">
|
|
||||||
Status: <span class={responseSuccess ? "green" : "red"}
|
|
||||||
>{response?.info.code}</span
|
|
||||||
>
|
|
||||||
</Label>
|
|
||||||
<Label size="L">
|
|
||||||
Time: <span class={responseSuccess ? "green" : "red"}
|
|
||||||
>{response?.info.time}</span
|
|
||||||
>
|
|
||||||
</Label>
|
|
||||||
<Label size="L">
|
|
||||||
Size: <span class={responseSuccess ? "green" : "red"}
|
|
||||||
>{response?.info.size}</span
|
|
||||||
>
|
|
||||||
</Label>
|
|
||||||
<Button disabled={!responseSuccess} cta on:click={saveQuery}
|
|
||||||
>Save query</Button
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
</Tabs>
|
</Tabs>
|
||||||
{/if}
|
{/if}
|
||||||
</Layout>
|
</Layout>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue