Merge branch 'dev' of https://forgejo.chamomind.com/hrms-bangkok/hrms-admin into dev

* 'dev' of https://forgejo.chamomind.com/hrms-bangkok/hrms-admin:

.forgejo/workflows/build.yml

@@ -0,0 +1,50 @@
+# /.forgejo/workflows/build.yml
+name: Build
+
+# on:
+#   push:
+#     tags:
+#       - "v[0-9]+.[0-9]+.[0-9]+"
+#       - "v[0-9]+.[0-9]+.[0-9]+*"
+#   workflow_dispatch:
+
+env:
+  REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
+  REGISTRY_USERNAME: ${{ vars.CONTAINER_REGISTRY_USERNAME }}
+  REGISTRY_PASSWORD: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
+  CONTAINER_IMAGE_NAME: ${{ vars.CONTAINER_REGISTRY }}/${{ vars.CONTAINER_IMAGE_OWNER }}/${{ vars.CONTAINER_IMAGE_NAME }}
+  IMAGE_VERSION: build
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          config-inline: |
+            [registry."${{ env.REGISTRY }}"]
+              ca=["/etc/ssl/certs/ca-certificates.crt"]
+      - name: Tag Version
+        run: |
+          if [[ "${{ github.event_name }}" == "push" ]]; then
+            echo "IMAGE_VERSION=${{ github.ref_name }}" | sed 's/v//g' >> $GITHUB_ENV
+          else
+            echo "IMAGE_VERSION=${{ env.IMAGE_VERSION }}-${{ github.run_number }}" >> $GITHUB_ENV
+          fi
+      - name: Login in to registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ env.REGISTRY_USERNAME }}
+          password: ${{ env.REGISTRY_PASSWORD }}
+      - name: Build and push docker image
+        uses: docker/build-push-action@v3
+        with:
+          platforms: linux/amd64
+          context: .
+          file: ./docker/Dockerfile
+          tags: ${{ env.CONTAINER_IMAGE_NAME }}:latest,${{ env.CONTAINER_IMAGE_NAME }}:${{ env.IMAGE_VERSION }}
+          push: true

.forgejo/workflows/ci-cd.yml

@@ -0,0 +1,84 @@
+# /.forgejo/workflows/ci-cd.yml
+name: Build & Deploy on Dev
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+      # - 'version-[0-9]+.[0-9]+.[0-9]+'
+  workflow_dispatch:
+
+env:
+  REGISTRY: ${{ vars.CONTAINER_REGISTRY }}
+  REGISTRY_USERNAME: ${{ vars.CONTAINER_REGISTRY_USERNAME }}
+  REGISTRY_PASSWORD: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
+  CONTAINER_IMAGE_NAME: ${{ vars.CONTAINER_REGISTRY }}/${{ vars.CONTAINER_IMAGE_OWNER }}/${{ vars.CONTAINER_IMAGE_NAME }}
+  IMAGE_VERSION: latest
+  DISCORD_WEBHOOK: ${{ vars.DISCORD_WEBHOOK }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          config-inline: |
+            [registry."${{ env.REGISTRY }}"]
+              ca=["/etc/ssl/certs/ca-certificates.crt"]
+      - name: Tag Version
+        run: |
+          if [ "${{ github.ref_type }}" == "tag" ]; then
+            echo "IMAGE_VERSION=${{ github.ref_name }}" >> $GITHUB_ENV
+          else
+            echo "IMAGE_VERSION=latest" >> $GITHUB_ENV
+          fi
+      - name: Login in to registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ env.REGISTRY_USERNAME }}
+          password: ${{ env.REGISTRY_PASSWORD }}
+      - name: Build and push docker image
+        uses: docker/build-push-action@v3
+        with:
+          platforms: linux/amd64
+          context: .
+          file: ./docker/Dockerfile
+          tags: ${{ env.CONTAINER_IMAGE_NAME }}:latest,${{ env.CONTAINER_IMAGE_NAME }}:${{ env.IMAGE_VERSION }}
+          push: true
+      - name: Remote Deploy
+        uses: appleboy/ssh-action@v1.2.1
+        with:
+          host: ${{ vars.SSH_DEPLOY_HOST }}
+          port: ${{ vars.SSH_DEPLOY_PORT }}
+          username: ${{ secrets.SSH_DEPLOY_USER }}
+          password: ${{ secrets.SSH_DEPLOY_PASSWORD }}
+          script: |
+            cd ~/repo
+            ./replace-env.sh APP_CHECKIN "${{  env.IMAGE_VERSION }}"
+            ./deploy.sh hrms-admin
+
+      - name: Discord Notification
+        if: always()
+        run: |
+          STATUS="${{ job.status == 'success' && '✅ Success' || '❌ Failed' }}"
+          COLOR="${{ job.status == 'success' && '3066993' || '15158332' }}"
+          TIMESTAMP=$(date -u +%Y-%m-%dT%H:%M:%SZ)
+          curl -H "Content-Type: application/json" \
+          -X POST \
+          -d "{
+            \"embeds\": [{
+              \"title\": \"$STATUS\",
+              \"description\": \"**Build & Deploy**\\n- Image: \`${{ env.CONTAINER_IMAGE_NAME }}\`\\n- Version: \`${{ env.IMAGE_VERSION }}\`\\n- By: \`${{ github.actor }}\`\",
+              \"color\": $COLOR,
+              \"footer\": {
+                \"text\": \"Release Notification\",
+                \"icon_url\": \"https://example.com/success-icon.png\"
+              },
+              \"timestamp\": \"$TIMESTAMP\"
+            }]
+          }" \
+          ${{ env.DISCORD_WEBHOOK }}

