Merge branch 'dev' of github.com:erxes/erxes into dev

erxes · Sep 25, 2023 · 78a7883 · 78a7883
2 parents 7fd2284 + 9e1088f
commit 78a7883
Show file tree

Hide file tree

Showing 219 changed files with 2,525 additions and 13,956 deletions.
diff --git a/.github/workflows/client_portal.yaml b/.github/workflows/client_portal.yaml
@@ -57,4 +57,4 @@ jobs:
           cd client-portal
           echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
           docker build -t erxes/client-portal:${GITHUB_REF#refs/heads/} -f Dockerfile .
-          docker push erxes/client-portal:${GITHUB_REF#refs/heads/}
+          docker push erxes/client-portal:${GITHUB_REF#refs/heads/}
diff --git a/.github/workflows/core.yaml b/.github/workflows/core.yaml
@@ -14,22 +14,22 @@ on:
 
 jobs:
   core:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Use Node.js 14.20.x
-        uses: actions/setup-node@v1
+      - name: Use Node.js 18.17.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.20.x
+          node-version: 18.17.x
 
       # https://github.com/actions/cache/blob/master/examples.md#node---yarn
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

diff --git a/.github/workflows/coreui.yaml b/.github/workflows/coreui.yaml
@@ -17,15 +17,15 @@ on:
 
 jobs:
   ui:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - name: Use Node.js 14.20.x
-        uses: actions/setup-node@v1
+      - name: Use Node.js 18.17.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.20.x
+          node-version: 18.17.x
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Build
         run: |

diff --git a/.github/workflows/crons.yaml b/.github/workflows/crons.yaml
@@ -13,22 +13,22 @@ on:
 
 jobs:
   crons:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Use Node.js 14.20.x
-        uses: actions/setup-node@v1
+      - name: Use Node.js 18.17.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.20.x
+          node-version: 18.17.x
 
       # https://github.com/actions/cache/blob/master/examples.md#node---yarn
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

diff --git a/.github/workflows/dashboard.yaml b/.github/workflows/dashboard.yaml
@@ -14,26 +14,26 @@ on:
 
 jobs:
   dashboard:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Use Node.js 14.20.x
-        uses: actions/setup-node@v1
+      - name: Use Node.js 18.17.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.20.x
+          node-version: 18.17.x
 
       # https://github.com/actions/cache/blob/master/examples.md#node---yarn
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-dashboard-${{ hashFiles('yarn.lock', 'dashboard/yarn.lock') }}
+          key: ${{ runner.os }}-yarn-dashboard-${{ hashFiles('yarn.lock', 'plugin-dashboard-api/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-dashboard
             ${{ runner.os }}-yarn-

diff --git a/.github/workflows/documentation.yaml b/.github/workflows/documentation.yaml
@@ -100,4 +100,4 @@ jobs:
         git config --global user.email "github-actions[bot]@users.noreply.github.com"
         git config --global user.name "github-actions[bot]"
         yarn install --frozen-lockfile
-        yarn deploy
+        yarn deploy
diff --git a/.github/workflows/email_verifier.yaml b/.github/workflows/email_verifier.yaml
@@ -66,4 +66,4 @@ jobs:
           cd email-verifier
           echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
           docker build -t erxes/erxes-email-verifier:${GITHUB_REF#refs/heads/} -f Dockerfile .
-          docker push erxes/erxes-email-verifier:${GITHUB_REF#refs/heads/}
+          docker push erxes/erxes-email-verifier:${GITHUB_REF#refs/heads/}
diff --git a/.github/workflows/essyncer.yaml b/.github/workflows/essyncer.yaml
@@ -30,4 +30,4 @@ jobs:
           cd essyncer
           echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
           docker build -t erxes/essyncer:${GITHUB_REF#refs/heads/} -f Dockerfile .
-          docker push erxes/essyncer:${GITHUB_REF#refs/heads/}
+          docker push erxes/essyncer:${GITHUB_REF#refs/heads/}
diff --git a/.github/workflows/gateway.yaml b/.github/workflows/gateway.yaml
@@ -17,19 +17,19 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Use Node.js 14.20.x
-        uses: actions/setup-node@v1
+      - name: Use Node.js 18.17.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.20.x
+          node-version: 18.17.x
 
       # https://github.com/actions/cache/blob/master/examples.md#node---yarn
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

diff --git a/.github/workflows/mongobi-connector.yaml b/.github/workflows/mongobi-connector.yaml
@@ -22,4 +22,4 @@ jobs:
           cd mongobi-connector
           echo ${{ secrets.DOCKERHUB_TOKEN }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
           docker build -t erxes/mongobi-connector:${GITHUB_REF#refs/heads/} -f Dockerfile .
-          docker push erxes/mongobi-connector:${GITHUB_REF#refs/heads/}
+          docker push erxes/mongobi-connector:${GITHUB_REF#refs/heads/}
diff --git a/.github/workflows/plugin-automations-api.yaml b/.github/workflows/plugin-automations-api.yaml
@@ -24,22 +24,22 @@ on:
 
 jobs:
   api:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Use Node.js 14.20.x
-        uses: actions/setup-node@v1
+      - name: Use Node.js 18.17.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.20.x
+          node-version: 18.17.x
 
       # https://github.com/actions/cache/blob/main/examples.md#node---yarn
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

diff --git a/.github/workflows/plugin-automations-ui.yaml b/.github/workflows/plugin-automations-ui.yaml
@@ -48,15 +48,15 @@ on:
 
 jobs:
   ui:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Use Node.js 14.20.x
-        uses: actions/setup-node@v1
+      - name: Use Node.js 18.17.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.20.x
+          node-version: 18.17.x
 
       - name: Build
         run: |
@@ -69,7 +69,7 @@ jobs:
           yarn build
 
       - name: Configure AWS credentials
-        if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging')
+        if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/build-test')
         uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}

diff --git a/.github/workflows/plugin-cards-api.yaml b/.github/workflows/plugin-cards-api.yaml
@@ -24,22 +24,22 @@ on:
 
 jobs:
   api:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Use Node.js 14.20.x
-        uses: actions/setup-node@v1
+      - name: Use Node.js 18.17.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.20.x
+          node-version: 18.17.x
 
       # https://github.com/actions/cache/blob/main/examples.md#node---yarn
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

diff --git a/.github/workflows/plugin-cards-ui.yaml b/.github/workflows/plugin-cards-ui.yaml
@@ -48,15 +48,15 @@ on:
 
 jobs:
   ui:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Use Node.js 14.20.x
-        uses: actions/setup-node@v1
+      - name: Use Node.js 18.17.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.20.x
+          node-version: 18.17.x
 
       - name: Build
         run: |
@@ -69,7 +69,7 @@ jobs:
           yarn build
 
       - name: Configure AWS credentials
-        if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging')
+        if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/build-test')
         uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}

diff --git a/.github/workflows/plugin-clientportal-api.yaml b/.github/workflows/plugin-clientportal-api.yaml
@@ -24,22 +24,22 @@ on:
 
 jobs:
   api:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Use Node.js 14.20.x
-        uses: actions/setup-node@v1
+      - name: Use Node.js 18.17.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.20.x
+          node-version: 18.17.x
 
       # https://github.com/actions/cache/blob/main/examples.md#node---yarn
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}

diff --git a/.github/workflows/plugin-clientportal-ui.yaml b/.github/workflows/plugin-clientportal-ui.yaml
@@ -48,15 +48,15 @@ on:
 
 jobs:
   ui:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Use Node.js 14.20.x
-        uses: actions/setup-node@v1
+      - name: Use Node.js 18.17.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.20.x
+          node-version: 18.17.x
 
       - name: Build
         run: |
@@ -69,7 +69,7 @@ jobs:
           yarn build
 
       - name: Configure AWS credentials
-        if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging')
+        if: github.event_name == 'push' && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/build-test')
         uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}

diff --git a/.github/workflows/plugin-contacts-api.yaml b/.github/workflows/plugin-contacts-api.yaml
@@ -24,22 +24,22 @@ on:
 
 jobs:
   api:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - name: Use Node.js 14.20.x
-        uses: actions/setup-node@v1
+      - name: Use Node.js 18.17.x
+        uses: actions/setup-node@v3
         with:
-          node-version: 14.20.x
+          node-version: 18.17.x
 
       # https://github.com/actions/cache/blob/main/examples.md#node---yarn
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}