Skip to content

Commit 299bd1c

Browse files
authored
Merge pull request #1634 from msupply-foundation/1090B-database-upgrade-fix
1090B Database upgrade fix
2 parents 0f70b7c + d28cf31 commit 299bd1c

4 files changed

Lines changed: 330 additions & 398 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "conforma-web-app",
3-
"version": "0.7.9-34",
3+
"version": "0.7.9-39",
44
"main": "index.tsx",
55
"license": "MIT",
66
"repository": {

src/containers/TemplateBuilder/template/Form/Elements.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,8 @@ const getNewElement = (applicationId: number, index: number) => ({
251251
applicationResponsesUsingId: {
252252
create: [{ applicationId }],
253253
},
254+
templateCode: '__Temp',
255+
templateVersion: '__Temp',
254256
})
255257

256258
export default Elements

src/containers/TemplateBuilder/template/Form/Pages.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const Pages: React.FC = () => {
1717
const { updateTemplateSection } = useOperationState()
1818

1919
const {
20-
template: { canEdit },
20+
template: { canEdit, code, versionId },
2121
} = useTemplateState()
2222

2323
if (selectedSectionId === -1) return null
@@ -35,6 +35,8 @@ const Pages: React.FC = () => {
3535
category: TemplateElementCategory.Information,
3636
elementTypePluginCode: 'pageBreak',
3737
title: 'Page Break',
38+
templateCode: code,
39+
templateVersion: versionId,
3840
},
3941
{
4042
code: `placeholderElement_${getRandomNumber()}`,
@@ -45,6 +47,8 @@ const Pages: React.FC = () => {
4547
},
4648
elementTypePluginCode: 'textInfo',
4749
title: 'Placeholder Element',
50+
templateCode: code,
51+
templateVersion: versionId,
4852
},
4953
],
5054
},
@@ -150,7 +154,7 @@ const Page: React.FC = () => {
150154
const PageMove: React.FC = () => {
151155
const { selectedPageNumber, selectedSectionId, setSelectedPageNumber } = useFormState()
152156
const {
153-
template: { canEdit },
157+
template: { canEdit, code, versionId },
154158
} = useTemplateState()
155159
const { updateTemplateSection } = useOperationState()
156160
const { moveStructure } = useFormStructureState()
@@ -228,6 +232,8 @@ const PageMove: React.FC = () => {
228232
category: TemplateElementCategory.Information,
229233
elementTypePluginCode: 'pageBreak',
230234
title: 'Page Break',
235+
templateCode: code,
236+
templateVersion: versionId,
231237
},
232238
],
233239
connectById: pageElements.map(({ id }) => ({

0 commit comments

Comments
 (0)