runlify 0.0.469 → 0.0.471
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/projectsGeneration/generators/fileTemplates/back/environment/gitlabCi.js +8 -8
- package/build/projectsGeneration/generators/fileTemplates/ui/environment/gitlabCi.js +6 -6
- package/build/projectsGeneration/generators/fileTemplates/ui/pages/EntityCreate/DefaultEntityCreate.js +2 -2
- package/build/projectsGeneration/generators/fileTemplates/ui/pages/EntityEdit/DefaultEntityEdit.js +2 -2
- package/package.json +1 -1
|
@@ -9,32 +9,32 @@ var gitlabCiTmpl = function (_a) {
|
|
|
9
9
|
return "image: node:18\n".concat(options.skipWarningThisIsGenerated
|
|
10
10
|
? ''
|
|
11
11
|
: "\n# ".concat(utils_1.generatedWarning, "\n"), "\nstages:\n - check\n - previous-image\n - build\n - latest-image\n - deploy\n - deploy-previous\n\ncache:\n paths:\n - .cache\n - .cache_images\n # - node_modules\n\nvariables:\n REPO_NAME: $CI_PROJECT_NAME\n VERBOSE: 'true'\n RELEASE: $CI_COMMIT_SHORT_SHA\n KUBECONFIG: /etc/deploy/config\n PROJECT_NAME: ").concat(system.name, "\n\ncheck:\n stage: check\n image: registry.gitlab.com/making.ventures/images/node-with-tools\n before_script:\n - yarn install --frozen-lockfile\n script:\n - ./check.sh\n variables:\n DATABASE_MAIN_WRITE_URI: $TEST_DATABASE_MAIN_WRITE_URI\n\ntag-previous-with-sha:\n extends: .tag-image\n stage: previous-image\n only:").concat(system.deployEnvironments
|
|
12
|
-
.map(function (e) { return "\n - ".concat(e.branchName); }).join(''), "\n allow_failure: true # Firt run won't be able to create previous image\n variables:\n TAG_ORIGIN: :${CI_COMMIT_REF_SLUG}\n TAG_DESTINATION: :${CI_COMMIT_REF_SLUG}-previous-for-${CI_COMMIT_SHA}\n\nbuild:\n stage: build\n image:\n name: gcr.io/kaniko-project/executor:debug\n entrypoint: ['']\n before_script:\n - mkdir -p /kaniko/.docker\n - echo \"{\\\"auths\\\":{\\\"$CI_REGISTRY\\\":{\\\"username\\\":\\\"$CI_REGISTRY_USER\\\",\\\"password\\\":\\\"$CI_REGISTRY_PASSWORD\\\"}}}\" > /kaniko/.docker/config.json\n # - /kaniko/warmer --cache-dir=$CI_PROJECT_DIR/.cache_images --image=browserless/chrome\n - echo TAG1 \"${CI_COMMIT_REF_SLUG}\"\n - echo TAG2 \"${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"\n script:\n - /kaniko/executor\n --cache-dir=$CI_PROJECT_DIR/.cache_images\n --context ${CI_PROJECT_DIR}\n --dockerfile ${CI_PROJECT_DIR}/Dockerfile\n --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}\n --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\n --single-snapshot\n only:").concat(system.deployEnvironments
|
|
13
|
-
.map(function (e) { return "\n - ".concat(e.branchName); }).join(''), "\n\ntag-latest:\n extends: .tag-image\n stage: latest-image\n only:\n - master\n variables:\n TAG_ORIGIN: master\n TAG_DESTINATION: latest\n\n.tag-image:\n image:\n name: gcr.io/go-containerregistry/crane:debug\n entrypoint: ['']\n script:\n - echo TAG_DESTINATION ${TAG_DESTINATION}\n - crane auth login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY\n - crane cp ${CI_REGISTRY_IMAGE}:${TAG_ORIGIN} ${CI_REGISTRY_IMAGE}:${TAG_DESTINATION}\n variables:\n GIT_STRATEGY: none\n\n").concat(system.deployEnvironments
|
|
12
|
+
.map(function (e) { return "\n - ".concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/"); }).join(''), "\n allow_failure: true # Firt run won't be able to create previous image\n variables:\n TAG_ORIGIN: :${CI_COMMIT_REF_SLUG}\n TAG_DESTINATION: :${CI_COMMIT_REF_SLUG}-previous-for-${CI_COMMIT_SHA}\n\nbuild:\n stage: build\n image:\n name: gcr.io/kaniko-project/executor:debug\n entrypoint: ['']\n before_script:\n - mkdir -p /kaniko/.docker\n - echo \"{\\\"auths\\\":{\\\"$CI_REGISTRY\\\":{\\\"username\\\":\\\"$CI_REGISTRY_USER\\\",\\\"password\\\":\\\"$CI_REGISTRY_PASSWORD\\\"}}}\" > /kaniko/.docker/config.json\n # - /kaniko/warmer --cache-dir=$CI_PROJECT_DIR/.cache_images --image=browserless/chrome\n - echo TAG1 \"${CI_COMMIT_REF_SLUG}\"\n - echo TAG2 \"${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"\n script:\n - /kaniko/executor\n --cache-dir=$CI_PROJECT_DIR/.cache_images\n --context ${CI_PROJECT_DIR}\n --dockerfile ${CI_PROJECT_DIR}/Dockerfile\n --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}\n --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\n --single-snapshot\n only:").concat(system.deployEnvironments
|
|
13
|
+
.map(function (e) { return "\n - ".concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/"); }).join(''), "\n\ntag-latest:\n extends: .tag-image\n stage: latest-image\n only:\n - master\n variables:\n TAG_ORIGIN: master\n TAG_DESTINATION: latest\n\n.tag-image:\n image:\n name: gcr.io/go-containerregistry/crane:debug\n entrypoint: ['']\n script:\n - echo TAG_DESTINATION ${TAG_DESTINATION}\n - crane auth login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY\n - crane cp ${CI_REGISTRY_IMAGE}:${TAG_ORIGIN} ${CI_REGISTRY_IMAGE}:${TAG_DESTINATION}\n variables:\n GIT_STRATEGY: none\n\n").concat(system.deployEnvironments
|
|
14
14
|
.map(function (e) {
|
|
15
|
-
return "deploy-".concat(e.name, "-back:\n extends: .deploy-").concat(e.name, "-back\n stage: deploy\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName);
|
|
15
|
+
return "deploy-".concat(e.name, "-back:\n extends: .deploy-").concat(e.name, "-back\n stage: deploy\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/");
|
|
16
16
|
})
|
|
17
17
|
.join('\n\n')
|
|
18
18
|
.trim()).concat(system.workers.length > 0
|
|
19
19
|
? '\n\n' +
|
|
20
20
|
system.deployEnvironments
|
|
21
21
|
.map(function (e) {
|
|
22
|
-
return "deploy-".concat(e.name, "-workers:\n extends: .deploy-").concat(e.name, "-workers\n stage: deploy\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"workers-").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName);
|
|
22
|
+
return "deploy-".concat(e.name, "-workers:\n extends: .deploy-").concat(e.name, "-workers\n stage: deploy\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"workers-").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/");
|
|
23
23
|
})
|
|
24
24
|
.join('\n\n')
|
|
25
25
|
.trim()
|
|
26
26
|
: '', "\n\n").concat(system.deployEnvironments
|
|
27
27
|
.map(function (e) {
|
|
28
|
-
return "deploy-".concat(e.name, "-back-previous:\n extends: .deploy-").concat(e.name, "-back\n stage: deploy-previous\n when: manual\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-previous-for-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName);
|
|
28
|
+
return "deploy-".concat(e.name, "-back-previous:\n extends: .deploy-").concat(e.name, "-back\n stage: deploy-previous\n when: manual\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-previous-for-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/");
|
|
29
29
|
}).join('\n\n')).concat(system.workers.length > 0
|
|
30
30
|
? '\n\n' +
|
|
31
31
|
system.deployEnvironments
|
|
32
32
|
.map(function (e) {
|
|
33
|
-
return "deploy-".concat(e.name, "-workers-previous:\n extends: .deploy-").concat(e.name, "-workers\n stage: deploy-previous\n when: manual\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"workers-").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-previous-for-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName);
|
|
33
|
+
return "deploy-".concat(e.name, "-workers-previous:\n extends: .deploy-").concat(e.name, "-workers\n stage: deploy-previous\n when: manual\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"workers-").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-previous-for-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/");
|
|
34
34
|
}).join('\n\n')
|
|
35
35
|
: '', "\n").concat(system.deployEnvironments
|
|
36
36
|
.map(function (e) { return ".deploy-".concat(e.name, "-back:\n extends:\n - .deploy-").concat(e.name, "\n - .deploy-back\n variables:\n KUBE_CONFIG: ${KUBE_").concat(e.clusterName.toUpperCase(), "_CONFIG}\n BACK_ENABLED: \"true\"\n INGRESS_ENABLED: \"true\"\n METRICS_ENABLED: \"true\"\n WORKER_ENABLED: \"false\"\n BOT_ENABLED: \"false\"\n ROOT_ENABLED: \"").concat(e.main, "\"\n\n.deploy-").concat(e.name, "-workers:\n extends:\n - .deploy-").concat(e.name, "\n - .deploy-worker\n variables:\n KUBE_CONFIG: ${KUBE_").concat(e.workerClusterName.toUpperCase(), "_CONFIG}\n BACK_ENABLED: \"false\"\n INGRESS_ENABLED: \"false\"\n METRICS_ENABLED: \"false\"\n WORKER_ENABLED: \"true\"\n BOT_ENABLED: \"true\"\n ROOT_ENABLED: \"").concat(e.main, "\""); }).join('\n\n'), "\n\n").concat(system.deployEnvironments
|
|
37
|
-
.map(function (e) { return ".deploy-".concat(e.name, ":\n extends: .deploy\n stage: deploy\n when: ").concat(e.manualDeploy ? 'manual' : 'on_success', "\n only:\n - ").concat(e.branchName, "\n tags:\n - ").concat(e.name, "\n variables:\n ENV: \"").concat(e.name, "\"\n DEV: \"false\"\n HOST: \"making.ventures\"\n ROOT_ENABLED: \"").concat(e.main, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"").concat(system.configVars
|
|
37
|
+
.map(function (e) { return ".deploy-".concat(e.name, ":\n extends: .deploy\n stage: deploy\n when: ").concat(e.manualDeploy ? 'manual' : 'on_success', "\n only:\n - ").concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/\n tags:\n - ").concat(e.name, "\n variables:\n ENV: \"").concat(e.name, "\"\n DEV: \"false\"\n HOST: \"making.ventures\"\n ROOT_ENABLED: \"").concat(e.main, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"").concat(system.configVars
|
|
38
38
|
.filter(function (v) { return v.scopes.includes('back') || v.scopes.includes('ci'); })
|
|
39
39
|
.map(function (v) { return "\n ".concat((0, change_case_1.constantCase)(v.name), ": ${").concat(e.name.toUpperCase(), "_").concat((0, change_case_1.constantCase)(v.name), "}"); })
|
|
40
40
|
.join('')); }).join('\n\n'), "\n\n.deploy-back:\n variables:\n DEPLOY_KIND: \"back\"\n\n.deploy-worker:\n variables:\n DEPLOY_KIND: \"worker\"\n\n.deploy-telegramBot:\n variables:\n DEPLOY_KIND: \"telegramBot\"\n\n.deploy:\n image:\n name: alpine/helm:3.9.0\n entrypoint: [\"\"]\n before_script:\n - mkdir -p /etc/deploy\n - echo ${KUBE_CONFIG} | base64 -d > ${KUBECONFIG}\n script:\n - NAMESPACE=${NAMESPACE:-\"").concat(options.k8sNamespacePrefix || prefix, "-${ENV}\"}\n - echo TAG ${TAG}\n - echo NAMESPACE ${NAMESPACE}\n - echo chart ${NAMESPACE}-${DEPLOY_KIND}\n\n - helm upgrade\n --install\n --wait ${NAMESPACE}-${DEPLOY_KIND} chart\n --timeout 3600s\n -f chart/values_${ENV}.yaml\n --set \"global.projectName=${PROJECT_NAME}\"\n --set \"global.clusterName=${CLUSTER_NAME}\"\n --set \"global.env=${ENV}\"\n --set \"global.deployKind=${DEPLOY_KIND}\"\n --set \"random=:$(date)\"\n --set \"app.tag=${TAG}\"\n --set \"ingress.host=${HOST}\"\n --set \"style=${STYLE}\"\n --set \"back.enabled=${BACK_ENABLED}\"\n --set \"ingress.enabled=${INGRESS_ENABLED}\"\n --set \"metrics.enabled=${METRICS_ENABLED}\"\n --set \"worker.enabled=${WORKER_ENABLED}\"\n --set \"bot.enabled=${BOT_ENABLED}\"\n --set \"ingress.rootEnabled=${ROOT_ENABLED}\"").concat(system.configVars
|
|
@@ -43,4 +43,4 @@ var gitlabCiTmpl = function (_a) {
|
|
|
43
43
|
.join(''), "\n --namespace ${NAMESPACE}\n");
|
|
44
44
|
};
|
|
45
45
|
exports.gitlabCiTmpl = gitlabCiTmpl;
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
46
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2l0bGFiQ2kuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvcHJvamVjdHNHZW5lcmF0aW9uL2dlbmVyYXRvcnMvZmlsZVRlbXBsYXRlcy9iYWNrL2Vudmlyb25tZW50L2dpdGxhYkNpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDRCQUE0QjtBQUM1QiwyQ0FBMEM7QUFFMUMsMkNBQW9EO0FBRTdDLElBQU0sWUFBWSxHQUFHLFVBQUMsRUFJRDtRQUhoQixNQUFNLG1CQUFBLEVBQ2hCLE1BQU0sWUFBQSxFQUNOLE9BQU8sYUFBQTtJQUN3QixPQUFBLDBCQUUvQixPQUFPLENBQUMsMEJBQTBCO1FBQ2hDLENBQUMsQ0FBQyxFQUFFO1FBQ0osQ0FBQyxDQUFDLGNBQ0Ysd0JBQWdCLE9BQ25CLHFWQXFCaUIsTUFBTSxDQUFDLElBQUksOFZBZXBCLE1BQU0sQ0FBQyxrQkFBa0I7U0FDN0IsR0FBRyxDQUFDLFVBQUMsQ0FBQyxJQUFLLE9BQUEsa0JBQVcsQ0FBQyxDQUFDLFVBQVUsdUJBQWEsQ0FBQyxDQUFDLFVBQVUsVUFBTyxFQUF2RCxDQUF1RCxDQUFDLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxta0NBeUJ4RSxNQUFNLENBQUMsa0JBQWtCO1NBQzNCLEdBQUcsQ0FBQyxVQUFDLENBQUMsSUFBSyxPQUFBLGtCQUFXLENBQUMsQ0FBQyxVQUFVLHVCQUFhLENBQUMsQ0FBQyxVQUFVLFVBQU8sRUFBdkQsQ0FBdUQsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsd2hCQXNCakYsTUFBTSxDQUFDLGtCQUFrQjtTQUN4QixHQUFHLENBQUMsVUFBQyxDQUFDO1FBQ0wsT0FBQSxpQkFBVSxDQUFDLENBQUMsSUFBSSx3Q0FDQyxDQUFDLENBQUMsSUFBSSw4REFHZixDQUFDLENBQUMsSUFBSSxxQ0FDRyxDQUFDLENBQUMsV0FBVyxzRkFHMUIsQ0FBQyxDQUFDLFVBQVUsdUJBQ1YsQ0FBQyxDQUFDLFVB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
|
|
@@ -9,15 +9,15 @@ var uiGitlabCiTmpl = function (_a) {
|
|
|
9
9
|
return "image: node:18\n".concat(options.skipWarningThisIsGenerated
|
|
10
10
|
? ''
|
|
11
11
|
: "\n# ".concat(utils_1.generatedWarning, "\n"), "\nstages:\n - check\n - previous-image\n - build\n - latest-image\n - deploy\n - deploy-previous\n\ncache:\n paths:\n - .cache\n - .cache_images\n # - node_modules\n\nvariables:\n REPO_NAME: $CI_PROJECT_NAME\n VERBOSE: 'true'\n RELEASE: $CI_COMMIT_SHORT_SHA\n KUBECONFIG: /etc/deploy/config\n PROJECT_NAME: ").concat(system.name, "\n\ncheck:\n stage: check\n image: registry.gitlab.com/making.ventures/images/node-with-tools\n before_script:\n - yarn install --frozen-lockfile\n script:\n - ./check.sh\n\ntag-previous-with-sha:\n extends: .tag-image\n stage: previous-image\n only:").concat(system.deployEnvironments
|
|
12
|
-
.map(function (e) { return "\n - ".concat(e.branchName); }).join(''), "\n allow_failure: true # Firt run won't be able to create previous image\n variables:\n TAG_ORIGIN: :${CI_COMMIT_REF_SLUG}\n TAG_DESTINATION: :${CI_COMMIT_REF_SLUG}-previous-for-${CI_COMMIT_SHA}\n\nbuild:\n stage: build\n image:\n name: gcr.io/kaniko-project/executor:debug\n entrypoint: ['']\n before_script:\n - mkdir -p /kaniko/.docker\n - echo \"{\\\"auths\\\":{\\\"$CI_REGISTRY\\\":{\\\"username\\\":\\\"$CI_REGISTRY_USER\\\",\\\"password\\\":\\\"$CI_REGISTRY_PASSWORD\\\"}}}\" > /kaniko/.docker/config.json\n # - /kaniko/warmer --cache-dir=$CI_PROJECT_DIR/.cache_images --image=browserless/chrome\n - echo TAG1 \"${CI_COMMIT_REF_SLUG}\"\n - echo TAG2 \"${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"\n script:\n - /kaniko/executor\n --cache-dir=$CI_PROJECT_DIR/.cache_images\n --context ${CI_PROJECT_DIR}\n --dockerfile ${CI_PROJECT_DIR}/Dockerfile\n --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}\n --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\n --single-snapshot\n only:").concat(system.deployEnvironments
|
|
13
|
-
.map(function (e) { return "\n - ".concat(e.branchName); }).join(''), "\n\ntag-latest:\n extends: .tag-image\n stage: latest-image\n only:\n - master\n variables:\n TAG_ORIGIN: master\n TAG_DESTINATION: latest\n\n.tag-image:\n image:\n name: gcr.io/go-containerregistry/crane:debug\n entrypoint: ['']\n script:\n - echo TAG_DESTINATION ${TAG_DESTINATION}\n - crane auth login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY\n - crane cp ${CI_REGISTRY_IMAGE}:${TAG_ORIGIN} ${CI_REGISTRY_IMAGE}:${TAG_DESTINATION}\n variables:\n GIT_STRATEGY: none\n\n").concat(system.deployEnvironments
|
|
12
|
+
.map(function (e) { return "\n - ".concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/"); }).join(''), "\n allow_failure: true # Firt run won't be able to create previous image\n variables:\n TAG_ORIGIN: :${CI_COMMIT_REF_SLUG}\n TAG_DESTINATION: :${CI_COMMIT_REF_SLUG}-previous-for-${CI_COMMIT_SHA}\n\nbuild:\n stage: build\n image:\n name: gcr.io/kaniko-project/executor:debug\n entrypoint: ['']\n before_script:\n - mkdir -p /kaniko/.docker\n - echo \"{\\\"auths\\\":{\\\"$CI_REGISTRY\\\":{\\\"username\\\":\\\"$CI_REGISTRY_USER\\\",\\\"password\\\":\\\"$CI_REGISTRY_PASSWORD\\\"}}}\" > /kaniko/.docker/config.json\n # - /kaniko/warmer --cache-dir=$CI_PROJECT_DIR/.cache_images --image=browserless/chrome\n - echo TAG1 \"${CI_COMMIT_REF_SLUG}\"\n - echo TAG2 \"${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"\n script:\n - /kaniko/executor\n --cache-dir=$CI_PROJECT_DIR/.cache_images\n --context ${CI_PROJECT_DIR}\n --dockerfile ${CI_PROJECT_DIR}/Dockerfile\n --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}\n --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\n --single-snapshot\n only:").concat(system.deployEnvironments
|
|
13
|
+
.map(function (e) { return "\n - ".concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/"); }).join(''), "\n\ntag-latest:\n extends: .tag-image\n stage: latest-image\n only:\n - master\n variables:\n TAG_ORIGIN: master\n TAG_DESTINATION: latest\n\n.tag-image:\n image:\n name: gcr.io/go-containerregistry/crane:debug\n entrypoint: ['']\n script:\n - echo TAG_DESTINATION ${TAG_DESTINATION}\n - crane auth login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY\n - crane cp ${CI_REGISTRY_IMAGE}:${TAG_ORIGIN} ${CI_REGISTRY_IMAGE}:${TAG_DESTINATION}\n variables:\n GIT_STRATEGY: none\n\n").concat(system.deployEnvironments
|
|
14
14
|
.map(function (e) {
|
|
15
|
-
return "deploy-".concat(e.name, ":\n extends: .deploy-").concat(e.name, "\n stage: deploy\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName);
|
|
15
|
+
return "deploy-".concat(e.name, ":\n extends: .deploy-").concat(e.name, "\n stage: deploy\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/");
|
|
16
16
|
}).join('\n\n'), "\n\n").concat(system.deployEnvironments
|
|
17
17
|
.map(function (e) {
|
|
18
|
-
return "deploy-".concat(e.name, "-previous:\n extends: .deploy-").concat(e.name, "\n stage: deploy-previous\n when: manual\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-previous-for-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName);
|
|
18
|
+
return "deploy-".concat(e.name, "-previous:\n extends: .deploy-").concat(e.name, "\n stage: deploy-previous\n when: manual\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"").concat(e.clusterName, "\"\n TAG: \":${CI_COMMIT_REF_SLUG}-previous-for-${CI_COMMIT_SHA}\"\n only:\n - ").concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/");
|
|
19
19
|
}).join('\n\n'), "\n\n").concat(system.deployEnvironments
|
|
20
|
-
.map(function (e) { return ".deploy-".concat(e.name, ":\n extends: .deploy-ui\n stage: deploy\n when: ").concat(e.manualDeploy ? 'manual' : 'on_success', "\n only:\n - ").concat(e.branchName, "\n tags:\n - ").concat(e.name, "\n variables:\n ENV: \"").concat(e.name, "\"\n DEV: \"false\"\n HOST: \"making.ventures\"\n ROOT_ENABLED: \"").concat(e.main, "\"\n KUBE_CONFIG: ${KUBE_").concat(e.clusterName.toUpperCase(), "_CONFIG}\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"").concat(system.configVars
|
|
20
|
+
.map(function (e) { return ".deploy-".concat(e.name, ":\n extends: .deploy-ui\n stage: deploy\n when: ").concat(e.manualDeploy ? 'manual' : 'on_success', "\n only:\n - ").concat(e.branchName, "\n - /^").concat(e.branchName, "-.*$/\n tags:\n - ").concat(e.name, "\n variables:\n ENV: \"").concat(e.name, "\"\n DEV: \"false\"\n HOST: \"making.ventures\"\n ROOT_ENABLED: \"").concat(e.main, "\"\n KUBE_CONFIG: ${KUBE_").concat(e.clusterName.toUpperCase(), "_CONFIG}\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"").concat(system.configVars
|
|
21
21
|
.filter(function (v) { return v.scopes.includes('admin-app') || v.scopes.includes('ci'); })
|
|
22
22
|
.map(function (v) { return "\n ".concat((0, change_case_1.constantCase)(v.name), ": ${").concat(e.name.toUpperCase(), "_").concat((0, change_case_1.constantCase)(v.name), "}"); })
|
|
23
23
|
.join('')); }).join('\n\n'), "\n\n.deploy-ui:\n extends: .deploy\n variables:\n DEPLOY_KIND: \"ui\"\n\n.deploy:\n image:\n name: alpine/helm:3.9.0\n entrypoint: [\"\"]\n before_script:\n - mkdir -p /etc/deploy\n - echo ${KUBE_CONFIG} | base64 -d > ${KUBECONFIG}\n script:\n - NAMESPACE=${NAMESPACE:-\"").concat(options.k8sNamespacePrefix || prefix, "-${ENV}\"}\n - echo TAG ${TAG}\n - echo NAMESPACE ${NAMESPACE}\n - echo chart ${NAMESPACE}-${DEPLOY_KIND}\n\n - helm upgrade\n --install\n --wait ${NAMESPACE}-${DEPLOY_KIND} chart\n --timeout 3600s\n -f chart/values_${ENV}.yaml\n --set \"global.projectName=${PROJECT_NAME}\"\n --set \"global.clusterName=${CLUSTER_NAME}\"\n --set \"global.env=${ENV}\"\n --set \"global.deployKind=${DEPLOY_KIND}\"\n --set \"random=:$(date)\"\n --set \"app.tag=${TAG}\"\n --set \"ingress.host=${HOST}\"\n --set \"style=${STYLE}\"\n --set \"ingress.rootEnabled=${ROOT_ENABLED}\"").concat(system.configVars
|
|
@@ -26,4 +26,4 @@ var uiGitlabCiTmpl = function (_a) {
|
|
|
26
26
|
.join(''), "\n --namespace ${NAMESPACE}\n");
|
|
27
27
|
};
|
|
28
28
|
exports.uiGitlabCiTmpl = uiGitlabCiTmpl;
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2l0bGFiQ2kuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvcHJvamVjdHNHZW5lcmF0aW9uL2dlbmVyYXRvcnMvZmlsZVRlbXBsYXRlcy91aS9lbnZpcm9ubWVudC9naXRsYWJDaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSw0QkFBNEI7QUFDNUIsMkNBQTBDO0FBRTFDLDJDQUFvRDtBQUU3QyxJQUFNLGNBQWMsR0FBRyxVQUFDLEVBSUg7UUFIaEIsTUFBTSxtQkFBQSxFQUNoQixNQUFNLFlBQUEsRUFDTixPQUFPLGFBQUE7SUFDd0IsT0FBQSwwQkFFL0IsT0FBTyxDQUFDLDBCQUEwQjtRQUNoQyxDQUFDLENBQUMsRUFBRTtRQUNKLENBQUMsQ0FBQyxjQUNGLHdCQUFnQixPQUNuQixxVkFxQmlCLE1BQU0sQ0FBQyxJQUFJLG9SQWFwQixNQUFNLENBQUMsa0JBQWtCO1NBQzdCLEdBQUcsQ0FBQyxVQUFDLENBQUMsSUFBSyxPQUFBLGtCQUFXLENBQUMsQ0FBQyxVQUFVLHVCQUFhLENBQUMsQ0FBQyxVQUFVLFVBQU8sRUFBdkQsQ0FBdUQsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsbWtDQXlCeEUsTUFBTSxDQUFDLGtCQUFrQjtTQUM3QixHQUFHLENBQUMsVUFBQyxDQUFDLElBQUssT0FBQSxrQkFBVyxDQUFDLENBQUMsVUFBVSx1QkFBYSxDQUFDLENBQUMsVUFBVSxVQUFPLEVBQXZELENBQXVELENBQUMsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLHdoQkFzQi9FLE1BQU0sQ0FBQyxrQkFBa0I7U0FDeEIsR0FBRyxDQUFDLFVBQUMsQ0FBQztRQUNMLE9BQUEsaUJBQVUsQ0FBQyxDQUFDLElBQUksbUNBQ0MsQ0FBQyxDQUFDLElBQUkseURBR2YsQ0FBQyxDQUFDLElBQUkscUNBQ0csQ0FBQyxDQUFDLFdBQVcsc0ZBRzFCLENBQUMsQ0FBQyxVQUFVLHVCQUNWLENBQUMsQ0FBQyxVQUFVLFVBQU87SUFUekIsQ0FTeUIsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsaUJBRXpDLE1BQU0sQ0FBQyxrQkFBa0I7U0FDeEIsR0FBRyxDQUFDLFVBQUMsQ0FBQztRQUNMLE9BQUEsaUJBQVUsQ0FBQyxDQUFDLElBQUksNENBQ0MsQ0FBQyxDQUFDLElBQUksa0ZBSWYsQ0FBQyxDQUFDLElBQUkscUNBQ0csQ0FBQyxDQUFDLFdBQVcsbUdBRzFCLENBQUMsQ0FBQyxVQUFVLHVCQUNWLENBQUMsQ0FBQyxVQUFVLFVBQU87SUFWekIsQ0FVeUIsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsaUJBRXpDLE1BQU0sQ0FBQyxrQkFBa0I7U0FDeEIsR0FBRyxDQUFDLFVBQUMsQ0FBQyxJQUFJLE9BQUEsa0JBQVcsQ0FBQyxDQUFDLElBQUksZ0VBR3BCLENBQUMsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsWUFBWSw4QkFFMUMsQ0FBQyxDQUFDLFVBQVUsdUJBQ1YsQ0FBQyxDQUFDLFVBQVUsbUNBRWQsQ0FBQyxDQUFDLElBQUksd0NBRUYsQ0FBQyxDQUFDLElBQUksd0ZBR0csQ0FBQyxDQUFDLElBQUkseUNBQ0EsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxXQUFXLEVBQUUsMkVBQ0EsTUFBTSxDQUFDLFVBQVU7U0FDaEUsTUFBTSxDQUFDLFVBQUMsQ0FBQyxJQUFLLE9BQUEsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQXpELENBQXlELENBQUM7U0FDeEUsR0FBRyxDQUNGLFVBQUMsQ0FBQyxJQUFLLE9BQUEsZ0JBQVMsSUFBQSwwQkFBWSxFQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsaUJBQVEsQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLEVBQUUsY0FBSSxJQUFBLDBCQUFZLEVBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFHLEVBQXBGLENBQW9GLENBQzVGO1NBQ0EsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFFLEVBcEJKLENBb0JJLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLG1UQWVFLE9BQU8sQ0FBQyxrQkFBa0IsSUFBSSxNQUFNLHlvQkFrQmpCLE1BQU0sQ0FBQyxVQUFVO1NBQzVELE1BQU0sQ0FBQyxVQUFDLENBQUMsSUFBSyxPQUFBLENBQUMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUF6RCxDQUF5RCxDQUFDO1NBQ3hFLEdBQUcsQ0FBQyxVQUFDLENBQUMsSUFBSyxPQUFBLDBCQUFrQixDQUFDLENBQUMsSUFBSSxnQkFBTyxJQUFBLDBCQUFZLEVBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFJLEVBQXZELENBQXVELENBQUM7U0FDbkUsSUFBSSxDQUFDLEVBQUUsQ0FBQyx1Q0FFaEI7QUEvS2dDLENBK0toQyxDQUFBO0FBbkxZLFFBQUEsY0FBYyxrQkFtTDFCIn0=
|
|
@@ -81,7 +81,7 @@ var uiDefaultCreateTmpl = function (_a) {
|
|
|
81
81
|
: "// ".concat(utils_1.generatedWarning, "\n"), "\nconst Default").concat((0, cases_1.pascalSingular)(entity.name), "Create: FC<CreateProps> = (props: CreateProps) => {\n").concat(hasHidden
|
|
82
82
|
? " const {debug} = useDebug();\n"
|
|
83
83
|
: '', " const resolver = useMemo(() => yupResolver(get").concat((0, cases_1.pascalSingular)(entity.name), "Validation()), []);\n\n return (\n <Create\n redirect='show'\n {...props}\n transform={useCallback((data: any) => ({\n ...data,").concat(fieldsToWorkWith
|
|
84
|
-
.filter(function (f) { return ['datetime', 'date'].includes(f.type); })
|
|
84
|
+
.filter(function (f) { return f.requiredOnInput !== false && ['datetime', 'date'].includes(f.type); })
|
|
85
85
|
.map(function (f) { return "\n ".concat(f.name, ": data.").concat(f.name, " || null,"); })
|
|
86
86
|
.join(''), "\n }), [])}\n >\n <LoadingContext>\n <SimpleForm\n defaultValues=").concat(initialValues.length === 0
|
|
87
87
|
? '{{}}'
|
|
@@ -99,4 +99,4 @@ var uiDefaultCreateTmpl = function (_a) {
|
|
|
99
99
|
.join('\n'), "\n </Grid>\n </SimpleForm>\n </LoadingContext>\n </Create>\n );\n};\n\nexport default Default").concat((0, cases_1.pascalSingular)(entity.name), "Create;\n");
|
|
100
100
|
};
|
|
101
101
|
exports.uiDefaultCreateTmpl = uiDefaultCreateTmpl;
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
102
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVmYXVsdEVudGl0eUNyZWF0ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uLy4uL3NyYy9wcm9qZWN0c0dlbmVyYXRpb24vZ2VuZXJhdG9ycy9maWxlVGVtcGxhdGVzL3VpL3BhZ2VzL0VudGl0eUNyZWF0ZS9EZWZhdWx0RW50aXR5Q3JlYXRlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsdURBQThEO0FBQzlELHVDQUEwQjtBQUMxQixxRUFHd0M7QUFDeEMsc0dBQW9HO0FBRXBHLDhDQUFtRTtBQUNuRSxzREFBeUc7QUFFbEcsSUFBTSxtQkFBbUIsR0FBRyxVQUFDLEVBSVQ7UUFIekIsV0FBVyxpQkFBQSxFQUNYLE1BQU0sWUFBQSxFQUNOLE9BQU8sYUFBQTtJQUVQLElBQU0sYUFBYSxHQUFHLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLDBCQUFjLENBQUMsQ0FBQTtJQUMxRCxJQUFNLFdBQVcsR0FBRyxhQUFhLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQTtJQUU1QyxJQUFNLGNBQWMsR0FBRyxNQUFNLENBQUMsTUFBTTtTQUNqQyxNQUFNLENBQUMsVUFBQyxDQUFDLElBQUssT0FBQSxDQUFDLENBQUMsQ0FBQyxNQUFNLEVBQVQsQ0FBUyxDQUFDO1NBQ3hCLE1BQU0sQ0FBQyxVQUFDLENBQUMsSUFBSyxPQUFBLENBQUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsRUFBMUIsQ0FBMEIsQ0FBQztRQUMxQyxnRUFBZ0U7U0FDL0QsTUFBTSxDQUFDLFVBQUMsQ0FBQyxJQUFLLE9BQUEsQ0FBQyxDQUFDLElBQUksS0FBSyxJQUFJLElBQUksQ0FBQyxJQUFBLHVCQUFXLEVBQUMsTUFBTSxDQUFDLENBQUMsYUFBYSxFQUFyRCxDQUFxRCxDQUFDLENBQUE7SUFDdkUsSUFBTSxrQkFBa0IsR0FBRyxjQUFjLENBQUMsTUFBTSxDQUFD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
|
package/build/projectsGeneration/generators/fileTemplates/ui/pages/EntityEdit/DefaultEntityEdit.js
CHANGED
|
@@ -138,7 +138,7 @@ var uiDefaultEditTmpl = function (_a) {
|
|
|
138
138
|
.filter(function (f) { return f.name !== 'id'; });
|
|
139
139
|
var initialValues = fieldsToWorkWith.filter(function (f) { return (0, exports.getTsDefaultTypeValueExpression)(f); });
|
|
140
140
|
return "/* eslint-disable max-len */\nimport React, {FC, useMemo, useCallback} from 'react';\nimport {\n ".concat(R.uniq(reactAdminImports.map(function (el) { return "".concat(el, ","); })).join("\n "), "\n} from 'react-admin';").concat(dateFieldsToImport.some(function (f) { return f.type === 'datetime'; }) ? "\nimport DateTimeInput from '../../../../uiLib/DateTimeInput';" : '').concat(dateFieldsToImport.some(function (f) { return f.type === 'date'; }) ? "\nimport DateInput from '../../../../uiLib/DateInput';" : '').concat(hasHidden ? "\nimport {useDebug} from '../../../../contexts/DebugContext';" : '', "\nimport {Grid} from '@mui/material';\nimport {yupResolver} from '@hookform/resolvers/yup';\nimport get").concat((0, cases_1.pascalSingular)(entity.name), "Validation from '../get").concat((0, cases_1.pascalSingular)(entity.name), "Validation';\nimport {hasPermission} from '../../../../utils/permissions';\nimport {LoadingContext} from '../../../../contexts/LoadingContext';\n").concat(withFileRef ? 'import {FileInput} from \'../../../../uiLib/file/FileInput\';\n' : '', "\n").concat(options.skipWarningThisIsGenerated ? '' : "// ".concat(utils_1.generatedWarning, "\n"), "\nconst DefaultToolbar = (props: ToolbarProps) => {\n const {permissions} = usePermissions<string[]>();\n\n return (\n <Toolbar\n {...props}\n sx={{display: 'flex', justifyContent: 'space-between'}}\n >\n <SaveButton />\n {hasPermission(permissions, '").concat(entity.name, ".delete') && <DeleteButton mutationMode='pessimistic' />}\n </Toolbar>\n );\n};\n\nconst Default").concat((0, cases_1.pascalSingular)(entity.name), "Edit: FC<EditProps> = (props: EditProps) => {\n").concat(hasHidden ? " const {debug} = useDebug();\n" : '', " const resolver = useMemo(() => yupResolver(get").concat((0, cases_1.pascalSingular)(entity.name), "Validation()), []);\n\n return (\n <Edit\n redirect='show'\n {...props}\n transform={useCallback((data: any) => ({\n ...data,").concat(fieldsToWorkWith
|
|
141
|
-
.filter(function (f) { return ['datetime', 'date'].includes(f.type); })
|
|
141
|
+
.filter(function (f) { return f.requiredOnInput !== false && ['datetime', 'date'].includes(f.type); })
|
|
142
142
|
.map(function (f) { return "\n ".concat(f.name, ": data.").concat(f.name, " || null,"); })
|
|
143
143
|
.join(''), "\n }), [])}\n mutationMode='pessimistic'\n >\n <LoadingContext>\n <SimpleForm\n defaultValues=").concat(initialValues.length === 0 ? '{{}}' : "{{\n".concat(initialValues.map(function (f) { return "".concat(f.name, ": ").concat((0, exports.getTsDefaultTypeValueExpression)(f), ","); }).map(utils_1.pad6).join('\n'), "\n }}"), "\n resolver={resolver}\n toolbar={<DefaultToolbar />}\n >\n <Grid container spacing={2}>\n").concat(fieldsToWorkWith.length === 0 ? ' <div />' : fieldsToWorkWith
|
|
144
144
|
.map(function (f) {
|
|
@@ -149,4 +149,4 @@ var uiDefaultEditTmpl = function (_a) {
|
|
|
149
149
|
.join('\n'), "\n </Grid>\n </SimpleForm>\n </LoadingContext>\n </Edit>\n );\n};\n\nexport default Default").concat((0, cases_1.pascalSingular)(entity.name), "Edit;\n");
|
|
150
150
|
};
|
|
151
151
|
exports.uiDefaultEditTmpl = uiDefaultEditTmpl;
|
|
152
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
152
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DefaultEntityEdit.js","sourceRoot":"","sources":["../../../../../../../src/projectsGeneration/generators/fileTemplates/ui/pages/EntityEdit/DefaultEntityEdit.ts"],"names":[],"mappings":"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"}
|