diff --git a/packages/bootstrap-components/components.json b/packages/bootstrap-components/components.json
index 5460798067..b94e88f765 100644
--- a/packages/bootstrap-components/components.json
+++ b/packages/bootstrap-components/components.json
@@ -10,21 +10,13 @@
"name": "Forms",
"description": "Generate forms, based on your records"
},
- "buttons": {
- "name": "Buttons",
- "description": "Generate some styled buttons"
- },
- "headers": {
- "name": "Headers",
- "description": "Generate some styled headings"
- },
- "nav": {
- "name": "Nav bar",
- "description": "Generate a nav bar, based n your root records"
- },
"indexTables": {
- "name": "Nav bar",
+ "name": "Index Tables",
"description": "Generate a table based on an index"
+ },
+ "recordHomepages": {
+ "name": "Record Homepage",
+ "description": "Generates a 'homepage' based on your record types, including a create/edit form. Selecting a nav item will display a root content"
}
},
"form" : {
@@ -53,14 +45,6 @@
"name": "Nav",
"description": "A nav - a side bar of buttons that control the currently active component",
"props" : {
- "navBarBackground": {"type" :"string", "default":"silver"},
- "navBarBorder": "string",
- "navBarColor": {"type" :"string", "default":"black"},
- "selectedItemBackground": {"type" :"string", "default":"white"},
- "selectedItemColor": {"type" :"string", "default":"black"},
- "selectedItemBorder": "string",
- "itemHoverBackground": {"type" :"string", "default":"gainsboro"},
- "itemHoverColor": {"type" :"string", "default":"black"},
"items": {
"type": "array",
"elementDefinition" : {
@@ -69,6 +53,10 @@
}
},
"selectedItem":"string",
+ "pills":"bool",
+ "orientation":{"type":"options", "options": ["horizontal", "vertical"]},
+ "alignment":{"type":"options", "options": ["start", "center", "end"]},
+ "fill":"bool",
"hideNavBar":"bool"
},
diff --git a/packages/bootstrap-components/dist/generators.js b/packages/bootstrap-components/dist/generators.js
index 67dd2ee24a..e478cc8bfd 100644
--- a/packages/bootstrap-components/dist/generators.js
+++ b/packages/bootstrap-components/dist/generators.js
@@ -1,2 +1,403 @@
+const buttons = () => [
+ {
+ name: "common/Primary Button",
+ description: "Bootstrap primary button ",
+ inherits: "@budibase/standard-components/button",
+ props: {
+ className: "btn btn-primary"
+ }
+ },
+ {
+ name: "common/Default Button",
+ description: "Bootstrap default button",
+ inherits: "@budibase/standard-components/button",
+ props: {
+ className: "btn btn-light"
+ }
+ }
+];
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdG9ycy5qcyIsInNvdXJjZXMiOltdLCJzb3VyY2VzQ29udGVudCI6W10sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ==
+const forms = ({records, indexes, helpers}) =>
+ [
+ ...records.map(root),
+ ...buttons()
+ ];
+
+const formName = record => `${record.name}/${record.name} Form`;
+
+const root = record => ({
+ name: formName(record),
+ description: `Control for creating/updating '${record.nodeKey()}' `,
+ inherits: "@budibase/standard-components/div",
+ props: {
+ className:"p-1",
+ children: [
+ {
+ component: {
+ _component: "@budibase/standard-components/h3",
+ text: `Edit ${record.name}`,
+ }
+ },
+ form(record),
+ saveCancelButtons(record)
+ ]
+ }
+});
+
+const form = record => ({
+ component: {
+ _component: "@budibase/standard-components/form",
+ formControls:
+ record.fields.map(f => formControl(record, f))
+ }
+});
+
+const formControl = (record, field) => {
+ if(field.type === "string" && field.typeOptions.values && field.typeOptions.values.length > 0) {
+ return ({
+ control: {
+ _component: "@budibase/standard-components/select",
+ options: field.typeOptions.values.map(v => ({id:v, value:v})),
+ value: {
+ "##bbstate":`${record.name}.${field.name}`,
+ "##bbsource":"store"
+ },
+ className: "form-control"
+ },
+ label: field.label
+ });
+ } else {
+ return ({
+ control: {
+ _component: "@budibase/standard-components/input",
+ value: {
+ "##bbstate":`${record.name}.${field.name}`,
+ "##bbsource":"store"
+ },
+ className: "form-control",
+ type: field.type === "string" ? "text"
+ : field.type === "datetime" ? "date"
+ : field.type === "number" ? "number"
+ : "text"
+ },
+ label: field.label
+ });
+ }
+};
+
+const saveCancelButtons = (record) => ({
+ component: {
+ _component: "@budibase/standard-components/stackpanel",
+ direction: "horizontal",
+ children: [
+ paddedPanelForButton({
+ _component: "common/Primary Button",
+ contentText: `Save ${record.name}`,
+ onClick: [
+ {
+ "##eventHandlerType": "Save Record",
+ parameters: {
+ statePath: `${record.name}`,
+ }
+ },
+ {
+ "##eventHandlerType": "Set State",
+ parameters: {
+ path: `isEditing${record.name}`,
+ value: ""
+ }
+ }
+ ]
+ }),
+ paddedPanelForButton({
+ _component: "common/Default Button",
+ contentText: `Cancel`,
+ onClick: [
+ {
+ "##eventHandlerType": "Set State",
+ parameters: {
+ path: `isEditing${record.name}`,
+ value: ""
+ }
+ }
+ ]
+ })
+ ]
+ }
+});
+
+const paddedPanelForButton = (button) => ({
+ control: {
+ _component: "@budibase/standard-components/div",
+ className: "btn-group",
+ children: [
+ {
+ component: button
+ }
+ ]
+ }
+});
+
+const getRecordPath = (record) => {
+
+ const parts = [];
+
+ return parts.reverse().join("/");
+};
+
+const indexTables = ({indexes, helpers}) =>
+ indexes.map(i => indexTable(i, helpers));
+
+const excludedColumns = ["id", "isNew", "key", "type", "sortKey"];
+
+const indexTableProps = (index, helpers) => ({
+ data: {
+ "##bbstate":index.nodeKey(),
+ "##bbsource":"store"
+ },
+ tableClass: "table table-hover",
+ theadClass: "thead-dark",
+ columns: helpers
+ .indexSchema(index)
+ .filter(c => !excludedColumns.includes(c.name))
+ .map(column),
+ onRowClick: [
+ {
+ "##eventHandlerType": "Load Record",
+ parameters: {
+ recordKey: {
+ "##bbstate": "key",
+ "##bbsource": "context"
+ },
+ statePath: {
+ "##bbstate": "type",
+ "##bbsource": "context"
+ }
+ },
+ "##eventHandlerType": "Set State",
+ parameters: {
+ path: "currentView",
+ value: {
+ "##bbstate": "type",
+ "##bbsource": "context"
+ }
+ },
+ }
+ ]
+});
+
+const getIndexTableName = (index, record) => {
+ record = record
+ || index.parent().type === "record" ? index.parent() : null;
+
+ return (record
+ ? `${getRecordPath()}/${index.name} Table`
+ : `${index.name} Table`);
+};
+
+const indexTable = (index, helpers) => ({
+ name: getIndexTableName(index),
+ inherits: "@budibase/standard-components/table",
+ props: indexTableProps(index, helpers)
+});
+
+const column = (col) => ({
+ title: col.name,
+ value: {
+ "##bbstate": col.name,
+ "##bbsource":"context"
+ }
+});
+
+const recordHomePageComponents = ({indexes, records, helpers}) =>
+ [
+ ...recordHomepages({indexes, records})
+ .map(component),
+
+ ...recordHomepages({indexes, records})
+ .map(homePageButtons),
+
+ ...indexTables({indexes, records, helpers}),
+
+ ...buttons()
+ ];
+
+
+const findIndexForRecord = (indexes, record) => {
+ const forRecord = indexes.filter(i => i.allowedRecordNodeIds.includes(record.nodeId));
+ if(forRecord.length === 0) return;
+ if(forRecord.length === 1) return forRecord[0];
+ const noMap = forRecord.filter(i => !i.filter || !i.filter.trim());
+ if(noMap.length === 0) forRecord[0];
+ return noMap[0];
+};
+
+const recordHomepages = ({indexes, records}) =>
+ records.filter(r => r.parent().type === "root")
+ .map(r =>({
+ record:r,
+ index:findIndexForRecord(indexes, r)
+ }))
+ .filter(r => r.index);
+
+
+const homepageComponentName = (record) =>
+ `${record.name}/${record.name} homepage`;
+
+const component = ({record, index}) => ({
+ inherits: "@budibase/standard-components/div",
+ name: homepageComponentName(record),
+ props: {
+ className: "p-3",
+ children: [
+ {
+ component: {
+ _component: "@budibase/standard-components/h2",
+ text: record.collectionName
+ }
+ },
+ {
+ component: {
+ _component: `${record.name}/homepage buttons`,
+ }
+ },
+ {
+ component: {
+ _component: getIndexTableName(index)
+ }
+ }
+ ],
+ onLoad: [
+ {
+ "##eventHandlerType": "Set State",
+ parameters: {
+ path: `isEditing${record.name}`,
+ value: ""
+ }
+ },
+ {
+ "##eventHandlerType": "List Records",
+ parameters: {
+ statePath: index.nodeKey(),
+ indexKey: index.nodeKey()
+ }
+ }
+ ]
+ }
+
+});
+
+const homePageButtons = ({index, record}) => ({
+ inherits: "@budibase/standard-components/div",
+ name: `${record.name}/homepage buttons`,
+ props: {
+ className: "btn-group",
+ children: [
+ {
+ component: {
+ _component: "common/Default Button",
+ contentText: `Create ${record.name}`,
+ onClick: [
+ {
+ "##eventHandlerType": "Get New Record",
+ parameters: {
+ statePath: record.name,
+ collectionKey: `/${record.collectionName}`,
+ childRecordType: record.name
+ }
+ },
+ {
+ "##eventHandlerType": "Set State",
+ parameters: {
+ path: `isEditing${record.name}`,
+ value: "true"
+ }
+ }
+ ]
+ }
+ },
+ {
+ component: {
+ _component: "common/Default Button",
+ contentText: `Refresh`,
+ onClick: [
+ {
+ "##eventHandlerType": "List Records",
+ parameters: {
+ statePath: index.nodeKey(),
+ indexKey: index.nodeKey()
+ }
+ }
+ ]
+ }
+ }
+ ]
+ }
+});
+
+const selectNavContent = ({indexes, records, helpers}) =>
+ [
+ ...recordHomepages({indexes, records})
+ .map(component$1),
+
+ ...recordHomePageComponents({indexes, records, helpers}),
+
+ ...forms({indexes, records, helpers})
+
+ ];
+
+
+const navContentComponentName = record =>
+ `${record.name}/${record.name} Nav Content`;
+
+const component$1 = ({record, index}) => ({
+ inherits: "@budibase/standard-components/if",
+ description: `the component that gets displayed when the ${record.collectionName} nav is selected`,
+ name: navContentComponentName(record),
+ props: {
+ condition: `$store.isEditing${record.name}`,
+ thenComponent: {
+ _component: formName(record)
+ },
+ elseComponent: {
+ _component: homepageComponentName(record)
+ }
+ }
+});
+
+const app = ({records, indexes, helpers}) => [
+ {
+ name: "Application Root",
+ inherits: "@budibase/bootstrap-components/nav",
+ props: {
+ items: recordHomepages({indexes, records})
+ .map(navItem),
+ orientation: "horizontal",
+ alignment: "start",
+ fill: false,
+ pills: true,
+ selectedItem: {
+ "##bbstate":"selectedNav",
+ "##bbstatefallback":`${records[0].name}`,
+ "##bbsource": "store"
+ }
+ }
+ },
+ {
+ name: "Login",
+ inherits: "@budibase/standard-components/login",
+ props: {}
+ },
+ ...selectNavContent({records, indexes, helpers})
+];
+
+
+const navItem = ({record}) => ({
+ title: record.collectionName,
+ component : {
+ _component: navContentComponentName(record)
+ }
+});
+
+export { app, forms, indexTables, recordHomePageComponents as recordHomepages };
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"generators.js","sources":["../src/generators/buttonGenerators.js","../src/generators/formsGenerator.js","../src/generators/getRecordPath.js","../src/generators/indexTablesGenerator.js","../src/generators/recordHomePageGenerator.js","../src/generators/selectedNavContentGenerator.js","../src/generators/appGenerator.js"],"sourcesContent":["export const buttons = () => [\r\n    {\r\n        name: \"common/Primary Button\",\r\n        description: \"Bootstrap primary button \",\r\n        inherits: \"@budibase/standard-components/button\",\r\n        props: {\r\n            className: \"btn btn-primary\"\r\n        }\r\n    },\r\n    {\r\n        name: \"common/Default Button\",\r\n        description: \"Bootstrap default button\",\r\n        inherits: \"@budibase/standard-components/button\",\r\n        props: {\r\n            className: \"btn btn-light\"\r\n        }\r\n    }\r\n]","import {buttons} from \"./buttonGenerators\";\r\n\r\nexport const forms = ({records, indexes, helpers}) => \r\n    [\r\n        ...records.map(root),\r\n        ...buttons({records, indexes, helpers})\r\n    ];\r\n\r\nexport const formName = record =>  `${record.name}/${record.name} Form`;\r\n\r\nconst root = record => ({\r\n    name: formName(record),\r\n    description: `Control for creating/updating '${record.nodeKey()}' `,\r\n    inherits: \"@budibase/standard-components/div\",\r\n    props: {\r\n        className:\"p-1\",\r\n        children: [\r\n            {\r\n                component: {\r\n                    _component: \"@budibase/standard-components/h3\",\r\n                    text: `Edit ${record.name}`,\r\n                }\r\n            },\r\n            form(record),\r\n            saveCancelButtons(record)\r\n        ]\r\n    }\r\n}) \r\n\r\nconst form = record => ({\r\n    component: {\r\n        _component: \"@budibase/standard-components/form\",\r\n        formControls: \r\n            record.fields.map(f => formControl(record, f))\r\n    }\r\n})\r\n\r\nconst formControl = (record, field) => {\r\n    if(field.type === \"string\" && field.typeOptions.values && field.typeOptions.values.length > 0) {\r\n        return ({\r\n            control: {\r\n                _component: \"@budibase/standard-components/select\",\r\n                options: field.typeOptions.values.map(v => ({id:v, value:v})),\r\n                value: {\r\n                    \"##bbstate\":`${record.name}.${field.name}`,\r\n                    \"##bbsource\":\"store\"\r\n                },\r\n                className: \"form-control\"\r\n            },\r\n            label: field.label\r\n        });\r\n    } else {\r\n        return ({\r\n            control: {\r\n                _component: \"@budibase/standard-components/input\",\r\n                value: {\r\n                    \"##bbstate\":`${record.name}.${field.name}`,\r\n                    \"##bbsource\":\"store\"\r\n                },\r\n                className: \"form-control\",\r\n                type: field.type === \"string\" ? \"text\"\r\n                    : field.type === \"datetime\" ? \"date\"\r\n                    : field.type === \"number\" ? \"number\"\r\n                    : \"text\"\r\n            },\r\n            label: field.label\r\n        });\r\n    }\r\n}\r\n\r\nconst saveCancelButtons = (record) => ({\r\n    component: {\r\n        _component: \"@budibase/standard-components/stackpanel\",\r\n        direction: \"horizontal\",\r\n        children: [\r\n            paddedPanelForButton({\r\n                _component: \"common/Primary Button\",\r\n                contentText: `Save ${record.name}`,\r\n                onClick: [                \r\n                    {\r\n                        \"##eventHandlerType\": \"Save Record\",\r\n                        parameters: {\r\n                            statePath: `${record.name}`,\r\n                        }\r\n                    },\r\n                    {\r\n                        \"##eventHandlerType\": \"Set State\",\r\n                        parameters: {\r\n                            path: `isEditing${record.name}`,\r\n                            value: \"\"\r\n                        }\r\n                    }\r\n                ]\r\n            }),\r\n            paddedPanelForButton({\r\n                _component: \"common/Default Button\",\r\n                contentText: `Cancel`,\r\n                onClick: [\r\n                    {\r\n                        \"##eventHandlerType\": \"Set State\",\r\n                        parameters: {\r\n                            path: `isEditing${record.name}`,\r\n                            value: \"\"\r\n                        }\r\n                    }\r\n                ]\r\n            })\r\n        ]\r\n    }\r\n})\r\n\r\nconst paddedPanelForButton = (button) => ({\r\n    control: {\r\n        _component: \"@budibase/standard-components/div\",\r\n        className: \"btn-group\",\r\n        children: [\r\n            {\r\n                component: button\r\n            }\r\n        ]\r\n    }\r\n});\r\n\r\n","export const getRecordPath = (record) => {\r\n\r\n    const parts = [];\r\n\r\n    const add = (current) => {\r\n        parts.push(current.name);\r\n        if(current.parent().type === \"root\") {\r\n            return;\r\n        }\r\n\r\n        add(current.parent());\r\n    }\r\n\r\n    return parts.reverse().join(\"/\");\r\n}","import { getRecordPath } from \"./getRecordPath\";\r\n\r\nexport const indexTables = ({indexes, helpers}) => \r\n    indexes.map(i => indexTable(i, helpers));\r\n\r\nconst excludedColumns = [\"id\", \"isNew\", \"key\", \"type\", \"sortKey\"];\r\n\r\nexport const indexTableProps = (index, helpers) => ({\r\n    data: {\r\n        \"##bbstate\":index.nodeKey(),\r\n        \"##bbsource\":\"store\"\r\n    },\r\n    tableClass: \"table table-hover\",\r\n    theadClass: \"thead-dark\",\r\n    columns: helpers\r\n                .indexSchema(index)\r\n                .filter(c => !excludedColumns.includes(c.name))\r\n                .map(column),\r\n    onRowClick: [\r\n        {\r\n            \"##eventHandlerType\": \"Load Record\",\r\n            parameters: {\r\n                recordKey: {\r\n                    \"##bbstate\": \"key\",\r\n                    \"##bbsource\": \"context\"\r\n                },\r\n                statePath: {\r\n                    \"##bbstate\": \"type\",\r\n                    \"##bbsource\": \"context\"\r\n                }\r\n            },\r\n            \"##eventHandlerType\": \"Set State\",\r\n            parameters: {\r\n                path: \"currentView\",\r\n                value: {\r\n                    \"##bbstate\": \"type\",\r\n                    \"##bbsource\": \"context\"\r\n                }\r\n            },\r\n        }\r\n    ]\r\n});\r\n\r\nexport const getIndexTableName = (index, record) => {\r\n    record = record \r\n             || index.parent().type === \"record\" ? index.parent() : null;\r\n    \r\n    return (record\r\n            ? `${getRecordPath(record)}/${index.name} Table`\r\n            : `${index.name} Table`);\r\n}\r\n\r\nconst indexTable = (index, helpers) => ({\r\n    name: getIndexTableName(index),\r\n    inherits: \"@budibase/standard-components/table\",\r\n    props: indexTableProps(index, helpers)\r\n});\r\n\r\nconst column = (col) => ({\r\n    title: col.name,\r\n    value: {\r\n        \"##bbstate\": col.name,\r\n        \"##bbsource\":\"context\"\r\n    }\r\n})","import {\r\n    getIndexTableName, indexTables\r\n} from \"./indexTablesGenerator\";\r\n\r\nimport {\r\n    buttons\r\n} from \"./buttonGenerators\";\r\n\r\nexport const recordHomePageComponents = ({indexes, records, helpers}) => \r\n    [   \r\n        ...recordHomepages({indexes, records})\r\n          .map(component),\r\n\r\n        ...recordHomepages({indexes, records})\r\n            .map(homePageButtons),\r\n        \r\n        ...indexTables({indexes, records, helpers}),\r\n\r\n        ...buttons({indexes, buttons, helpers})\r\n    ]\r\n\r\n\r\nconst findIndexForRecord = (indexes, record) => {\r\n    const forRecord = indexes.filter(i => i.allowedRecordNodeIds.includes(record.nodeId));\r\n    if(forRecord.length === 0) return;\r\n    if(forRecord.length === 1) return forRecord[0];\r\n    const noMap = forRecord.filter(i => !i.filter || !i.filter.trim());\r\n    if(noMap.length === 0) forRecord[0];\r\n    return noMap[0];\r\n}\r\n\r\nexport const recordHomepages = ({indexes, records}) => \r\n    records.filter(r => r.parent().type === \"root\")\r\n        .map(r =>({\r\n            record:r, \r\n            index:findIndexForRecord(indexes, r)\r\n        }))\r\n        .filter(r => r.index);\r\n\r\n\r\nexport const  homepageComponentName = (record) => \r\n    `${record.name}/${record.name} homepage`;\r\n\r\nconst component = ({record, index}) => ({\r\n    inherits: \"@budibase/standard-components/div\",\r\n    name: homepageComponentName(record),\r\n    props: {\r\n        className: \"p-3\",\r\n        children: [\r\n            {\r\n                component: {\r\n                    _component: \"@budibase/standard-components/h2\",\r\n                    text: record.collectionName\r\n                }\r\n            },\r\n            {\r\n                component: {\r\n                    _component: `${record.name}/homepage buttons`,\r\n                }\r\n            },\r\n            {\r\n                component: {\r\n                    _component: getIndexTableName(index)\r\n                }\r\n            }\r\n        ],\r\n        onLoad: [\r\n            {\r\n                \"##eventHandlerType\": \"Set State\",\r\n                parameters: {\r\n                    path: `isEditing${record.name}`,\r\n                    value: \"\"\r\n                }\r\n            },\r\n            {\r\n                \"##eventHandlerType\": \"List Records\",\r\n                parameters: {\r\n                    statePath: index.nodeKey(),\r\n                    indexKey: index.nodeKey()\r\n                }\r\n            }\r\n        ]\r\n    }\r\n\r\n});\r\n\r\nconst homePageButtons = ({index, record}) => ({\r\n    inherits: \"@budibase/standard-components/div\",\r\n    name: `${record.name}/homepage buttons`,\r\n    props: {\r\n        className: \"btn-group\",\r\n        children: [\r\n            {\r\n                component: {\r\n                    _component: \"common/Default Button\",\r\n                    contentText: `Create ${record.name}`,\r\n                    onClick: [\r\n                        {\r\n                            \"##eventHandlerType\": \"Get New Record\",\r\n                            parameters: {\r\n                                statePath: record.name,\r\n                                collectionKey: `/${record.collectionName}`,\r\n                                childRecordType: record.name\r\n                            }\r\n                        }, \r\n                        {\r\n                            \"##eventHandlerType\": \"Set State\",\r\n                            parameters: {\r\n                                path: `isEditing${record.name}`,\r\n                                value: \"true\"\r\n                            }\r\n                        }\r\n                    ]\r\n                }\r\n            },\r\n            {\r\n                component: {\r\n                    _component: \"common/Default Button\",\r\n                    contentText: `Refresh`,\r\n                    onClick: [\r\n                        {\r\n                            \"##eventHandlerType\": \"List Records\",\r\n                            parameters: {\r\n                                statePath: index.nodeKey(),\r\n                                indexKey: index.nodeKey()\r\n                            }\r\n                        }\r\n                    ]\r\n                }\r\n            }\r\n        ]\r\n    }\r\n})","import { \r\n    recordHomepages, \r\n    homepageComponentName,\r\n    recordHomePageComponents\r\n} from \"./recordHomePageGenerator\";\r\nimport { formName, forms } from \"./formsGenerator\";\r\n\r\nexport const selectNavContent = ({indexes, records, helpers}) => \r\n    [\r\n        ...recordHomepages({indexes, records})\r\n            .map(component),\r\n\r\n        ...recordHomePageComponents({indexes, records, helpers}),\r\n\r\n        ...forms({indexes, records, helpers})\r\n\r\n    ]\r\n\r\n\r\nexport const navContentComponentName = record =>\r\n    `${record.name}/${record.name} Nav Content`;\r\n\r\nconst component = ({record, index}) => ({\r\n    inherits: \"@budibase/standard-components/if\",\r\n    description: `the component that gets displayed when the ${record.collectionName} nav is selected`,\r\n    name: navContentComponentName(record),\r\n    props: {\r\n        condition: `$store.isEditing${record.name}`,\r\n        thenComponent: {\r\n            _component: formName(record)\r\n        },\r\n        elseComponent: {\r\n            _component: homepageComponentName(record)\r\n        }\r\n    }\r\n});","import { navContentComponentName, selectNavContent } from \"./selectedNavContentGenerator\";\r\nimport { recordHomepages } from \"./recordHomePageGenerator\";\r\nexport const app = ({records, indexes, helpers}) => [\r\n    {\r\n        name: \"Application Root\",\r\n        inherits: \"@budibase/bootstrap-components/nav\",\r\n        props: {\r\n            items: recordHomepages({indexes, records})\r\n                    .map(navItem),\r\n            orientation: \"horizontal\",\r\n            alignment: \"start\",\r\n            fill: false,\r\n            pills: true,\r\n            selectedItem: {\r\n                \"##bbstate\":\"selectedNav\",\r\n                \"##bbstatefallback\":`${records[0].name}`,\r\n                \"##bbsource\": \"store\"\r\n            }\r\n        }\r\n    },\r\n    {\r\n        name: \"Login\",\r\n        inherits: \"@budibase/standard-components/login\",\r\n        props: {}\r\n    },\r\n    ...selectNavContent({records, indexes, helpers})\r\n]\r\n\r\n\r\nexport const navItem = ({record}) => ({\r\n    title: record.collectionName,\r\n    component : {\r\n        _component: navContentComponentName(record)\r\n    }\r\n})\r\n\r\n"],"names":["component"],"mappings":"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"}
diff --git a/packages/bootstrap-components/src/Nav.svelte b/packages/bootstrap-components/src/Nav.svelte
index bf6048b86e..df750a16f9 100644
--- a/packages/bootstrap-components/src/Nav.svelte
+++ b/packages/bootstrap-components/src/Nav.svelte
@@ -4,7 +4,7 @@ export let items = [];
export let hideNavBar=false;
export let selectedItem="";
export let orientation="horizontal"; // horizontal, verical
-export let alignment="left"; // start, center, end
+export let alignment="start"; // start, center, end
export let pills=false;
export let fill=false;
export let _bb;
@@ -12,13 +12,20 @@ export let _bb;
let selectedIndex = -1;
let styleVars={};
let components = {};
-let componentElements = {}
+let componentElement;
let orientationClass="";
let navClasses="";
+let currentComponent;
+let _selectedItem="";
const hasComponentElements = () =>
Object.getOwnPropertyNames(componentElements).length > 0;
+const getSelectedItemByIndex = (index) =>
+ index >= 0
+ ? items[index].title
+ : "";
+
$: {
let _navClasses = "";
@@ -37,30 +44,54 @@ $: {
navClasses = _navClasses;
- if(items && items.length > 0 && hasComponentElements()) {
- const currentSelectedItem = selectedIndex > 0
- ? items[selectedIndex].title
- : "";
+
+ if(items ) {
+
+ const currentSelectedItem = getSelectedItemByIndex(selectedIndex);
+
if(selectedItem && currentSelectedItem !== selectedItem) {
let i=0;
for(let item of items) {
if(item.title === selectedItem) {
- onSelectItem(i)();
+ SelectItem(i);
}
i++;
}
- } else if(!currentSelectedItem) {
- onSelectItem(0);
+ } else if(!selectedItem) {
+ SelectItem(-1);
}
}
}
-const onSelectItem = (index) => () => {
+const SelectItem = (index) => {
+
selectedIndex = index;
- if(!components[index]) {
- const comp = _bb.hydrateComponent(
- items[index].component, componentElements[index]);
- components[index] = comp;
+ const newSelectedItem = getSelectedItemByIndex(index);
+ if(newSelectedItem !== selectedItem) {
+ selectedItem = newSelectedItem;
+ }
+
+ if(currentComponent) {
+ try {
+ currentComponent.$destroy();
+ } catch(_) {}
+ }
+
+ if(index >= 0)
+ currentComponent = _bb.hydrateComponent(
+ items[index].component, componentElement);
+
+}
+
+const onSelectItemClicked = index => () => {
+ if(_bb.bindings["selectedItem"]) {
+ // binding - call state, which should SelectItem(..)
+ const selectedItemBinding = _bb.bindings["selectedItem"];
+ _bb.setStateFromBinding(
+ selectedItemBinding, getSelectedItemByIndex(index))
+ } else {
+ // no binding - call this
+ SelectItem(index);
}
}
@@ -69,21 +100,22 @@ const onSelectItem = (index) => () => {
{#if !hideNavBar}
-
+
{/if}
{#each items as navItem, index}
-
@@ -93,36 +125,8 @@ const onSelectItem = (index) => () => {
.root {
height: 100%;
width:100%;
- grid-template-columns: [navbar] auto [content] 1fr;
- display: grid;
}
-.navbar {
- grid-column: navbar;
- background: var(--navBarBackground);
- border: var(--navBarBorder);
- color: var(--navBarColor);
-}
-
-.navitem {
- padding: 10px 17px;
- cursor: pointer;
-}
-
-.navitem:hover {
- background: var(--itemHoverBackground);
- color: var(--itemHoverColor);
-}
-
-.navitem.selected {
- background: var(--selectedItemBackground);
- border: var(--selectedItemBorder);
- color: var(--selectedItemColor);
-}
-
-.content {
- grid-column: content;
-}
diff --git a/packages/bootstrap-components/src/generators.js b/packages/bootstrap-components/src/generators.js
index 086f221cb7..2b2b98be76 100644
--- a/packages/bootstrap-components/src/generators.js
+++ b/packages/bootstrap-components/src/generators.js
@@ -1 +1,4 @@
-/*export { app } from "./generators/appGenerator";*/
\ No newline at end of file
+export { forms } from "./generators/formsGenerator";
+export { indexTables } from "./generators/indexTablesGenerator";
+export { app } from "./generators/appGenerator";
+export { recordHomePageComponents as recordHomepages } from "./generators/recordHomePageGenerator";
\ No newline at end of file
diff --git a/packages/bootstrap-components/src/generators/appGenerator.js b/packages/bootstrap-components/src/generators/appGenerator.js
new file mode 100644
index 0000000000..dbf41bfd72
--- /dev/null
+++ b/packages/bootstrap-components/src/generators/appGenerator.js
@@ -0,0 +1,36 @@
+import { navContentComponentName, selectNavContent } from "./selectedNavContentGenerator";
+import { recordHomepages } from "./recordHomePageGenerator";
+export const app = ({records, indexes, helpers}) => [
+ {
+ name: "Application Root",
+ inherits: "@budibase/bootstrap-components/nav",
+ props: {
+ items: recordHomepages({indexes, records})
+ .map(navItem),
+ orientation: "horizontal",
+ alignment: "start",
+ fill: false,
+ pills: true,
+ selectedItem: {
+ "##bbstate":"selectedNav",
+ "##bbstatefallback":`${records[0].name}`,
+ "##bbsource": "store"
+ }
+ }
+ },
+ {
+ name: "Login",
+ inherits: "@budibase/standard-components/login",
+ props: {}
+ },
+ ...selectNavContent({records, indexes, helpers})
+]
+
+
+export const navItem = ({record}) => ({
+ title: record.collectionName,
+ component : {
+ _component: navContentComponentName(record)
+ }
+})
+
diff --git a/packages/bootstrap-components/src/generators/buttonGenerators.js b/packages/bootstrap-components/src/generators/buttonGenerators.js
index 56cb180fd7..217b013080 100644
--- a/packages/bootstrap-components/src/generators/buttonGenerators.js
+++ b/packages/bootstrap-components/src/generators/buttonGenerators.js
@@ -12,7 +12,7 @@ export const buttons = () => [
description: "Bootstrap default button",
inherits: "@budibase/standard-components/button",
props: {
- className: "btn"
+ className: "btn btn-light"
}
}
]
\ No newline at end of file
diff --git a/packages/bootstrap-components/src/generators/formsGenerator.js b/packages/bootstrap-components/src/generators/formsGenerator.js
index 60c4db79c2..fe38040f46 100644
--- a/packages/bootstrap-components/src/generators/formsGenerator.js
+++ b/packages/bootstrap-components/src/generators/formsGenerator.js
@@ -1,19 +1,23 @@
-import {headers} from "./headersGenerator";
+import {buttons} from "./buttonGenerators";
-export const forms = ({records, indexes}) =>
- [...headers({records, indexes}),
- ...records.map(root)];
+export const forms = ({records, indexes, helpers}) =>
+ [
+ ...records.map(root),
+ ...buttons({records, indexes, helpers})
+ ];
+
+export const formName = record => `${record.name}/${record.name} Form`;
const root = record => ({
- name: `${record.name} Form`,
+ name: formName(record),
description: `Control for creating/updating '${record.nodeKey()}' `,
inherits: "@budibase/standard-components/div",
props: {
- direction: "vertical",
+ className:"p-1",
children: [
{
- control: {
- _component: "@budibase/standard-components/H3",
+ component: {
+ _component: "@budibase/standard-components/h3",
text: `Edit ${record.name}`,
}
},
@@ -24,51 +28,48 @@ const root = record => ({
})
const form = record => ({
- control: {
+ component: {
_component: "@budibase/standard-components/form",
formControls:
- record.fields.map(f => ({
- label: f.label,
- control: {
- _component: "@budibase/standard-components/input",
- value: {
- "##bbstate":`current${record.name}.${f.name}`,
- "##bbsource":"store"
- }
- }
- }))
+ record.fields.map(f => formControl(record, f))
}
})
const formControl = (record, field) => {
- if(field.type === "string" && field.typeOptions.values && values.typeOptions.length > 0) {
+ if(field.type === "string" && field.typeOptions.values && field.typeOptions.values.length > 0) {
return ({
- _component: "@budibase/standard-components/select",
- options: field.typeOptions.values.map(v => ({id:v, value:v})),
- value: {
- "##bbstate":`current${record.name}.${f.name}`,
- "##bbsource":"store"
+ control: {
+ _component: "@budibase/standard-components/select",
+ options: field.typeOptions.values.map(v => ({id:v, value:v})),
+ value: {
+ "##bbstate":`${record.name}.${field.name}`,
+ "##bbsource":"store"
+ },
+ className: "form-control"
},
- className: "form-control"
+ label: field.label
});
} else {
return ({
- _component: "@budibase/standard-components/input",
- value: {
- "##bbstate":`current${record.name}.${f.name}`,
- "##bbsource":"store"
+ control: {
+ _component: "@budibase/standard-components/input",
+ value: {
+ "##bbstate":`${record.name}.${field.name}`,
+ "##bbsource":"store"
+ },
+ className: "form-control",
+ type: field.type === "string" ? "text"
+ : field.type === "datetime" ? "date"
+ : field.type === "number" ? "number"
+ : "text"
},
- className: "form-control",
- type: field.type === "string" ? "text"
- : field.type === "datetime" ? "date"
- : field.type === "number" ? "number"
- : "text"
+ label: field.label
});
}
}
const saveCancelButtons = (record) => ({
- control: {
+ component: {
_component: "@budibase/standard-components/stackpanel",
direction: "horizontal",
children: [
@@ -79,7 +80,14 @@ const saveCancelButtons = (record) => ({
{
"##eventHandlerType": "Save Record",
parameters: {
- statePath: `current${record.name}`,
+ statePath: `${record.name}`,
+ }
+ },
+ {
+ "##eventHandlerType": "Set State",
+ parameters: {
+ path: `isEditing${record.name}`,
+ value: ""
}
}
]
@@ -89,9 +97,10 @@ const saveCancelButtons = (record) => ({
contentText: `Cancel`,
onClick: [
{
- "##eventHandlerType": "Save Record",
+ "##eventHandlerType": "Set State",
parameters: {
- statePath: `current${record.name}`,
+ path: `isEditing${record.name}`,
+ value: ""
}
}
]
@@ -102,9 +111,13 @@ const saveCancelButtons = (record) => ({
const paddedPanelForButton = (button) => ({
control: {
- _component: "@budibase/standard-components/panel",
- padding: "20px",
- component: button
+ _component: "@budibase/standard-components/div",
+ className: "btn-group",
+ children: [
+ {
+ component: button
+ }
+ ]
}
});
diff --git a/packages/bootstrap-components/src/generators/indexTablesGenerator.js b/packages/bootstrap-components/src/generators/indexTablesGenerator.js
index a04f2868a7..61f2c455ad 100644
--- a/packages/bootstrap-components/src/generators/indexTablesGenerator.js
+++ b/packages/bootstrap-components/src/generators/indexTablesGenerator.js
@@ -3,6 +3,8 @@ import { getRecordPath } from "./getRecordPath";
export const indexTables = ({indexes, helpers}) =>
indexes.map(i => indexTable(i, helpers));
+const excludedColumns = ["id", "isNew", "key", "type", "sortKey"];
+
export const indexTableProps = (index, helpers) => ({
data: {
"##bbstate":index.nodeKey(),
@@ -10,7 +12,10 @@ export const indexTableProps = (index, helpers) => ({
},
tableClass: "table table-hover",
theadClass: "thead-dark",
- columns: helpers.indexSchema(index).map(column),
+ columns: helpers
+ .indexSchema(index)
+ .filter(c => !excludedColumns.includes(c.name))
+ .map(column),
onRowClick: [
{
"##eventHandlerType": "Load Record",
@@ -36,8 +41,14 @@ export const indexTableProps = (index, helpers) => ({
]
});
-export const getIndexTableName = (index) =>
- `${getRecordPath}/${index.name} Table`
+export const getIndexTableName = (index, record) => {
+ record = record
+ || index.parent().type === "record" ? index.parent() : null;
+
+ return (record
+ ? `${getRecordPath(record)}/${index.name} Table`
+ : `${index.name} Table`);
+}
const indexTable = (index, helpers) => ({
name: getIndexTableName(index),
diff --git a/packages/bootstrap-components/src/generators/navGenerator.js b/packages/bootstrap-components/src/generators/navGenerator.js
deleted file mode 100644
index 92796c5eee..0000000000
--- a/packages/bootstrap-components/src/generators/navGenerator.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import {indexTables, getIndexTableName} from "./indexTablesGenerator";
-
-export const nav = ({records, indexes, helpers}) => [
- {
- name: "Application Root",
- inherits: "@budibase/bootstrap-components/nav",
- props: {
- items: indexes
- .filter(i => i.parent().type === "root")
- .map(navItem),
- orientation: "horizontal",
- alignment: "center",
- fill: true,
- pills: false
- }
- },
- ...indexTables({records, indexes, helpers})
-]
-
-
-export const navItem = (index) => ({
- title: index.name,
- component : {
- _component: getIndexTableName(index)
- }
-})
-
diff --git a/packages/bootstrap-components/src/generators/recordHomePageGenerator.js b/packages/bootstrap-components/src/generators/recordHomePageGenerator.js
new file mode 100644
index 0000000000..2488e00005
--- /dev/null
+++ b/packages/bootstrap-components/src/generators/recordHomePageGenerator.js
@@ -0,0 +1,133 @@
+import {
+ getIndexTableName, indexTables
+} from "./indexTablesGenerator";
+
+import {
+ buttons
+} from "./buttonGenerators";
+
+export const recordHomePageComponents = ({indexes, records, helpers}) =>
+ [
+ ...recordHomepages({indexes, records})
+ .map(component),
+
+ ...recordHomepages({indexes, records})
+ .map(homePageButtons),
+
+ ...indexTables({indexes, records, helpers}),
+
+ ...buttons({indexes, buttons, helpers})
+ ]
+
+
+const findIndexForRecord = (indexes, record) => {
+ const forRecord = indexes.filter(i => i.allowedRecordNodeIds.includes(record.nodeId));
+ if(forRecord.length === 0) return;
+ if(forRecord.length === 1) return forRecord[0];
+ const noMap = forRecord.filter(i => !i.filter || !i.filter.trim());
+ if(noMap.length === 0) forRecord[0];
+ return noMap[0];
+}
+
+export const recordHomepages = ({indexes, records}) =>
+ records.filter(r => r.parent().type === "root")
+ .map(r =>({
+ record:r,
+ index:findIndexForRecord(indexes, r)
+ }))
+ .filter(r => r.index);
+
+
+export const homepageComponentName = (record) =>
+ `${record.name}/${record.name} homepage`;
+
+const component = ({record, index}) => ({
+ inherits: "@budibase/standard-components/div",
+ name: homepageComponentName(record),
+ props: {
+ className: "p-3",
+ children: [
+ {
+ component: {
+ _component: "@budibase/standard-components/h2",
+ text: record.collectionName
+ }
+ },
+ {
+ component: {
+ _component: `${record.name}/homepage buttons`,
+ }
+ },
+ {
+ component: {
+ _component: getIndexTableName(index)
+ }
+ }
+ ],
+ onLoad: [
+ {
+ "##eventHandlerType": "Set State",
+ parameters: {
+ path: `isEditing${record.name}`,
+ value: ""
+ }
+ },
+ {
+ "##eventHandlerType": "List Records",
+ parameters: {
+ statePath: index.nodeKey(),
+ indexKey: index.nodeKey()
+ }
+ }
+ ]
+ }
+
+});
+
+const homePageButtons = ({index, record}) => ({
+ inherits: "@budibase/standard-components/div",
+ name: `${record.name}/homepage buttons`,
+ props: {
+ className: "btn-group",
+ children: [
+ {
+ component: {
+ _component: "common/Default Button",
+ contentText: `Create ${record.name}`,
+ onClick: [
+ {
+ "##eventHandlerType": "Get New Record",
+ parameters: {
+ statePath: record.name,
+ collectionKey: `/${record.collectionName}`,
+ childRecordType: record.name
+ }
+ },
+ {
+ "##eventHandlerType": "Set State",
+ parameters: {
+ path: `isEditing${record.name}`,
+ value: "true"
+ }
+ }
+ ]
+ }
+ },
+ {
+ component: {
+ _component: "common/Default Button",
+ contentText: `Refresh`,
+ onClick: [
+ {
+ "##eventHandlerType": "List Records",
+ parameters: {
+ statePath: index.nodeKey(),
+ indexKey: index.nodeKey()
+ }
+ }
+ ]
+ }
+ }
+ ]
+ }
+})
\ No newline at end of file
diff --git a/packages/bootstrap-components/src/generators/rootContentGenerator.js b/packages/bootstrap-components/src/generators/rootContentGenerator.js
deleted file mode 100644
index b7816b66bf..0000000000
--- a/packages/bootstrap-components/src/generators/rootContentGenerator.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import {getIndexTableName} from "./indexTablesGenerator";
-
-export const rootContent = ({indexes, records, helpers}) =>
- record.filter(r => r.parent().type === "root")
- .map(r =>({
- record,
- index:findIndexForRecord(indexes, r)
- }))
- .filter(r => r.index)
- .map(component)
-
-
-const findIndexForRecord = (indexes, record) => {
- const forRecord = indexes.filter(i => i.allowedRecordNodeIds.includes(record.nodeId));
- if(forRecord.length === 0) return;
- if(forRecord.length === 1) return forRecord[0];
- const noMap = forRecord.filter(i => !i.filter || !i.filter.trim());
- if(noMap.length === 0) forRecord[0];
- return noMap[0];
-}
-
-const component = (recordAndIndex) => ({
- _component: "@budibase/standard-components/div",
- className: "p-3",
- children: [
- {
- component: {
- _component: "@budibase/standard-components/H2",
- text: recordAndIndex.record.collectionName
- }
- },
- {
- component: {
- _component: getIndexTableName(recordAndIndex.index)
- }
- }
- ]
-
-})
\ No newline at end of file
diff --git a/packages/bootstrap-components/src/generators/selectedNavContentGenerator.js b/packages/bootstrap-components/src/generators/selectedNavContentGenerator.js
new file mode 100644
index 0000000000..f699917c12
--- /dev/null
+++ b/packages/bootstrap-components/src/generators/selectedNavContentGenerator.js
@@ -0,0 +1,36 @@
+import {
+ recordHomepages,
+ homepageComponentName,
+ recordHomePageComponents
+} from "./recordHomePageGenerator";
+import { formName, forms } from "./formsGenerator";
+
+export const selectNavContent = ({indexes, records, helpers}) =>
+ [
+ ...recordHomepages({indexes, records})
+ .map(component),
+
+ ...recordHomePageComponents({indexes, records, helpers}),
+
+ ...forms({indexes, records, helpers})
+
+ ]
+
+
+export const navContentComponentName = record =>
+ `${record.name}/${record.name} Nav Content`;
+
+const component = ({record, index}) => ({
+ inherits: "@budibase/standard-components/if",
+ description: `the component that gets displayed when the ${record.collectionName} nav is selected`,
+ name: navContentComponentName(record),
+ props: {
+ condition: `$store.isEditing${record.name}`,
+ thenComponent: {
+ _component: formName(record)
+ },
+ elseComponent: {
+ _component: homepageComponentName(record)
+ }
+ }
+});
\ No newline at end of file
diff --git a/packages/bootstrap-components/src/index.js b/packages/bootstrap-components/src/index.js
index 5a7c3e87fc..03b8c903c7 100644
--- a/packages/bootstrap-components/src/index.js
+++ b/packages/bootstrap-components/src/index.js
@@ -1,2 +1,3 @@
-/*export {default as button} from "./Button.svelte";*/
+export {default as form} from "./Form.svelte";
+export {default as nav} from "./Nav.svelte";
diff --git a/packages/builder/src/builderStore/store.js b/packages/builder/src/builderStore/store.js
index 75cd6a3d20..6d6ca1983d 100644
--- a/packages/builder/src/builderStore/store.js
+++ b/packages/builder/src/builderStore/store.js
@@ -3,7 +3,7 @@ import {
} from "../../../core/src";
import {
filter, cloneDeep, sortBy,
- map, last, keys, concat,
+ map, last, keys, concat, keyBy,
find, isEmpty, reduce, values
} from "lodash/fp";
import {
@@ -124,10 +124,7 @@ const initialise = (store, initial) => async () => {
initial.generators = generatorsArray(pkg.rootComponents.generators);
initial.allComponents = combineComponents(
pkg.derivedComponents, pkg.rootComponents.components);
- initial.actions = reduce((arr, action) => {
- arr.push(action);
- return arr;
- })(pkg.appDefinition.actions, []);
+ initial.actions = values(pkg.appDefinition.actions);
initial.triggers = pkg.appDefinition.triggers;
if(!!initial.hierarchy && !isEmpty(initial.hierarchy)) {
@@ -662,7 +659,7 @@ const savePackage = (store, s) => {
const appDefinition = {
hierarchy:s.hierarchy,
triggers:s.triggers,
- actions: s.actions,
+ actions: keyBy("name")(s.actions),
props: {
main: buildPropsHierarchy(s.allComponents, s.pages.main.appBody),
unauthenticated: buildPropsHierarchy(s.allComponents, s.pages.unauthenticated.appBody)
diff --git a/packages/builder/src/common/core.js b/packages/builder/src/common/core.js
index b30733c3bd..73aab993b1 100644
--- a/packages/builder/src/common/core.js
+++ b/packages/builder/src/common/core.js
@@ -7,6 +7,8 @@ import {
generateSchema
} from "../../../core/src/indexing/indexSchemaCreator";
+export { userWithFullAccess } from "../../../core/src/index";
+
export const pipe = common.$;
export const events = common.eventsList;
diff --git a/packages/builder/src/common/eventHandlers.js b/packages/builder/src/common/eventHandlers.js
index d851aa239d..db879ca580 100644
--- a/packages/builder/src/common/eventHandlers.js
+++ b/packages/builder/src/common/eventHandlers.js
@@ -1,13 +1,23 @@
import {
eventHandlers
} from "../../../client/src/state/eventHandlers";
-
+import {writable} from "svelte/store";
export {
EVENT_TYPE_MEMBER_NAME
} from "../../../client/src/state/eventHandlers";
+ import {
+ createCoreApi
+} from "../../../client/src/core";
-export const allHandlers = () => {
- const handlersObj = eventHandlers({}, {});
+export const allHandlers = (appDefinition, user) => {
+
+ const coreApi = createCoreApi(appDefinition, user);
+ appDefinition.hierarchy = coreApi.templateApi.constructHierarchy(appDefinition.hierarchy);
+ const store = writable({
+ _bbuser: user
+ });
+
+ const handlersObj = eventHandlers(store, coreApi);
const handlersArray = [];
for(let key in handlersObj) {
handlersArray.push({name:key, ...handlersObj[key]});
diff --git a/packages/builder/src/userInterface/CurrentItemPreview.svelte b/packages/builder/src/userInterface/CurrentItemPreview.svelte
index 6cbda17b59..8b7e89c140 100644
--- a/packages/builder/src/userInterface/CurrentItemPreview.svelte
+++ b/packages/builder/src/userInterface/CurrentItemPreview.svelte
@@ -24,7 +24,8 @@ store.subscribe(s => {
]);
appDefinition = {
componentLibraries: s.loadLibraryUrls(),
- props: buildPropsHierarchy(s.allComponents, s.currentFrontEndItem)
+ props: buildPropsHierarchy(s.allComponents, s.currentFrontEndItem),
+ hierarchy: s.hierarchy
};
});
diff --git a/packages/builder/src/userInterface/EventSelector.svelte b/packages/builder/src/userInterface/EventSelector.svelte
index c9e90546ae..6c91ddcf5c 100644
--- a/packages/builder/src/userInterface/EventSelector.svelte
+++ b/packages/builder/src/userInterface/EventSelector.svelte
@@ -2,20 +2,30 @@
import IconButton from "../common/IconButton.svelte";
import StateBindingControl from "./StateBindingControl.svelte";
import {
- find, map, keys, reduce
+ find, map, keys, reduce, keyBy
} from "lodash/fp";
-import { pipe } from "../common/core";
+import { pipe, userWithFullAccess } from "../common/core";
import { EVENT_TYPE_MEMBER_NAME, allHandlers } from "../common/eventHandlers";
+import { store } from "../builderStore";
export let event;
export let onChanged;
export let onRemoved;
-const events = allHandlers();
-
+let events;
let eventType;
let parameters = [];
+store.subscribe(s => {
+ events = allHandlers(
+ {hierarchy: s.hierarchy},
+ userWithFullAccess({
+ hierarchy: s.hierarchy,
+ actions: keyBy("name")(s.actions)
+ })
+ );
+});
+
$: {
if(event) {
eventType = event[EVENT_TYPE_MEMBER_NAME];
diff --git a/packages/builder/src/userInterface/StateBindingControl.svelte b/packages/builder/src/userInterface/StateBindingControl.svelte
index d2bbaaa1c4..22108e2f99 100644
--- a/packages/builder/src/userInterface/StateBindingControl.svelte
+++ b/packages/builder/src/userInterface/StateBindingControl.svelte
@@ -117,14 +117,14 @@ const makeBinding = () => {
value = !value}/>
+ on:click={() => onChanged(!value)}/>
{:else if type === "options"}