Merge branch 'develop' into FOUR-8352

ProcessMaker · Jul 21, 2023 · 1a46dd1 · 1a46dd1
2 parents fdea9e8 + d29adb0
commit 1a46dd1
Show file tree

Hide file tree

Showing 104 changed files with 825 additions and 1,276 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -38,7 +38,7 @@ jobs:
     - run: ls -la
     - run:
         name: before tests
-        command: circleci tests glob "tests/e2e/*/*.js" | circleci tests split > circleci.tests && sed -i 's/No timing found for "//g' circleci.tests && sed -i 's/"//g' circleci.tests && grep "\S" circleci.tests > uno.txt && mv uno.txt circleci.tests && cat circleci.tests    
+        command: circleci tests glob "tests/e2e/**/*.js" | circleci tests split > circleci.tests && sed -i 's/No timing found for "//g' circleci.tests && sed -i 's/"//g' circleci.tests && grep "\S" circleci.tests > uno.txt && mv uno.txt circleci.tests && cat circleci.tests
     - run:
         name: run tests    
         command:  TZ=UTC npx vue-cli-service test:e2e --mode test --headless --browser chrome --reporter mocha-junit-reporter --reporter-options mochaFile=reports/mocha/test-results.xml --spec $(cat circleci.tests | tr "\n" ",")
@@ -50,6 +50,8 @@ jobs:
           - coverage/
         key: pm-{{ .Environment.CIRCLE_NODE_INDEX }}-{{ .Branch }}-{{ .Environment.CIRCLE_WORKFLOW_ID }}-coverage.json
     - run: ls -la coverage
+    - store_artifacts:
+        path: tests/e2e/screenshots
   cypress/report:
     docker:
     - image: cypress/base:14.16.0

diff --git a/.github/workflows/deploy-package.yml b/.github/workflows/deploy-package.yml
@@ -0,0 +1,10 @@
+name: Build Package Modeler
+on:
+  pull_request:
+    types: [opened, reopened, synchronize, edited, closed]
+  workflow_dispatch:  
+jobs:
+  run_deploy:
+    name: Run Build PM4-workflow
+    uses: processmaker/processmaker/.github/workflows/deploy-pm4.yml@develop
+    secrets: inherit
diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
@@ -0,0 +1,29 @@
+name: SonarQube
+
+on:
+  push:
+    branches:
+      - develop
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  build:
+    name: Scan
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - uses: sonarsource/sonarqube-scan-action@master
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
+      # If you wish to fail your job when the Quality Gate is red, uncomment the
+      # following lines. This would typically be used to fail a deployment.
+      # We do not recommend to use this in a pull request. Prefer using pull request
+      # decoration instead.
+      # - uses: sonarsource/sonarqube-quality-gate-action@master
+      #   timeout-minutes: 5
+      #   env:
+      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/cypress.json b/cypress.json
@@ -2,5 +2,5 @@
   "pluginsFile": "tests/e2e/plugins/index.js",
   "baseUrl": "http://localhost:8080",
   "video": false,
