From 8a53037137dc0dc6bfccc541ea26130c6f61c8fb Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 11 Jun 2024 14:07:20 +0700 Subject: [PATCH] updated --- .github/workflows/release.yaml | 158 +++++++++--------- src/interface/request/main/main.ts | 6 +- .../components/position/01ListPosition.vue | 2 - src/modules/01_metadata/router.ts | 88 +++------- .../components/Roles/DialogAddRole.vue | 2 +- src/modules/02_users/router.ts | 26 +-- src/modules/02_users/views/listsRole.vue | 4 +- .../02_users/views/permissionDetail.vue | 33 +++- .../02_users/views/permissionsView.vue | 6 +- src/modules/03_logs/router.ts | 2 - src/plugins/checkPermission.ts | 10 ++ src/router/index.ts | 9 +- src/stores/roleUser.ts | 41 ----- src/views/MainLayout.vue | 6 +- 14 files changed, 154 insertions(+), 239 deletions(-) create mode 100644 src/plugins/checkPermission.ts delete mode 100644 src/stores/roleUser.ts diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index d91fae54..3536fcb6 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -1,86 +1,86 @@ name: release-test run-name: release-test ${{ github.actor }} on: - push: - tags: - - "version-[0-9]+.[0-9]+.[0-9]+" - workflow_dispatch: + push: + tags: + - "version-[0-9]+.[0-9]+.[0-9]+" + workflow_dispatch: env: - REGISTRY: docker.frappet.com - IMAGE_NAME: ehr/bma-ehr-admin - DEPLOY_HOST: 49.0.91.80 - COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-admin + REGISTRY: docker.frappet.com + IMAGE_NAME: ehr/bma-ehr-admin + DEPLOY_HOST: frappet.com + COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-admin jobs: - # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=test-v6.1 -s DOCKER_USER=sorawit -s DOCKER_PASS=P@ssword -s SSH_PASSWORD=P@ssw0rd - release-test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - # skip Set up QEMU because it fail on act and container - # Gen Version try to get version from tag or inut - - name: Set output tags - id: vars - run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT - - name: Gen Version - id: gen_ver - run: | - if [[ $GITHUB_REF == 'refs/tags/'* ]]; then - IMAGE_VER=${{ steps.vars.outputs.tag }} - else - IMAGE_VER=${{ github.event.inputs.IMAGE_VER }} - fi - if [[ $IMAGE_VER == '' ]]; then - IMAGE_VER='test-vBeta' - fi - echo '::set-output name=image_ver::'$IMAGE_VER - - name: Test Version - run: | - echo $GITHUB_REF - echo ${{ steps.gen_ver.outputs.image_ver }} - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login in to registry - uses: docker/login-action@v2 - with: - registry: ${{env.REGISTRY}} - username: ${{secrets.DOCKER_USER}} - password: ${{secrets.DOCKER_PASS}} - - name: Build and load local docker image - uses: docker/build-push-action@v3 - with: - context: . - platforms: linux/amd64 - push: true - tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{ steps.gen_ver.outputs.image_ver }},${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest + # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=test-v6.1 -s DOCKER_USER=sorawit -s DOCKER_PASS=P@ssword -s SSH_PASSWORD=P@ssw0rd + release-test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + # skip Set up QEMU because it fail on act and container + # Gen Version try to get version from tag or inut + - name: Set output tags + id: vars + run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT + - name: Gen Version + id: gen_ver + run: | + if [[ $GITHUB_REF == 'refs/tags/'* ]]; then + IMAGE_VER=${{ steps.vars.outputs.tag }} + else + IMAGE_VER=${{ github.event.inputs.IMAGE_VER }} + fi + if [[ $IMAGE_VER == '' ]]; then + IMAGE_VER='test-vBeta' + fi + echo '::set-output name=image_ver::'$IMAGE_VER + - name: Test Version + run: | + echo $GITHUB_REF + echo ${{ steps.gen_ver.outputs.image_ver }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login in to registry + uses: docker/login-action@v2 + with: + registry: ${{env.REGISTRY}} + username: ${{secrets.DOCKER_USER}} + password: ${{secrets.DOCKER_PASS}} + - name: Build and load local docker image + uses: docker/build-push-action@v3 + with: + context: . + platforms: linux/amd64 + push: true + tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{ steps.gen_ver.outputs.image_ver }},${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest - - name: Reload docker compose - uses: appleboy/ssh-action@v0.1.8 - with: - host: ${{env.DEPLOY_HOST}} - username: frappet - password: ${{ secrets.SSH_PASSWORD }} - port: 10102 - script: | - cd "${{env.COMPOSE_PATH}}" - docker compose pull - docker compose up -d - echo "${{ steps.gen_ver.outputs.image_ver }}"> success - - uses: snow-actions/line-notify@v1.1.0 - if: success() - with: - access_token: ${{ secrets.TOKEN_LINE }} - message: | - -Success✅✅✅ - Image: ${{env.IMAGE_NAME}} - Version: ${{ steps.gen_ver.outputs.IMAGE_VER }} - By: ${{secrets.DOCKER_USER}} - - uses: snow-actions/line-notify@v1.1.0 - if: failure() - with: - access_token: ${{ secrets.TOKEN_LINE }} - message: | - -Failure❌❌❌ - Image: ${{env.IMAGE_NAME}} - Version: ${{ steps.gen_ver.outputs.IMAGE_VER }} - By: ${{secrets.DOCKER_USER}} + - name: Reload docker compose + uses: appleboy/ssh-action@v0.1.8 + with: + host: ${{env.DEPLOY_HOST}} + username: frappet + password: ${{ secrets.SSH_PASSWORD }} + port: 10102 + script: | + cd "${{env.COMPOSE_PATH}}" + docker compose pull + docker compose up -d + echo "${{ steps.gen_ver.outputs.image_ver }}"> success + - uses: snow-actions/line-notify@v1.1.0 + if: success() + with: + access_token: ${{ secrets.TOKEN_LINE }} + message: | + -Success✅✅✅ + Image: ${{env.IMAGE_NAME}} + Version: ${{ steps.gen_ver.outputs.IMAGE_VER }} + By: ${{secrets.DOCKER_USER}} + - uses: snow-actions/line-notify@v1.1.0 + if: failure() + with: + access_token: ${{ secrets.TOKEN_LINE }} + message: | + -Failure❌❌❌ + Image: ${{env.IMAGE_NAME}} + Version: ${{ steps.gen_ver.outputs.IMAGE_VER }} + By: ${{secrets.DOCKER_USER}} diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts index 17552269..e86d1180 100644 --- a/src/interface/request/main/main.ts +++ b/src/interface/request/main/main.ts @@ -57,7 +57,7 @@ const menuList = readonly([ activeIcon: "person", label: "ข้อมูลหลัก", path: "metadata", - role: ["SUPER_ADMIN", "ADMIN"], + role: ["SUPER_ADMIN"], children: [ { key: 2.0, @@ -100,12 +100,12 @@ const menuList = readonly([ }, { key: 2.0, - label: "จัดการบทบาท (Roles)", + label: "จัดการบทบาทและสิทธิ์ (Roles)", path: "manageRoles", }, { key: 2.0, - label: "จัดการสิทธิ์ (Permissions)", + label: "กำหนดสิทธิ์ (Permissions)", path: "managePermission", }, ], diff --git a/src/modules/01_metadata/components/position/01ListPosition.vue b/src/modules/01_metadata/components/position/01ListPosition.vue index e9be0866..96381387 100644 --- a/src/modules/01_metadata/components/position/01ListPosition.vue +++ b/src/modules/01_metadata/components/position/01ListPosition.vue @@ -418,13 +418,11 @@ onMounted(() => { - copyPosition diff --git a/src/modules/01_metadata/router.ts b/src/modules/01_metadata/router.ts index 05cb48f2..cb79bd2d 100644 --- a/src/modules/01_metadata/router.ts +++ b/src/modules/01_metadata/router.ts @@ -48,9 +48,7 @@ export default [ name: "masterCalendarWork", component: calendarWorkPage, meta: { - Auth: true, - Key: [7], - Role: "metadata", + Role: ["SUPER_ADMIN"], }, }, { @@ -58,9 +56,7 @@ export default [ name: "masterInsigniaPage", component: masterInsignia, meta: { - Auth: true, - Key: [7], - Role: "metadata", + Role: ["SUPER_ADMIN"], }, }, { @@ -68,9 +64,7 @@ export default [ name: "masterInsigniadetail", component: detailInsignia, meta: { - Auth: true, - Key: [7], - Role: "metadata", + Role: ["SUPER_ADMIN"], }, }, { @@ -78,9 +72,7 @@ export default [ name: "masterPersonal", component: personalPage, meta: { - Auth: true, - Key: [7], - Role: "metadata", + Role: ["SUPER_ADMIN"], }, }, { @@ -88,9 +80,7 @@ export default [ name: "masterPersonalDistrict", component: personalDistrict, meta: { - Auth: true, - Key: [7], - Role: "metadata", + Role: ["SUPER_ADMIN"], }, }, { @@ -98,9 +88,7 @@ export default [ name: "masterPersonalSubDistrict", component: personalSubDistrict, meta: { - Auth: true, - Key: [7], - Role: "metadata", + Role: ["SUPER_ADMIN"], }, }, { @@ -108,9 +96,7 @@ export default [ name: "masterPosition", component: positionPage, meta: { - Auth: true, - Key: [7], - Role: "metadata", + Role: ["SUPER_ADMIN"], }, }, { @@ -118,9 +104,7 @@ export default [ name: "masterPositionLevel", component: positionLevelPage, meta: { - Auth: true, - Key: [9], - Role: "metadata", + Role: ["SUPER_ADMIN"], }, }, { @@ -128,9 +112,7 @@ export default [ name: "masterPositionEmployee", component: positionEmployeePage, meta: { - Auth: true, - Key: [8], - Role: "metadata", + Role: ["SUPER_ADMIN"], }, }, { @@ -138,9 +120,7 @@ export default [ name: "masterPositionEmployeeLevel", component: positionEmployeeLevelPage, meta: { - Auth: true, - Key: [9], - Role: "metadata", + Role: ["SUPER_ADMIN"], }, }, @@ -149,9 +129,7 @@ export default [ name: "KPIIndicatorByPlan", component: IndicatorByPlan, meta: { - Auth: true, - Key: [1.1], - Role: "evaluateKPI", + Role: ["SUPER_ADMIN"], }, }, @@ -160,9 +138,7 @@ export default [ name: "KPIIndicatorByPlan/Add", component: IndicatorByPlanDetail, meta: { - Auth: true, - Key: [1.1], - Role: "evaluateKPI", + Role: ["SUPER_ADMIN"], }, }, { @@ -170,9 +146,7 @@ export default [ name: "KPIIndicatorByPlanByid", component: IndicatorByPlanDetail, meta: { - Auth: true, - Key: [1.1], - Role: "evaluateKPI", + Role: ["SUPER_ADMIN"], }, }, { @@ -180,9 +154,7 @@ export default [ name: "KPIIndicatorByRole", component: IndicatorByRole, meta: { - Auth: true, - Key: [1.1], - Role: "evaluateKPI", + Role: ["SUPER_ADMIN"], }, }, { @@ -190,9 +162,7 @@ export default [ name: "KPIIndicatorByRoleAdd", component: IndicatorByRoleDetail, meta: { - Auth: true, - Key: [1.1], - Role: "evaluateKPI", + Role: ["SUPER_ADMIN"], }, }, { @@ -200,9 +170,7 @@ export default [ name: "KPIIndicatorByRoleByid", component: IndicatorByRoleDetail, meta: { - Auth: true, - Key: [1.1], - Role: "evaluateKPI", + Role: ["SUPER_ADMIN"], }, }, { @@ -210,9 +178,7 @@ export default [ name: "KPICompetency", component: competencyPage, meta: { - Auth: true, - Key: [1.1], - Role: "evaluateKPI", + Role: ["SUPER_ADMIN"], }, }, { @@ -220,9 +186,7 @@ export default [ name: "KPICompetencyAdd", component: competencyAddPage, meta: { - Auth: true, - Key: [1.1], - Role: "evaluateKPI", + Role: ["SUPER_ADMIN"], }, }, { @@ -230,9 +194,7 @@ export default [ name: "KPICompetencyByid", component: competencyAddPage, meta: { - Auth: true, - Key: [1.1], - Role: "evaluateKPI", + Role: ["SUPER_ADMIN"], }, }, @@ -241,9 +203,7 @@ export default [ name: "strategic", component: StrategicView, meta: { - Auth: true, - Key: [1.6], - Role: "development", + Role: ["SUPER_ADMIN"], }, }, { @@ -251,9 +211,7 @@ export default [ name: "KPIAssignment", component: AssignmentView, meta: { - Auth: true, - Key: [1.6], - Role: "development", + Role: ["SUPER_ADMIN"], }, }, { @@ -261,9 +219,7 @@ export default [ name: "KPIAssignmentById", component: AssignmentDetailView, meta: { - Auth: true, - Key: [1.1], - Role: "evaluateKPI", + Role: ["SUPER_ADMIN"], }, }, ]; diff --git a/src/modules/02_users/components/Roles/DialogAddRole.vue b/src/modules/02_users/components/Roles/DialogAddRole.vue index 6e996857..9c023633 100644 --- a/src/modules/02_users/components/Roles/DialogAddRole.vue +++ b/src/modules/02_users/components/Roles/DialogAddRole.vue @@ -127,7 +127,7 @@ watch( lazy-rules hide-bottom-space class="inputgreen" - label="คำอิบาย" + label="คำอธิบาย" type="textarea" /> diff --git a/src/modules/02_users/router.ts b/src/modules/02_users/router.ts index 2673c623..384eefec 100644 --- a/src/modules/02_users/router.ts +++ b/src/modules/02_users/router.ts @@ -18,9 +18,7 @@ export default [ name: "manageUsers", component: ListsPageUser, meta: { - Auth: true, - Key: [7], - Role: "user_role", + Role: ["SUPER_ADMIN", "ADMIN"], }, }, { @@ -28,25 +26,15 @@ export default [ name: "manageUsersRolesId", component: PageManagementRole, meta: { - Auth: true, - Key: [7], - Role: "user_role", + Role: ["SUPER_ADMIN", "ADMIN"], }, }, - - { - path: "/users/:id", - name: "masterInsignia", - }, - { path: "/roles", name: "manageRoles", component: ListsPageRole, meta: { - Auth: true, - Key: [7], - Role: "user_role", + Role: ["SUPER_ADMIN", "ADMIN"], }, }, @@ -55,9 +43,7 @@ export default [ name: "manageRolesId", component: ListsPage2Role, meta: { - Auth: true, - Key: [7], - Role: "user_role", + Role: ["SUPER_ADMIN", "ADMIN"], }, }, @@ -66,9 +52,7 @@ export default [ name: "managePermission", component: PermissionPage, meta: { - Auth: true, - Key: [7], - Role: "user_role", + Role: ["SUPER_ADMIN", "ADMIN"], }, }, ]; diff --git a/src/modules/02_users/views/listsRole.vue b/src/modules/02_users/views/listsRole.vue index 50f83c8d..86dee7df 100644 --- a/src/modules/02_users/views/listsRole.vue +++ b/src/modules/02_users/views/listsRole.vue @@ -153,7 +153,9 @@ onMounted(() => {