diff --git a/angular.json b/angular.json index 8bc7ec2..b948d62 100644 --- a/angular.json +++ b/angular.json @@ -33,12 +33,12 @@ "src/assets" ], "styles": [ - "node_modules/bpmn-js-properties-panel/dist/assets/bpmn-js-properties-panel.css", + "node_modules/bpmn-js-properties-panel/dist/assets/properties-panel.css", "node_modules/bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css", "node_modules/bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css", "node_modules/bpmn-js/dist/assets/bpmn-font/css/bpmn.css", "node_modules/bpmn-js/dist/assets/diagram-js.css", - "node_modules/dmn-js-properties-panel/dist/assets/dmn-js-properties-panel.css", + "node_modules/dmn-js-properties-panel/dist/assets/properties-panel.css", "node_modules/diagram-js-minimap/assets/diagram-js-minimap.css", "node_modules/dmn-js/dist/assets/diagram-js.css", "node_modules/dmn-js/dist/assets/dmn-font/css/dmn-codes.css", diff --git a/src/app/diagram/bpmn-modeler-config.ts b/src/app/diagram/bpmn-modeler-config.ts index c212837..1603f8c 100644 --- a/src/app/diagram/bpmn-modeler-config.ts +++ b/src/app/diagram/bpmn-modeler-config.ts @@ -1,5 +1,10 @@ -import propertiesPanelModule from 'bpmn-js-properties-panel'; -import propertiesProviderModule from 'bpmn-js-properties-panel/lib/provider/camunda'; +import { + BpmnPropertiesPanelModule, + BpmnPropertiesProviderModule, + CamundaPlatformPropertiesProviderModule +} from 'bpmn-js-properties-panel'; +// use Camunda Platform properties provider + import * as camundaModdleDescriptor from 'camunda-bpmn-moddle/resources/camunda.json'; import minimapModule from 'diagram-js-minimap'; import codeModule from 'diagram-js-code-editor'; @@ -7,10 +12,12 @@ import {ModelerConfig} from '../_interfaces/modeler-config'; export const bpmnModelerConfig: ModelerConfig = { additionalModules: [ - propertiesProviderModule, - propertiesPanelModule, - minimapModule, - codeModule, + BpmnPropertiesPanelModule, + BpmnPropertiesProviderModule, + CamundaPlatformPropertiesProviderModule, +// CamundaExtensionModule, + minimapModule, + codeModule, ], moddleExtensions: { camunda: camundaModdleDescriptor diff --git a/src/app/diagram/dmn-modeler-config.ts b/src/app/diagram/dmn-modeler-config.ts index 96e4874..97a257e 100644 --- a/src/app/diagram/dmn-modeler-config.ts +++ b/src/app/diagram/dmn-modeler-config.ts @@ -1,14 +1,15 @@ -import propertiesPanelModule from 'dmn-js-properties-panel'; -import drdAdapterModule from 'dmn-js-properties-panel/lib/adapter/drd'; -import propertiesProviderModule from 'dmn-js-properties-panel/lib/provider/camunda'; +import { + DmnPropertiesProviderModule, + DmnPropertiesPanelModule +} from 'dmn-js-properties-panel'; import * as camundaModdleDescriptor from 'camunda-dmn-moddle/resources/camunda.json'; import {ModelerConfig} from '../_interfaces/modeler-config'; export const dmnModelerConfig: ModelerConfig = { additionalModules: [ - propertiesProviderModule, - propertiesPanelModule, - drdAdapterModule, + DmnPropertiesProviderModule, + DmnPropertiesPanelModule, +// drdAdapterModule, ], moddleExtensions: { camunda: camundaModdleDescriptor diff --git a/src/styles.scss b/src/styles.scss index d99bc12..850db67 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -1,5 +1,5 @@ /* bpmn-js */ -@import '../node_modules/bpmn-js-properties-panel/dist/assets/bpmn-js-properties-panel.css'; +@import '../node_modules/bpmn-js-properties-panel/dist/assets/properties-panel.css'; @import '../node_modules/diagram-js-minimap/assets/diagram-js-minimap.css'; @import '../node_modules/diagram-js-code-editor/assets/diagram-js-code-editor.css'; @import '../node_modules/bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css'; @@ -8,7 +8,7 @@ @import '../node_modules/bpmn-js/dist/assets/diagram-js.css'; /* dmn-js */ -@import '../node_modules/dmn-js-properties-panel/dist/assets/dmn-js-properties-panel.css'; +@import '../node_modules/dmn-js-properties-panel/dist/assets/properties-panel.css'; @import '../node_modules/dmn-js/dist/assets/diagram-js.css'; @import '../node_modules/dmn-js/dist/assets/dmn-font/css/dmn-codes.css'; @import '../node_modules/dmn-js/dist/assets/dmn-font/css/dmn-embedded.css';