Merge branch 'develop' into nice_dev

# Conflicts: # src/views/MainView.vue
2025-02-19 15:01:50 +07:00 · 2025-02-19 15:01:50 +07:00 · 1774cf1991
commit 1774cf1991
parent f8304cb80b 33757bc359
5 changed files with 107 additions and 112 deletions
--- a/.env.production
+++ b/.env.production
@ -1,2 +1,3 @@
 VITE_API_URI_CONFIG=VITE_API_URI_CONFIG
-VITE_URL_SSO=VITE_URL_SSO
+VITE_URL_SSO=VITE_URL_SSO
+VITE_URL_LANDING=VITE_URL_LANDING
--- a/.onedev-buildspec.yml
+++ b/.onedev-buildspec.yml
@ -1,102 +1,102 @@
-version: 37
+version: 38
 jobs:
-  - name: CI for UAT
-    steps:
-      - !CheckoutStep
-        name: checkout code
-        cloneCredential: !DefaultCredential {}
-        withLfs: false
-        withSubmodules: false
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !GenerateChecksumStep
-        name: generate package checksum
-        files: package-lock.json yarn.lock
-        targetFile: checksum
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !SetupCacheStep
-        name: set up npm cache
-        key: node_modules_@file:checksum@
-        loadKeys:
-          - node_modules
-        paths:
-          - node_modules
-        uploadStrategy: UPLOAD_IF_NOT_HIT
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !SetBuildVersionStep
-        name: set build version
-        buildVersion: '@tag@'
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !CommandStep
-        name: build & test
-        runInContainer: true
-        image: node
-        interpreter: !DefaultInterpreter
-          commands: |
-            npm install
-            npm run build
-        useTTY: true
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !BuildImageStep
-        name: build docker image
-        dockerfile: ./docker/Dockerfile
-        output: !RegistryOutput
-          tags: hrms-git.chin.in.th/bma-hrms/hrms-checkin:@build_version@ hrms-git.chin.in.th/bma-hrms/hrms-checkin:latest
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-    triggers:
-      - !TagCreateTrigger
-        tags: uat-*
-        branches: main
-    retryCondition: never
-    maxRetries: 3
-    retryDelay: 30
-    timeout: 14400
-  - name: CI for PROD
-    steps:
-      - !CheckoutStep
-        name: checkout code
-        cloneCredential: !DefaultCredential {}
-        withLfs: false
-        withSubmodules: false
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !GenerateChecksumStep
-        name: generate package checksum
-        files: package-lock.json yarn.lock
-        targetFile: checksum
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !SetupCacheStep
-        name: set up npm cache
-        key: node_modules_@file:checksum@
-        loadKeys:
-          - node_modules
-        paths:
-          - node_modules
-        uploadStrategy: UPLOAD_IF_NOT_HIT
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !SetBuildVersionStep
-        name: set build version
-        buildVersion: '@tag@'
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !CommandStep
-        name: build & test
-        runInContainer: true
-        image: node
-        interpreter: !DefaultInterpreter
-          commands: |
-            npm install
-            npm run build
-        useTTY: true
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-      - !BuildImageStep
-        name: build docker image
-        dockerfile: ./docker/Dockerfile
-        output: !RegistryOutput
-          tags: hrms-git.bangkok.go.th/bma-hrms/hrms-checkin:@build_version@ hrms-git.bangkok.go.th/bma-hrms/hrms-checkin:latest
-        condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
-    triggers:
-      - !TagCreateTrigger
-        tags: prod-*
-        branches: main
-    retryCondition: never
-    maxRetries: 3
-    retryDelay: 30
-    timeout: 14400
+- name: CI for UAT
+  steps:
+  - !CheckoutStep
+    name: checkout code
+    cloneCredential: !DefaultCredential {}
+    withLfs: false
+    withSubmodules: false
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !GenerateChecksumStep
+    name: generate package checksum
+    files: package-lock.json yarn.lock
+    targetFile: checksum
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !SetupCacheStep
+    name: set up npm cache
+    key: node_modules_@file:checksum@
+    loadKeys:
+    - node_modules
+    paths:
+    - node_modules
+    uploadStrategy: UPLOAD_IF_NOT_HIT
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !SetBuildVersionStep
+    name: set build version
+    buildVersion: '@tag@'
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !CommandStep
+    name: build & test
+    runInContainer: true
+    image: node
+    interpreter: !DefaultInterpreter
+      commands: |
+        npm install
+        npm run build
+    useTTY: true
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !BuildImageStep
+    name: build docker image
+    dockerfile: ./docker/Dockerfile
+    output: !RegistryOutput
+      tags: '@server@/bma-hrms/hrms-checkin:@build_version@ @server@/bma-hrms/hrms-checkin:latest'
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  triggers:
+  - !TagCreateTrigger
+    tags: uat-*
+    branches: main
+  retryCondition: never
+  maxRetries: 3
+  retryDelay: 30
+  timeout: 14400
+- name: CI for PROD
+  steps:
+  - !CheckoutStep
+    name: checkout code
+    cloneCredential: !DefaultCredential {}
+    withLfs: false
+    withSubmodules: false
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !GenerateChecksumStep
+    name: generate package checksum
+    files: package-lock.json yarn.lock
+    targetFile: checksum
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !SetupCacheStep
+    name: set up npm cache
+    key: node_modules_@file:checksum@
+    loadKeys:
+    - node_modules
+    paths:
+    - node_modules
+    uploadStrategy: UPLOAD_IF_NOT_HIT
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !SetBuildVersionStep
+    name: set build version
+    buildVersion: '@tag@'
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !CommandStep
+    name: build & test
+    runInContainer: true
+    image: node
+    interpreter: !DefaultInterpreter
+      commands: |
+        npm install
+        npm run build
+    useTTY: true
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  - !BuildImageStep
+    name: build docker image
+    dockerfile: ./docker/Dockerfile
+    output: !RegistryOutput
+      tags: '@server@/bma-hrms/hrms-checkin:@build_version@ @server@/bma-hrms/hrms-checkin:latest'
+    condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
+  triggers:
+  - !TagCreateTrigger
+    tags: prod-*
+    branches: main
+  retryCondition: never
+  maxRetries: 3
+  retryDelay: 30
+  timeout: 14400
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -1,7 +1,7 @@
 # docker buildx build --platform=linux/amd64 -f docker/Dockerfile . -t hrms-git.chin.in.th/bma-hrms/hrms-checkin:0.1

 # Build Stage
