Browse Source
Merge pull request #697 from Budibase/bug/link-id-create-table-error
Minor bug fix for template screens and fixing link doc IDs
gh-pages
Michael Drury
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
10 additions and
3 deletions
-
packages/builder/src/builderStore/storeUtils.js
-
packages/builder/src/components/backend/ModelNavigator/modals/CreateTableModal.svelte
-
packages/server/src/db/utils.js
|
|
|
@ -36,7 +36,8 @@ export const saveCurrentPreviewItem = s => |
|
|
|
: saveScreenApi(s.currentPreviewItem, s) |
|
|
|
|
|
|
|
export const savePage = async s => { |
|
|
|
const page = s.pages[s.currentPageName] |
|
|
|
const pageName = s.currentPageName || "main" |
|
|
|
const page = s.pages[pageName] |
|
|
|
await api.post(`/_builder/api/${s.appId}/pages/${s.currentPageName}`, { |
|
|
|
page: { componentLibraries: s.pages.componentLibraries, ...page }, |
|
|
|
uiFunctions: s.currentPageFunctions, |
|
|
|
|
|
|
|
@ -41,7 +41,6 @@ |
|
|
|
.map(template => template.create()) |
|
|
|
|
|
|
|
for (let screen of screens) { |
|
|
|
console.log(JSON.stringify(screen)) |
|
|
|
try { |
|
|
|
await store.createScreen(screen) |
|
|
|
} catch (_) { |
|
|
|
|
|
|
|
@ -124,7 +124,14 @@ exports.generateAutomationID = () => { |
|
|
|
* @returns {string} The new link doc ID which the automation doc can be stored under. |
|
|
|
*/ |
|
|
|
exports.generateLinkID = (modelId1, modelId2, recordId1, recordId2) => { |
|
|
|
return `${DocumentTypes.AUTOMATION}${SEPARATOR}${modelId1}${SEPARATOR}${modelId2}${SEPARATOR}${recordId1}${SEPARATOR}${recordId2}` |
|
|
|
return `${DocumentTypes.LINK}${SEPARATOR}${modelId1}${SEPARATOR}${modelId2}${SEPARATOR}${recordId1}${SEPARATOR}${recordId2}` |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* Gets parameters for retrieving link docs, this is a utility function for the getDocParams function. |
|
|
|
*/ |
|
|
|
exports.getLinkParams = (otherProps = {}) => { |
|
|
|
return getDocParams(DocumentTypes.LINK, null, otherProps) |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
|