From b3e0db3da96b30056c5d4a868e3cd68e24293701 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Sun, 24 Dec 2023 02:02:17 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20env?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                                           | 4 +++-
 entrypoint.sh                                             | 3 ++-
 src/api/index.ts                                          | 1 +
 .../12_evaluatePersonal/components/Detail/step/step2.vue  | 8 ++++----
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.env.production b/.env.production
index fcce87e13..5ba22af69 100644
--- a/.env.production
+++ b/.env.production
@@ -5,6 +5,7 @@ VITE_S3CLUSTER_PUBLIC_URL=VITE_S3CLUSTER_PUBLIC_URL
 VITE_REALM_KEYCLOAK=VITE_REALM_KEYCLOAK
 VITE_CLIENTID_KEYCLOAK=VITE_CLIENTID_KEYCLOAK
 VITE_URL_KEYCLOAK=VITE_URL_KEYCLOAK
+VITE_API_PUBLISH_URL=VITE_API_PUBLISH_URL
 
 # VITE_COMPETITIVE_EXAM_PANEL: "https://bma-dashboard.frappet.synology.me/goto/KO0GpSu4z?orgId=1"
 # VITE_QUALIFY_DISABLE_EMAM_PANEL: "https://bma-dashboard.frappet.synology.me/goto/dQQzpIX4z?orgId=1"
@@ -12,4 +13,5 @@ VITE_URL_KEYCLOAK=VITE_URL_KEYCLOAK
 # VITE_S3CLUSTER_PUBLIC_URL: "https://s3cluster.frappet.com/bma-ehr-fpt/organization/strueture/"
 # VITE_REALM_KEYCLOAK: "bma-ehr"
 # VITE_CLIENTID_KEYCLOAK: "bma-ehr-vue3"
-# VITE_URL_KEYCLOAK: "https://id.frappet.synology.me/"
\ No newline at end of file
+# VITE_URL_KEYCLOAK: "https://id.frappet.synology.me/"
+# VITE_API_PUBLISH_URL: "https://bma-ehr-publish.frappet.synology.me"
\ No newline at end of file
diff --git a/entrypoint.sh b/entrypoint.sh
index 6de45f224..6d4a7faa2 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -4,7 +4,7 @@ ROOT_DIR=/app
 
 # Replace env vars in JavaScript files
 echo "Replacing env constants in JS"
-for file in $ROOT_DIR/assets/app.*.js* $ROOT_DIR/js/app.*.js* $ROOT_DIR/index.html $ROOT_DIR/precache-manifest*.js $ROOT_DIR/assets/index*.js*;
+for file in $ROOT_DIR/assets/app.*.js* $ROOT_DIR/js/app.*.js* $ROOT_DIR/index.html $ROOT_DIR/precache-manifest*.js $ROOT_DIR/assets/index*.js* $ROOT_DIR/assets/*.js*;
 do
   echo "Processing $file ...";
 
@@ -15,6 +15,7 @@ do
   sed -i 's|VITE_REALM_KEYCLOAK|'${VITE_REALM_KEYCLOAK}'|g' $file 
   sed -i 's|VITE_CLIENTID_KEYCLOAK|'${VITE_CLIENTID_KEYCLOAK}'|g' $file 
   sed -i 's|VITE_URL_KEYCLOAK|'${VITE_URL_KEYCLOAK}'|g' $file 
+  sed -i 's|VITE_API_PUBLISH_URL|'${VITE_API_PUBLISH_URL}'|g' $file 
 
 done
 
diff --git a/src/api/index.ts b/src/api/index.ts
index a1c1f94e4..3315adba4 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -2,6 +2,7 @@
 import { ref } from "vue";
 
 const env = ref<string>(process.env.NODE_ENV || "development");
+export const apiUrlConfigPublish = import.meta.env.VITE_API_PUBLISH_URL;
 // if (process.env.VUE_APP_TEST) {
 //   env = "test";
 // }
diff --git a/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue b/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue
index a921b7154..ab2c81fdd 100644
--- a/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue
+++ b/src/modules/12_evaluatePersonal/components/Detail/step/step2.vue
@@ -105,10 +105,10 @@ function getSigner() {
     .get(config.API.evaluationSigner(id.value, 1))
     .then((res) => {
       const data = res.data.result;
-      formCommand.elementaryFullName = data.commanderFullname;
-      formCommand.elementaryPosition = data.commanderPosition;
-      formCommand.abovelevelFullname = data.commanderAboveFullname;
-      formCommand.abovelevelPosition = data.commanderAbovePosition;
+      formCommand.elementaryFullName = data == null ? "" : data.commanderFullname;
+      formCommand.elementaryPosition = data == null ? "" : data.commanderPosition;
+      formCommand.abovelevelFullname = data == null ? "" : data.commanderAboveFullname;
+      formCommand.abovelevelPosition = data == null ? "" : data.commanderAbovePosition;
     })
     .catch((e) => {
       messageError($q, e);