-  "numTestsKeptInMemory": 0
+  "screenshotOnRunFailure": true
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/modeler",
-  "version": "1.33.0",
+  "version": "1.36.0",
   "scripts": {
     "serve": "vue-cli-service serve",
     "open-cypress": "TZ=UTC cypress open",

diff --git a/sonar-project.properties b/sonar-project.properties
@@ -0,0 +1 @@
+sonar.projectKey=ProcessMaker_modeler_AYlHU_0axYvY_isvKt6U
diff --git a/src/components/crown/crownButtons/genericFlowButton.vue b/src/components/crown/crownButtons/genericFlowButton.vue
@@ -33,6 +33,7 @@ const dontShowOn = [
   'processmaker-modeler-terminate-end-event',
   'processmaker-modeler-text-annotation',
   'processmaker-modeler-sequence-flow',
+  'processmaker-modeler-message-flow',
 ];
 
 export default {

diff --git a/src/components/crown/crownButtons/icons/faAlignBottom.js b/src/components/crown/crownButtons/icons/faAlignBottom.js
@@ -2,10 +2,10 @@ export const faAlignBottom = {
   prefix: 'fpm',
   iconName: 'fa-align-bottom',
   icon: [
-    16,
-    16,
+    24,
+    24,
     [],
     'e001',
-    'M6.637 1.076a1 1 0 0 0-.562.538l-.062.133v10.506l.07.147c.146.307.427.524.755.584.212.039 2.112.039 2.324 0 .328-.06.609-.277.755-.584l.07-.147V1.747l-.07-.147a1.016 1.016 0 0 0-.471-.486l-.178-.087-1.241-.007-1.24-.006-.15.062M1.29 14.051a.507.507 0 0 0-.229.686.707.707 0 0 0 .293.243c.095.026 13.197.026 13.292 0a.707.707 0 0 0 .293-.243.507.507 0 0 0-.229-.686c-.106-.048-.321-.05-6.71-.05s-6.604.002-6.71.05',
+    'M6.76 10.54v6.54h3.92V4H6.76v6.54m7.2 2.3v4.24h3.92V8.6h-3.92v4.24M3 18.9v.5h18.64v-1H3v.5',
   ],
 };
diff --git a/src/components/crown/crownButtons/icons/faAlignLeft.js b/src/components/crown/crownButtons/icons/faAlignLeft.js
@@ -2,10 +2,10 @@ export const faAlignLeft = {
   prefix: 'fpm',
   iconName: 'fa-align-left',
   icon: [
-    16,
-    16,
+    24,
+    24,
     [],
     'e001',
-    'M1.266 1.063a.637.637 0 0 0-.246.292c-.026.094-.026 13.197 0 13.291a.707.707 0 0 0 .243.293.507.507 0 0 0 .686-.229c.048-.106.05-.321.05-6.704.001-7.105.009-6.691-.127-6.841-.133-.148-.445-.2-.606-.102m2.468 4.98a.994.994 0 0 0-.718.796c-.039.211-.039 2.111 0 2.323.06.328.277.609.584.755l.147.07h10.506l.147-.07c.307-.146.524-.427.584-.755.039-.212.039-2.112 0-2.323a1 1 0 0 0-.445-.675c-.271-.174.077-.164-5.551-.162-4.405.001-5.128.007-5.254.041',
+    'M4 12.32v9.32h1V3H4v9.32m2.28-3.6v1.96h8.52V6.76H6.28v1.96m0 7.2v1.96h13.08v-3.92H6.28v1.96',
   ],
 };
diff --git a/src/components/crown/crownButtons/icons/faAlignRight.js b/src/components/crown/crownButtons/icons/faAlignRight.js
@@ -2,10 +2,10 @@ export const faAlignRight = {
   prefix: 'fpm',
   iconName: 'fa-align-right',
   icon: [
-    16,
-    16,
+    24,
+    24,
     [],
     'e001',
-    'M14.28 1.058a.433.433 0 0 0-.23.235c-.047.103-.049.359-.049 6.707 0 6.389.002 6.604.05 6.71.114.251.441.36.686.229a.707.707 0 0 0 .243-.293c.026-.095.026-13.197 0-13.292a.625.625 0 0 0-.279-.305.602.602 0 0 0-.421.009M1.734 6.043a.994.994 0 0 0-.718.796c-.039.211-.039 2.111 0 2.323.06.328.277.609.584.755l.147.07h10.506l.147-.07c.307-.146.524-.427.584-.755.039-.212.039-2.112 0-2.323a1 1 0 0 0-.445-.675c-.271-.174.077-.164-5.551-.162-4.405.001-5.128.007-5.254.041',
+    'M18.4 12.32v9.32h1V3h-1v9.32m-9.8-3.6v1.96h8.48V6.76H8.6v1.96M4 15.92v1.96h13.08v-3.92H4v1.96',
   ],
 };
diff --git a/src/components/crown/crownButtons/icons/faAlignTop.js b/src/components/crown/crownButtons/icons/faAlignTop.js
@@ -2,10 +2,10 @@ export const faAlignTop = {
   prefix: 'fpm',
   iconName: 'fa-align-top',
   icon: [
-    16,
-    16,
+    24,
+    24,
     [],
     'e001',
-    'M1.451 1.008c-.134.02-.177.039-.265.116a.717.717 0 0 0-.125.139.507.507 0 0 0 .229.686c.106.048.321.05 6.71.05s6.604-.002 6.71-.05c.06-.027.14-.09.178-.14.066-.087.131-.29.112-.352a2.37 2.37 0 0 1-.025-.103c-.017-.08-.15-.244-.239-.295-.043-.025-1.554-.035-6.645-.046-3.623-.007-6.611-.01-6.64-.005m5.186 2.068a1 1 0 0 0-.562.538l-.062.133v10.506l.07.147c.146.307.427.524.755.584.212.039 2.112.039 2.324 0 .328-.06.609-.277.755-.584l.07-.147V3.747l-.07-.147a1.016 1.016 0 0 0-.471-.486l-.178-.087-1.241-.007-1.24-.006-.15.062',
+    'M3 4.5V5h18.64V4H3v.5m3.76 8.32v6.54h3.92V6.28H6.76v6.54m7.2-2.28v4.26h3.92V6.28h-3.92v4.26',
   ],
 };
diff --git a/src/components/crown/crownButtons/icons/faCenterHorizontally.js b/src/components/crown/crownButtons/icons/faCenterHorizontally.js
@@ -2,10 +2,10 @@ export const faCenterHorizontally = {
   prefix: 'fpm',
   iconName: 'fa-center-horizontally',
   icon: [
-    16,
-    16,
+    24,
+    24,
     [],
     'e001',
-    'M7.73 1.09c-.238.151-.222-.031-.23 2.596l-.008 2.313-2.366.007-2.366.007-.173.084c-.221.106-.386.27-.491.49l-.083.173v2.48l.075.16c.098.21.303.416.509.511l.163.076 2.366.007 2.366.007.008 2.313c.007 2.287.007 2.314.062 2.419.08.152.262.26.438.26a.515.515 0 0 0 .438-.26c.055-.105.055-.132.062-2.419l.008-2.313 2.366-.007 2.366-.007.163-.076a1.13 1.13 0 0 0 .509-.511l.075-.16V6.76l-.076-.163a1.13 1.13 0 0 0-.511-.509l-.16-.075-2.366-.007-2.366-.007L8.5 3.686c-.006-2.222-.009-2.317-.058-2.416-.123-.248-.468-.335-.712-.18',
+    'M11.04 4.88v1.88H7.28v3.92h3.76v3.28H5v3.92h6.04v3.76h1v-3.76h6.04v-3.92h-6.04v-3.28h3.76V6.76h-3.76V3h-1v1.88',
   ],
 };
diff --git a/src/components/crown/crownButtons/icons/faCenterVertically.js b/src/components/crown/crownButtons/icons/faCenterVertically.js
@@ -2,10 +2,10 @@ export const faCenterVertically = {
   prefix: 'fpm',
   iconName: 'fa-center-vertically',
   icon: [
-    16,
-    16,
+    24,
+    24,
     [],
     'e001',
-    'M6.767 2.028a1.044 1.044 0 0 0-.671.559l-.083.173-.007 2.366-.007 2.366-2.313.007-2.313.008-.12.07a.481.481 0 0 0-.169.682.52.52 0 0 0 .183.179c.105.055.132.055 2.419.062l2.313.008.007 2.366.007 2.366.075.16c.098.21.303.416.509.511l.163.076h2.48l.163-.076a1.13 1.13 0 0 0 .509-.511l.075-.16.007-2.366.007-2.366 2.313-.008c2.287-.007 2.314-.007 2.419-.062a.497.497 0 0 0 .01-.865l-.116-.066-2.313-.008-2.313-.007-.007-2.366-.007-2.366-.075-.16a1.13 1.13 0 0 0-.509-.511l-.163-.076-1.187-.004c-.652-.003-1.231.006-1.286.019',
+    'M6.76 8.04v3.04H3v.96h3.76v6.04h3.92v-6.04h3.28v3.76h3.92v-3.76h3.76v-.959l-1.87-.011-1.87-.01-.01-1.89-.011-1.89H13.96v3.801l-1.63-.011-1.63-.01-.01-3.03L10.679 5H6.76v3.04',
   ],
 };
diff --git a/src/components/crown/crownButtons/icons/faDistributeHorizontally.js b/src/components/crown/crownButtons/icons/faDistributeHorizontally.js
@@ -2,10 +2,10 @@ export const faDistributeHorizontally = {
   prefix: 'fpm',
   iconName: 'fa-distribute-horizontally',
   icon: [
-    16,
-    16,
+    24,
+    24,
     [],
     'e001',
-    'M1.266 1.063a.637.637 0 0 0-.246.292c-.026.094-.026 13.197 0 13.291a.707.707 0 0 0 .243.293.507.507 0 0 0 .686-.229c.048-.106.05-.321.05-6.704.001-7.105.009-6.691-.127-6.841-.133-.148-.445-.2-.606-.102m13.014-.005a.433.433 0 0 0-.23.235c-.047.103-.049.359-.049 6.707 0 6.389.002 6.604.05 6.71.114.251.441.36.686.229a.707.707 0 0 0 .243-.293c.026-.095.026-13.197 0-13.292a.625.625 0 0 0-.279-.305.602.602 0 0 0-.421.009m-7.513.97a1.044 1.044 0 0 0-.671.559l-.083.173v10.48l.075.16c.098.21.303.416.509.511l.163.076h2.48l.163-.076a1.13 1.13 0 0 0 .509-.511l.075-.16V2.76l-.075-.16a1.13 1.13 0 0 0-.509-.511l-.163-.076-1.187-.004c-.652-.003-1.231.006-1.286.019',
+    'M3 12.32v9.32h.96V3H3v9.32m17 0v9.32h1V3h-1v9.32m-10.44.02v6.54h4.88V5.8H9.56v6.54',
   ],
 };
diff --git a/src/components/crown/crownButtons/icons/faDistributeVertically.js b/src/components/crown/crownButtons/icons/faDistributeVertically.js
@@ -2,10 +2,10 @@ export const faDistributeVertically = {
   prefix: 'fpm',
   iconName: 'fa-distribute-vertically',
   icon: [
-    16,
-    16,
+    24,
+    24,
     [],
     'e001',
-    'M1.293 1.044a.814.814 0 0 0-.233.222c-.13.241-.02.57.23.683.106.048.321.05 6.71.05s6.604-.002 6.71-.05a.507.507 0 0 0 .23-.683.62.62 0 0 0-.255-.224c-.108-.041-13.317-.039-13.392.002m1.474 4.985c-.281.066-.538.28-.671.558l-.083.173v2.48l.076.163c.095.206.301.411.511.509l.16.075h10.48l.16-.075a1.13 1.13 0 0 0 .511-.509l.076-.163V6.76l-.076-.163a1.13 1.13 0 0 0-.511-.509l-.16-.075-5.187-.004c-2.958-.002-5.229.006-5.286.02M1.29 14.051a.507.507 0 0 0-.229.686.707.707 0 0 0 .293.243c.095.026 13.197.026 13.292 0a.707.707 0 0 0 .293-.243.507.507 0 0 0-.229-.686c-.106-.048-.321-.05-6.71-.05s-6.604.002-6.71.05',
+    'M3 3.5V4h18.64V3H3v.5M5.8 12v2.44h13.08V9.56H5.8V12M3 20.52V21h18.64v-.96H3v.48',
   ],
 };
diff --git a/src/components/crown/crownMultiselect/crownMultiselect.vue b/src/components/crown/crownMultiselect/crownMultiselect.vue
@@ -29,7 +29,7 @@ import store from '@/store';
 import runningInCypressTest from '@/runningInCypressTest';
 import crownAlign from './crownAlign';
 import { library } from '@fortawesome/fontawesome-svg-core';
-import { faCenterVertically } from '../crownButtons/icons';
+import { faAlignLeft } from '../crownButtons/icons';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 
 
@@ -69,7 +69,7 @@ export default {
         {
           label: 'Align',
           iconPrefix: 'fpm',
-          icon: 'center-vertically',
+          icon: 'align-left',
           testId: 'align',
           role: 'menuitem',
           action: this.showAlign,
@@ -88,7 +88,7 @@ export default {
   },
   created() {
     this.$t = this.$t.bind(this);
-    library.add(faCenterVertically);
+    library.add(faAlignLeft);
   },
   computed: {
     isMultiSelect() {

diff --git a/src/components/highlightColors.js b/src/components/highlightColors.js
@@ -0,0 +1,8 @@
+export const COLOR_DEFAULT = '#5096db';
+export const COLOR_ERROR = '#FF0000';
+export const COLOR_IN_PROGRESS = '#3FA6FF';
+export const COLOR_IN_PROGRESS_FILL = '#DCF2FF';
+export const COLOR_IDLE = '#CCCCCC';
+export const COLOR_IDLE_FILL = '#F5F5F5';
+export const COLOR_COMPLETED = '#00BA7C';
+export const COLOR_COMPLETED_FILL = '#D6FFE6';
diff --git a/src/components/inspectors/IntermediateTimer.vue b/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()

diff --git a/src/components/inspectors/inspectorButton/inspectorButton.scss b/src/components/inspectors/inspectorButton/inspectorButton.scss
@@ -12,6 +12,7 @@
   border: 0 none;
   border-radius: 4px;
   box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.1);
+  z-index: 2;
 
   & > svg {
     fill: #44494E;