Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@camunda8/sap-btp-plugin",
"version": "1.0.3",
"version": "1.0.4",
"description": "mono repo for the Camunda BTP plugin, part of the SAP Integration",
"repository": "https://github.com/camunda/sap-btp-plugin",
"license": "Camunda License 1.0",
Expand Down
2 changes: 1 addition & 1 deletion user-task-fiori/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@camunda8/user-task-fiori",
"version": "1.0.0",
"version": "1.0.1",
"description": "rendering Camunda Forms into the Fiori Design System",
"license": "Camunda License 1.0",
"repository": "https://github.com/camunda/sap-btp-plugin",
Expand Down
7 changes: 4 additions & 3 deletions user-task-fiori/src/BPMNForm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import Core from "sap/ui/core/Core"
import type { MetadataOptions } from "sap/ui/core/Element"
import EventBus from "sap/ui/core/EventBus"
import { ValueState } from "sap/ui/core/library"
import JSONModel from "sap/ui/model/json/JSONModel"
import BPMNFormRenderer from "./BPMNFormRenderer"
import { BPMNformData, Component, ControlType, GeneratedControl, userFormData } from "./BPMNformData"
import CheckBox from "sap/m/CheckBox"
Expand All @@ -37,7 +36,6 @@ import {
addTextArea
} from "./creations/index"
import HBox from "sap/m/HBox"
import Title from "sap/m/Title"
import Icon from "sap/ui/core/Icon"
import DeepJSONModel from "./model/DeepJSONModel"

Expand Down Expand Up @@ -318,11 +316,13 @@ export default class BPMNForm extends Control {
processForm(data: WebSocketData): void {
const formData = JSON.parse(data.formData) as BPMNformData

// populate local model with variables from server for use in UI conditions

// populate local model with variables from server for use in UI conditions later
this._updateFormVariables(data.variables)

// create controls and add to stage
this._generateControls(formData.components)

}

getLocalModel(): DeepJSONModel {
Expand All @@ -336,6 +336,7 @@ export default class BPMNForm extends Control {

_updateFormVariables(variables: { [index: string]: string }): void {
for (const key in variables) {
this.getLocalModel().setProperty(`/BPMNform/${key}`, variables[key])
this.getLocalModel().setProperty(`/BPMNform/variables/${key}`, variables[key])
}
}
Expand Down