@processmaker/modeler 1.35.1 → 1.36.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/modeler",
-  "version": "1.35.1",
+  "version": "1.36.1",
   "scripts": {
     "serve": "vue-cli-service serve",
     "open-cypress": "TZ=UTC cypress open",

package/src/components/inspectors/IntermediateTimer.vue

@@ -19,7 +19,7 @@ import DurationExpression from './DurationExpression';
 import DateTimeExpression from './DateTimeExpression';
 import CycleExpression from './CycleExpression';
 import { DateTime } from 'luxon';
-import { defaultDurationValue } from '@/components/nodes/intermediateTimerEvent';
+import { defaultDurationTimerEvent } from '@/constants';
 
 const types = {
   timeDuration: 'DurationExpression',
@@ -61,7 +61,7 @@ export default {
   methods: {
     changeType(type) {
       const defaultValue = (this.isDelayType(type) || this.isCycleType(type))
-        ? defaultDurationValue
+        ? defaultDurationTimerEvent
         : DateTime
           .local()
           .toUTC()

package/src/components/nodes/boundaryTimerEvent/index.js

@@ -6,8 +6,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import interruptingToggleConfig from '../boundaryEvent/interruptingToggleInspector';
 import advancedAccordionConfig from '@/components/inspectors/advancedAccordionConfig';
 import documentationAccordionConfig from '@/components/inspectors/documentationAccordionConfig';
-
-export const defaultDurationValue = 'PT1H';
+import { defaultDurationTimerEvent } from '@/constants';
 
 export const id = 'processmaker-modeler-boundary-timer-event';
 
@@ -24,7 +23,7 @@ export default merge(cloneDeep(boundaryEventConfig), {
       eventDefinitions: [
         moddle.create('bpmn:TimerEventDefinition', {
           timeDuration: moddle.create('bpmn:Expression', {
-            body: defaultDurationValue,
+            body: defaultDurationTimerEvent,
           }),
         }),
       ],

package/src/components/nodes/intermediateTimerEvent/index.js

@@ -4,8 +4,8 @@ import nameConfigSettings from '@/components/inspectors/nameConfigSettings';
 import advancedAccordionConfig from '@/components/inspectors/advancedAccordionConfig';
 import documentationAccordionConfig from '@/components/inspectors/documentationAccordionConfig';
 import defaultNames from '@/components/nodes/intermediateEvent/defaultNames';
+import { defaultDurationTimerEvent } from '@/constants';
 
-export const defaultDurationValue = 'PT1H';
 const id = 'processmaker-modeler-intermediate-catch-timer-event';
 
 export default {
@@ -67,7 +67,7 @@ export default {
       eventDefinitions: [
         moddle.create('bpmn:TimerEventDefinition', {
           timeDuration: moddle.create('bpmn:Expression', {
-            body: defaultDurationValue,
+            body: defaultDurationTimerEvent,
           }),
         }),
       ],

package/src/components/railBottom/undoRedoControl/UndoRedoControl.vue

@@ -4,7 +4,7 @@
       class="ur-button"
       data-cy="undo-control"
       :disabled="!canUndo"
-      v-b-tooltip.hover
+      v-b-tooltip.hover.viewport.d50="{ customClass: 'no-pointer-events' }"
       :title="$t('Undo')"
       @click="undo"
     >
@@ -15,7 +15,7 @@
       class="ur-button"
       data-cy="redo-control"
       :disabled="!canRedo"
-      v-b-tooltip.hover
+      v-b-tooltip.hover.viewport.d50="{ customClass: 'no-pointer-events' }"
       :title="$t('Redo')"
       @click="redo"
     >

package/src/components/toolbar/ToolBar.vue

@@ -64,17 +64,42 @@
               data-cy="ellipsis-menu"
             />
           </template>
-          <button
+          <template
             v-else
-            class="save-button"
-            data-test="mini-map-btn"
-            v-b-tooltip.hover
-            :title="$t('Save')"
-            @click="$emit('saveBpmn')"
           >
-            <font-awesome-icon :icon="saveIcon" />
-            <span class="save-button-label">{{ $t('Save') }}</span>
-          </button>
+            <button
+              class="save-button"
+              data-test="mini-map-btn"
+              v-b-tooltip.hover
+              :title="$t('Save')"
+              @click="$emit('saveBpmn')"
+            >
+              <font-awesome-icon :icon="saveIcon" />
+              <span class="save-button-label">{{ $t('Save') }}</span>
+            </button>
+
+            <b-btn
+              class="ml-1 rounded"
+              :disabled="!xmlManager"
+              variant="secondary"
+              size="sm"
+              data-test="downloadXMLBtn"
+              @click="xmlManager && xmlManager.download()"
+            >
+              <i class="fas fa-download mr-1"/>
+              {{ $t('Download BPMN') }}
+            </b-btn>
+
+            <b-btn
+              variant="secondary"
+              size="sm"
+              v-b-modal="'uploadmodal'"
+              class="ml-1 rounded"
+            >
+              <i class="fas fa-upload mr-1"/>
+              {{ $t('Upload XML') }}
+            </b-btn>
+          </template>
         </div>
       </div>
     </div>

package/src/constants.js

@@ -0,0 +1 @@
+export const defaultDurationTimerEvent = 'PT1H';

package/src/mixins/clickAndDrop.js

@@ -86,6 +86,7 @@ export default {
       this.yOffset = event.clientY - sourceElement.getBoundingClientRect().top;
     },
     deselect() {
+      window.ProcessMaker.EventBus.$off('custom-pointerclick');
       document.removeEventListener('mousemove', this.setDraggingPosition);
       if (this.movedElement) {
         document.body.removeChild(this.movedElement);