-FROM node:20-alpine as build-stage
+FROM node:20-alpine AS build-stage
 WORKDIR /app
 COPY package*.json ./
 RUN npm install
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@ -10,6 +10,7 @@ do

  sed -i 's|VITE_API_URI_CONFIG|'${VITE_API_URI_CONFIG}'|g' $file
  sed -i 's|VITE_URL_SSO|'${VITE_URL_SSO}'|g' $file
+  sed -i 's|VITE_URL_LANDING|'${VITE_URL_LANDING}'|g' $file

 done

--- a/src/views/MainView.vue
+++ b/src/views/MainView.vue
@ -19,7 +19,7 @@ const $q = useQuasar()

 // landing page config url
 const configParam = {
-  landingPageUrl: import.meta.env.VITE_URL_SSO,
+  landingPageUrl: import.meta.env.VITE_URL_LANDING,
 }

 const fullName = ref<string>('') //ชื่อผู้ใช้งาน
@ -141,14 +141,7 @@ function onLoad(index: number, done: Function) {
 }

 // landing page redirect
-const landingPageUrl = ref<string>(getLandingUrl())
-function getLandingUrl() {
-  if (window.location.hostname === "bma-ehr-checkin.frappet.synology.me") {
-    return `${configParam.landingPageUrl}/e-hr`;
-  } else {
-    return configParam.landingPageUrl;
-  }
-}
+const landingPageUrl = ref<string>(configParam.landingPageUrl)

 /** ฟังก์ชันเรียกข้อมูลผู้ใช่งาน*/
 async function fetchKeycloakPosition() {