.forgejo/workflows/deploy.yml

@@ -0,0 +1,29 @@
+name: Build
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Version to deploy"
+        type: string
+        required: false
+        default: "latest"
+
+env:
+  IMAGE_VERSION: build
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Remote Deploy
+        uses: appleboy/ssh-action@v1.2.1
+        with:
+          host: ${{ vars.SSH_DEPLOY_HOST }}
+          port: ${{ vars.SSH_DEPLOY_PORT }}
+          username: ${{ secrets.SSH_DEPLOY_USER }}
+          password: ${{ secrets.SSH_DEPLOY_PASSWORD }}
+          script: |
+            cd ~/repo
+            ./replace-env.sh APP_ADMIN "${{ inputs.version }}"
+            ./deploy.sh hrms-admin

.onedev-buildspec.yml

@@ -1,4 +1,4 @@
-version: 37
+version: 38
 jobs:
 - name: CI for UAT
   steps:
@@ -40,7 +40,7 @@ jobs:
     name: build docker image
     dockerfile: ./docker/Dockerfile
     output: !RegistryOutput
-      tags: hrms-git.chin.in.th/bma-hrms/hrms-admin:@build_version@ hrms-git.chin.in.th/bma-hrms/hrms-admin:latest
+      tags: '@server@/bma-hrms/hrms-admin:@build_version@ @server@/bma-hrms/hrms-admin:latest'
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
   triggers:
   - !TagCreateTrigger
@@ -90,7 +90,7 @@ jobs:
     name: build docker image
     dockerfile: ./docker/Dockerfile
     output: !RegistryOutput
-      tags: hrms-git.bangkok.go.th/bma-hrms/hrms-admin:@build_version@ hrms-git.bangkok.go.th/bma-hrms/hrms-admin:latest
+      tags: '@server@/bma-hrms/hrms-admin:@build_version@ @server@/bma-hrms/hrms-admin:latest'
     condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
   triggers:
   - !TagCreateTrigger

src/modules/03_logs/components/LogTable.vue

@@ -626,12 +626,10 @@ onMounted(async () => {
               :options="statusOpt"
               option-value="id"
               option-label="name"
-              lazy-rules
               hide-bottom-space
               borderless
               outlined
-              style="width: 150px"
+              style="width: 160px"
-              :hide-dropdown-icon="false"
               @update:modelValue="selectedDate()"
               clearable
             >
@@ -1094,9 +1092,9 @@ onMounted(async () => {
   background-color: #eeeeee;
 }
 
-.dp__action_row {
+/*.dp__action_row {
   padding: 2px !important;
-}
+}*/
 
 .tree-container {
   overflow: auto;