From 99b730105f01db95cc90e0493dbeac39eb584db7 Mon Sep 17 00:00:00 2001 From: Dean Date: Fri, 16 Sep 2022 17:32:50 +0100 Subject: [PATCH] Minor fix to add categories for rest bindings --- packages/builder/src/builderStore/dataBinding.js | 16 +++++++++++++--- .../rest/[query]/index.svelte | 10 ++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js index d961a3a1cd..562e4fdcbc 100644 --- a/packages/builder/src/builderStore/dataBinding.js +++ b/packages/builder/src/builderStore/dataBinding.js @@ -82,6 +82,7 @@ export const getAuthBindings = () => { readableBinding: fieldBinding.readable, fieldSchema: { type: "string", name: fieldBinding.key }, providerId: "user", + category: "Current User", } }) return bindings @@ -93,7 +94,7 @@ export const getAuthBindings = () => { * @param {string} prefix A contextual string prefix/path for a user readable binding * @return {object[]} An array containing readable/runtime binding objects */ -export const toBindingsArray = (valueMap, prefix) => { +export const toBindingsArray = (valueMap, prefix, category) => { if (!valueMap) { return [] } @@ -101,11 +102,20 @@ export const toBindingsArray = (valueMap, prefix) => { if (!binding || !valueMap[binding]) { return acc } - acc.push({ + + let config = { type: "context", runtimeBinding: binding, readableBinding: `${prefix}.${binding}`, - }) + icon: "Brackets", + } + + if (category) { + config.category = category + } + + acc.push(config) + return acc }, []) } diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte index d2c1630416..fc13310ed9 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte @@ -60,14 +60,20 @@ $: staticVariables = datasource?.config?.staticVariables || {} - $: customRequestBindings = toBindingsArray(requestBindings, "Binding") + $: customRequestBindings = toBindingsArray( + requestBindings, + "Binding", + "Bindings" + ) $: globalDynamicRequestBindings = toBindingsArray( globalDynamicBindings, + "Dynamic", "Dynamic" ) $: dataSourceStaticBindings = toBindingsArray( staticVariables, - "Datasource.Static" + "Datasource.Static", + "Datasource Static" ) $: mergedBindings = [