admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2022-11-10 (pull request #616)

Browse Source 
release/2022-11-10

Approved-by: Patrick Fic
This commit is contained in:
Patrick Fic
2022-11-08 18:02:10 +00:00
parent fb20cceebc 5a12738da5
commit ac1eead695
7 changed files with 210 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
.circleci/config.yml Normal file
View File

@@ -0,0 +1,171 @@
version: 2.1
orbs:
#snyk: snyk/snyk@0.0.8
#cypress: cypress-io/cypress@1.23.0
aws-s3: circleci/aws-s3@2.0.0
eb: circleci/aws-elastic-beanstalk@1.0.2
jira: circleci/jira@1.3.1
jobs:
api-deploy:
docker:
- image: "cimg/base:stable"
steps:
- checkout
- eb/setup
- run:
command: |
eb init imex-online-production-api -r ca-central-1 -p "Node.js 16 running on 64bit Amazon Linux 2"
eb status --verbose
eb deploy
eb status
- jira/notify
hasura-migrate:
docker:
- image: cimg/node:16.15.0
working_directory: ~/repo/hasura
steps:
- checkout:
path: ~/repo
- run:
name: Execute migration
command: |
npm install hasura-cli -g
hasura migrate apply --endpoint https://db.imex.online/ --admin-secret $HASURA_PROD_SECRET
hasura metadata apply --endpoint https://db.imex.online/ --admin-secret $HASURA_PROD_SECRET
hasura metadata reload --endpoint https://db.imex.online/ --admin-secret $HASURA_PROD_SECRET
app-build:
docker:
- image: cimg/node:16.15.0
working_directory: ~/repo/client
steps:
- checkout:
path: ~/repo
- restore_cache:
name: Restore Yarn Package Cache
keys:
- yarn-packages-{{ checksum "yarn.lock" }}
- run:
name: Install Dependencies
command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
- save_cache:
name: Save Yarn Package Cache
key: yarn-packages-{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn
- run: yarn run build
- aws-s3/sync:
from: build
to: "s3://imex-online-production/"
- jira/notify
test-hasura-migrate:
docker:
- image: cimg/node:16.15.0
working_directory: ~/repo/hasura
steps:
- checkout:
path: ~/repo
- run:
name: Execute migration
command: |
npm install hasura-cli -g
hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret $HASURA_TEST_SECRET
hasura metadata apply --endpoint https://db.test.bodyshop.app/ --admin-secret $HASURA_TEST_SECRET
hasura metadata reload --endpoint https://db.test.bodyshop.app/ --admin-secret $HASURA_TEST_SECRET
test-app-build:
docker:
- image: cimg/node:16.15.0
working_directory: ~/repo/client
steps:
- checkout:
path: ~/repo
- restore_cache:
name: Restore Yarn Package Cache
keys:
- yarn-packages-{{ checksum "yarn.lock" }}
- run:
name: Install Dependencies
command: yarn install --frozen-lockfile --cache-folder ~/.cache/yarn
- save_cache:
name: Save Yarn Package Cache
key: yarn-packages-{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn
- run: yarn run build:test
- aws-s3/sync:
from: build
to: "s3://imex-online-test/"
- jira/notify
admin-app-build:
docker:
- image: cimg/node:16.15.0
working_directory: ~/repo/admin
steps:
- checkout:
path: ~/repo
- restore_cache:
keys:
- v1-dependencies-{{ checksum "package.json" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-
- run: npm i
- save_cache:
paths:
- node_modules
- ~/.npm
- ~/.cache
key: v1-dependencies-{{ checksum "package.json" }}
- run: npm run build
- aws-s3/sync:
from: build
to: "s3://adm.imex.online/"
workflows:
deploy_and_build:
jobs:
- api-deploy:
filters:
branches:
only: master
- app-build:
filters:
branches:
only: master
- hasura-migrate:
filters:
branches:
only: master
- test-app-build:
filters:
branches:
only: test
- test-hasura-migrate:
filters:
branches:
only: test
#- admin-app-build:
#filters:
#branches:
#only: master

4
.gitignore vendored
View File

@@ -115,4 +115,6 @@ firebase/.env
logs/oAuthClient-log.log
.node-persist/**
.node-persist/**
*.env.*

21
bodyshop_translations.babel
View File

@@ -40455,6 +40455,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>cycle_time_analysis</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>estimates_written_converted</name>
<definition_loaded>false</definition_loaded>

1
client/src/translations/en_us/common.json
View File

@@ -2403,6 +2403,7 @@
"credits_not_received_date": "Credits not Received by Date",
"credits_not_received_date_vendorid": "Credits not Received by Vendor",
"csi": "CSI Responses",
"cycle_time_analysis": "Cycle Time Analysis",
"estimates_written_converted": "Estimates Written/Converted",
"estimator_detail": "Jobs by Estimator (Detail)",
"estimator_summary": "Jobs by Estimator (Summary)",

1
client/src/translations/es/common.json
View File

@@ -2403,6 +2403,7 @@
"credits_not_received_date": "",
"credits_not_received_date_vendorid": "",
"csi": "",
"cycle_time_analysis": "",
"estimates_written_converted": "",
"estimator_detail": "",
"estimator_summary": "",

1
client/src/translations/fr/common.json
View File

@@ -2403,6 +2403,7 @@
"credits_not_received_date": "",
"credits_not_received_date_vendorid": "",
"csi": "",
"cycle_time_analysis": "",
"estimates_written_converted": "",
"estimator_detail": "",
"estimator_summary": "",

12
client/src/utils/TemplateConstants.js
View File

@@ -1682,6 +1682,18 @@ export const TemplateList = (type, context) => {
},
group: "sales",
},
cycle_time_analysis: {
title: i18n.t("reportcenter.templates.cycle_time_analysis"),
subject: i18n.t("reportcenter.templates.cycle_time_analysis"),
key: "cycle_time_analysis",
//idtype: "vendor",
disabled: false,
rangeFilter: {
object: i18n.t("reportcenter.labels.objects.jobs"),
field: i18n.t("jobs.fields.actual_completion"),
},
group: "job",
},
}
: {}),
...(!type || type === "courtesycarcontract"