rez_core 6.5.28 → 6.5.29
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/dist/app.module.js +3 -3
- package/dist/app.module.js.map +1 -1
- package/dist/core.module.js +38 -60
- package/dist/core.module.js.map +1 -1
- package/dist/migrations/1732612800000-AddEntityJsonGinIndex.d.ts +6 -0
- package/dist/migrations/1732612800000-AddEntityJsonGinIndex.js +32 -0
- package/dist/migrations/1732612800000-AddEntityJsonGinIndex.js.map +1 -0
- package/dist/module/auth/strategies/jwt.strategy.d.ts +1 -2
- package/dist/module/auth/strategies/jwt.strategy.js +2 -3
- package/dist/module/auth/strategies/jwt.strategy.js.map +1 -1
- package/dist/module/dashboard/dashboard.module.js +1 -1
- package/dist/module/dashboard/dashboard.module.js.map +1 -1
- package/dist/module/dashboard/service/dashboard.service.js +3 -2
- package/dist/module/dashboard/service/dashboard.service.js.map +1 -1
- package/dist/module/enterprise/controller/organization.controller.d.ts +4 -12
- package/dist/module/enterprise/controller/organization.controller.js +8 -64
- package/dist/module/enterprise/controller/organization.controller.js.map +1 -1
- package/dist/module/enterprise/enterprise.module.js +15 -10
- package/dist/module/enterprise/enterprise.module.js.map +1 -1
- package/dist/module/enterprise/entity/enterprise.entity.d.ts +3 -1
- package/dist/module/enterprise/entity/enterprise.entity.js +12 -4
- package/dist/module/enterprise/entity/enterprise.entity.js.map +1 -1
- package/dist/module/enterprise/entity/organization-app-mapping.entity.d.ts +1 -6
- package/dist/module/enterprise/entity/organization-app-mapping.entity.js +4 -21
- package/dist/module/enterprise/entity/organization-app-mapping.entity.js.map +1 -1
- package/dist/module/enterprise/entity/organization.entity.d.ts +18 -3
- package/dist/module/enterprise/entity/organization.entity.js +74 -8
- package/dist/module/enterprise/entity/organization.entity.js.map +1 -1
- package/dist/module/enterprise/repository/enterprise.repository.d.ts +2 -4
- package/dist/module/enterprise/repository/enterprise.repository.js +4 -19
- package/dist/module/enterprise/repository/enterprise.repository.js.map +1 -1
- package/dist/module/enterprise/service/brand.service.d.ts +3 -0
- package/dist/module/enterprise/service/brand.service.js +17 -0
- package/dist/module/enterprise/service/brand.service.js.map +1 -1
- package/dist/module/enterprise/service/enterprise.service.d.ts +2 -2
- package/dist/module/enterprise/service/enterprise.service.js +4 -4
- package/dist/module/enterprise/service/enterprise.service.js.map +1 -1
- package/dist/module/enterprise/service/organization.service.d.ts +4 -4
- package/dist/module/enterprise/service/organization.service.js +24 -101
- package/dist/module/enterprise/service/organization.service.js.map +1 -1
- package/dist/module/entity_json/controller/entity_json.controller.d.ts +2 -9
- package/dist/module/entity_json/controller/entity_json.controller.js.map +1 -1
- package/dist/module/entity_json/entity/entityJson.entity.d.ts +2 -1
- package/dist/module/entity_json/entity/entityJson.entity.js +5 -1
- package/dist/module/entity_json/entity/entityJson.entity.js.map +1 -1
- package/dist/module/entity_json/entity_json.module.js +7 -2
- package/dist/module/entity_json/entity_json.module.js.map +1 -1
- package/dist/module/entity_json/service/entity_json.service.d.ts +2 -10
- package/dist/module/entity_json/service/entity_json.service.js +98 -23
- package/dist/module/entity_json/service/entity_json.service.js.map +1 -1
- package/dist/module/filter/controller/filter.controller.d.ts +12 -0
- package/dist/module/filter/controller/filter.controller.js +1 -1
- package/dist/module/filter/controller/filter.controller.js.map +1 -1
- package/dist/module/filter/filter.module.js +11 -2
- package/dist/module/filter/filter.module.js.map +1 -1
- package/dist/module/filter/service/filter.service.d.ts +38 -2
- package/dist/module/filter/service/filter.service.js +43 -50
- package/dist/module/filter/service/filter.service.js.map +1 -1
- package/dist/module/filter/service/flatjson-filter.service.d.ts +32 -0
- package/dist/module/filter/service/flatjson-filter.service.js +632 -0
- package/dist/module/filter/service/flatjson-filter.service.js.map +1 -0
- package/dist/module/filter/service/saved-filter.service.d.ts +3 -2
- package/dist/module/filter/service/saved-filter.service.js +14 -18
- package/dist/module/filter/service/saved-filter.service.js.map +1 -1
- package/dist/module/integration/service/integration.service.d.ts +1 -0
- package/dist/module/integration/service/integration.service.js +2 -1
- package/dist/module/integration/service/integration.service.js.map +1 -1
- package/dist/module/integration/service/wrapper.service.js +1 -0
- package/dist/module/integration/service/wrapper.service.js.map +1 -1
- package/dist/module/layout/controller/layout.controller.d.ts +3 -1
- package/dist/module/layout/controller/layout.controller.js +7 -3
- package/dist/module/layout/controller/layout.controller.js.map +1 -1
- package/dist/module/layout/entity/header-section.entity.d.ts +2 -0
- package/dist/module/layout/entity/header-section.entity.js +8 -0
- package/dist/module/layout/entity/header-section.entity.js.map +1 -1
- package/dist/module/layout/layout.module.js +2 -1
- package/dist/module/layout/layout.module.js.map +1 -1
- package/dist/module/layout/repository/header-section.repository.d.ts +1 -0
- package/dist/module/layout/repository/header-section.repository.js +5 -0
- package/dist/module/layout/repository/header-section.repository.js.map +1 -1
- package/dist/module/layout/service/header-section.service.d.ts +1 -1
- package/dist/module/layout/service/header-section.service.js +1 -1
- package/dist/module/layout/service/header-section.service.js.map +1 -1
- package/dist/module/linked_attributes/controller/linked_attributes.controller.d.ts +41 -0
- package/dist/module/linked_attributes/controller/linked_attributes.controller.js +90 -0
- package/dist/module/linked_attributes/controller/linked_attributes.controller.js.map +1 -1
- package/dist/module/linked_attributes/dto/create-linked-attribute-smart.dto.d.ts +13 -0
- package/dist/module/linked_attributes/dto/create-linked-attribute-smart.dto.js +64 -0
- package/dist/module/linked_attributes/dto/create-linked-attribute-smart.dto.js.map +1 -0
- package/dist/module/linked_attributes/linked_attributes.module.js +8 -1
- package/dist/module/linked_attributes/linked_attributes.module.js.map +1 -1
- package/dist/module/linked_attributes/service/linked_attributes.service.d.ts +65 -1
- package/dist/module/linked_attributes/service/linked_attributes.service.js +287 -2
- package/dist/module/linked_attributes/service/linked_attributes.service.js.map +1 -1
- package/dist/module/listmaster/service/list-master.service.js +8 -1
- package/dist/module/listmaster/service/list-master.service.js.map +1 -1
- package/dist/module/meta/controller/meta.controller.d.ts +6 -1
- package/dist/module/meta/controller/meta.controller.js +19 -1
- package/dist/module/meta/controller/meta.controller.js.map +1 -1
- package/dist/module/meta/entity/app-master.entity.d.ts +4 -8
- package/dist/module/meta/entity/app-master.entity.js +12 -30
- package/dist/module/meta/entity/app-master.entity.js.map +1 -1
- package/dist/module/meta/entity/entity-master.entity.d.ts +1 -0
- package/dist/module/meta/entity/entity-master.entity.js +8 -1
- package/dist/module/meta/entity/entity-master.entity.js.map +1 -1
- package/dist/module/meta/entity.module.js +5 -2
- package/dist/module/meta/entity.module.js.map +1 -1
- package/dist/module/meta/repository/app-master.repository.js +1 -1
- package/dist/module/meta/repository/app-master.repository.js.map +1 -1
- package/dist/module/meta/service/attribute-master.service.d.ts +6 -1
- package/dist/module/meta/service/attribute-master.service.js +22 -2
- package/dist/module/meta/service/attribute-master.service.js.map +1 -1
- package/dist/module/meta/service/entity-master.service.js +1 -0
- package/dist/module/meta/service/entity-master.service.js.map +1 -1
- package/dist/module/meta/service/entity-relation.service.d.ts +4 -3
- package/dist/module/meta/service/entity-relation.service.js +10 -4
- package/dist/module/meta/service/entity-relation.service.js.map +1 -1
- package/dist/module/meta/service/entity-service-impl.service.d.ts +1 -1
- package/dist/module/meta/service/entity-service-impl.service.js +14 -10
- package/dist/module/meta/service/entity-service-impl.service.js.map +1 -1
- package/dist/module/meta/service/entity-table.service.d.ts +2 -3
- package/dist/module/meta/service/entity-table.service.js +19 -23
- package/dist/module/meta/service/entity-table.service.js.map +1 -1
- package/dist/module/meta/service/populate-meta.service.d.ts +13 -0
- package/dist/module/{enterprise → meta}/service/populate-meta.service.js +8 -2
- package/dist/module/meta/service/populate-meta.service.js.map +1 -0
- package/dist/module/meta/service/resolver.service.d.ts +1 -1
- package/dist/module/meta/service/resolver.service.js +6 -3
- package/dist/module/meta/service/resolver.service.js.map +1 -1
- package/dist/module/module/controller/menu.controller.js +2 -2
- package/dist/module/module/controller/menu.controller.js.map +1 -1
- package/dist/module/module/controller/module-access.controller.d.ts +4 -3
- package/dist/module/module/controller/module-access.controller.js +10 -15
- package/dist/module/module/controller/module-access.controller.js.map +1 -1
- package/dist/module/module/entity/menu.entity.d.ts +4 -6
- package/dist/module/module/entity/menu.entity.js +12 -16
- package/dist/module/module/entity/menu.entity.js.map +1 -1
- package/dist/module/module/entity/module-access.entity.d.ts +0 -15
- package/dist/module/module/entity/module-access.entity.js +0 -50
- package/dist/module/module/entity/module-access.entity.js.map +1 -1
- package/dist/module/module/entity/module-action.entity.d.ts +2 -4
- package/dist/module/module/entity/module-action.entity.js +6 -11
- package/dist/module/module/entity/module-action.entity.js.map +1 -1
- package/dist/module/module/entity/module.entity.d.ts +5 -3
- package/dist/module/module/entity/module.entity.js +18 -8
- package/dist/module/module/entity/module.entity.js.map +1 -1
- package/dist/module/module/module.module.d.ts +1 -1
- package/dist/module/module/module.module.js +7 -5
- package/dist/module/module/module.module.js.map +1 -1
- package/dist/module/module/repository/menu.repository.d.ts +4 -4
- package/dist/module/module/repository/menu.repository.js +27 -17
- package/dist/module/module/repository/menu.repository.js.map +1 -1
- package/dist/module/module/repository/module-access.repository.d.ts +7 -7
- package/dist/module/module/repository/module-access.repository.js +48 -86
- package/dist/module/module/repository/module-access.repository.js.map +1 -1
- package/dist/module/module/service/menu.service.d.ts +5 -3
- package/dist/module/module/service/menu.service.js +12 -9
- package/dist/module/module/service/menu.service.js.map +1 -1
- package/dist/module/module/service/module-access.service.d.ts +11 -8
- package/dist/module/module/service/module-access.service.js +26 -24
- package/dist/module/module/service/module-access.service.js.map +1 -1
- package/dist/module/notification/entity/notification.entity.d.ts +2 -17
- package/dist/module/notification/entity/notification.entity.js +2 -68
- package/dist/module/notification/entity/notification.entity.js.map +1 -1
- package/dist/module/notification/notification.module.js +2 -0
- package/dist/module/notification/notification.module.js.map +1 -1
- package/dist/module/notification/service/notification.service.d.ts +3 -1
- package/dist/module/notification/service/notification.service.js +5 -2
- package/dist/module/notification/service/notification.service.js.map +1 -1
- package/dist/module/notification/service/otp.service.js.map +1 -1
- package/dist/module/user/controller/login.controller.d.ts +3 -1
- package/dist/module/user/controller/login.controller.js +6 -2
- package/dist/module/user/controller/login.controller.js.map +1 -1
- package/dist/module/user/controller/user.controller.d.ts +2 -0
- package/dist/module/user/controller/user.controller.js +13 -0
- package/dist/module/user/controller/user.controller.js.map +1 -1
- package/dist/module/user/dto/create-user.dto.d.ts +3 -6
- package/dist/module/user/dto/create-user.dto.js +11 -17
- package/dist/module/user/dto/create-user.dto.js.map +1 -1
- package/dist/module/user/entity/role.entity.d.ts +6 -18
- package/dist/module/user/entity/role.entity.js +19 -64
- package/dist/module/user/entity/role.entity.js.map +1 -1
- package/dist/module/user/entity/user-role-mapping.entity.d.ts +0 -10
- package/dist/module/user/entity/user-role-mapping.entity.js +1 -33
- package/dist/module/user/entity/user-role-mapping.entity.js.map +1 -1
- package/dist/module/user/entity/user-session.entity.d.ts +2 -0
- package/dist/module/user/entity/user-session.entity.js +20 -2
- package/dist/module/user/entity/user-session.entity.js.map +1 -1
- package/dist/module/user/entity/user.entity.d.ts +5 -17
- package/dist/module/user/entity/user.entity.js +15 -61
- package/dist/module/user/entity/user.entity.js.map +1 -1
- package/dist/module/user/repository/role.repository.d.ts +2 -6
- package/dist/module/user/repository/role.repository.js +8 -16
- package/dist/module/user/repository/role.repository.js.map +1 -1
- package/dist/module/user/repository/user-role-mapping.repository.d.ts +0 -1
- package/dist/module/user/repository/user-role-mapping.repository.js +0 -3
- package/dist/module/user/repository/user-role-mapping.repository.js.map +1 -1
- package/dist/module/user/repository/user.repository.d.ts +2 -4
- package/dist/module/user/repository/user.repository.js +7 -19
- package/dist/module/user/repository/user.repository.js.map +1 -1
- package/dist/module/user/repository/userSession.repository.d.ts +0 -1
- package/dist/module/user/repository/userSession.repository.js +0 -3
- package/dist/module/user/repository/userSession.repository.js.map +1 -1
- package/dist/module/user/service/login.service.d.ts +5 -3
- package/dist/module/user/service/login.service.js +42 -43
- package/dist/module/user/service/login.service.js.map +1 -1
- package/dist/module/user/service/role.service.d.ts +11 -24
- package/dist/module/user/service/role.service.js +38 -42
- package/dist/module/user/service/role.service.js.map +1 -1
- package/dist/module/user/service/user-role-mapping.service.d.ts +0 -2
- package/dist/module/user/service/user-role-mapping.service.js +0 -6
- package/dist/module/user/service/user-role-mapping.service.js.map +1 -1
- package/dist/module/user/service/user-session.service.d.ts +4 -3
- package/dist/module/user/service/user-session.service.js +11 -10
- package/dist/module/user/service/user-session.service.js.map +1 -1
- package/dist/module/user/service/user.service.d.ts +20 -29
- package/dist/module/user/service/user.service.js +56 -44
- package/dist/module/user/service/user.service.js.map +1 -1
- package/dist/module/user/user.module.js +7 -1
- package/dist/module/user/user.module.js.map +1 -1
- package/dist/module/workflow/repository/action-data.repository.d.ts +1 -1
- package/dist/module/workflow/repository/action-data.repository.js +8 -6
- package/dist/module/workflow/repository/action-data.repository.js.map +1 -1
- package/dist/module/workflow/repository/action.repository.d.ts +1 -1
- package/dist/module/workflow/repository/action.repository.js +10 -10
- package/dist/module/workflow/repository/action.repository.js.map +1 -1
- package/dist/module/workflow/repository/form-master.repository.d.ts +1 -1
- package/dist/module/workflow/repository/form-master.repository.js +2 -2
- package/dist/module/workflow/repository/form-master.repository.js.map +1 -1
- package/dist/module/workflow/service/action-data.service.js +2 -1
- package/dist/module/workflow/service/action-data.service.js.map +1 -1
- package/dist/module/workflow/service/action.service.js +2 -2
- package/dist/module/workflow/service/action.service.js.map +1 -1
- package/dist/module/workflow/service/comm-template.service.js +2 -0
- package/dist/module/workflow/service/comm-template.service.js.map +1 -1
- package/dist/module/workflow/service/entity-modification.service.js +1 -0
- package/dist/module/workflow/service/entity-modification.service.js.map +1 -1
- package/dist/module/workflow/service/form-master.service.js +2 -2
- package/dist/module/workflow/service/form-master.service.js.map +1 -1
- package/dist/module/workflow/service/populate-workflow.service.d.ts +1 -1
- package/dist/module/workflow/service/populate-workflow.service.js +1 -1
- package/dist/module/workflow/service/populate-workflow.service.js.map +1 -1
- package/dist/module/workflow/service/task.service.js +3 -0
- package/dist/module/workflow/service/task.service.js.map +1 -1
- package/dist/module/workflow/service/workflow-meta.service.js +7 -2
- package/dist/module/workflow/service/workflow-meta.service.js.map +1 -1
- package/dist/module/workflow/service/workflow.service.js +2 -2
- package/dist/module/workflow/service/workflow.service.js.map +1 -1
- package/dist/module/workflow/workflow.module.js +0 -2
- package/dist/module/workflow/workflow.module.js.map +1 -1
- package/dist/module/workflow-automation/service/workflow-automation.service.js +6 -11
- package/dist/module/workflow-automation/service/workflow-automation.service.js.map +1 -1
- package/dist/module/workflow-automation/workflow-automation.module.js +1 -3
- package/dist/module/workflow-automation/workflow-automation.module.js.map +1 -1
- package/dist/module/workflow-schedule/service/workflow-schedule.service.js +2 -0
- package/dist/module/workflow-schedule/service/workflow-schedule.service.js.map +1 -1
- package/dist/table.config.d.ts +3 -2
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/app.module.ts +5 -5
- package/src/core.module.ts +44 -55
- package/src/migrations/1732612800000-AddEntityJsonGinIndex.ts +41 -0
- package/src/module/auth/strategies/jwt.strategy.ts +2 -4
- package/src/module/dashboard/dashboard.module.ts +3 -3
- package/src/module/dashboard/service/dashboard.service.ts +3 -2
- package/src/module/enterprise/controller/organization.controller.ts +4 -60
- package/src/module/enterprise/enterprise.module.ts +18 -16
- package/src/module/enterprise/entity/enterprise.entity.ts +11 -5
- package/src/module/enterprise/entity/organization-app-mapping.entity.ts +4 -18
- package/src/module/enterprise/entity/organization.entity.ts +59 -9
- package/src/module/enterprise/repository/enterprise.repository.ts +4 -26
- package/src/module/enterprise/service/brand.service.ts +5 -75
- package/src/module/enterprise/service/enterprise.service.ts +4 -10
- package/src/module/enterprise/service/organization.service.ts +23 -140
- package/src/module/entity_json/controller/entity_json.controller.ts +13 -0
- package/src/module/entity_json/docs/FlatJson_Filterin_System.md +2804 -0
- package/src/module/entity_json/entity/entityJson.entity.ts +4 -1
- package/src/module/entity_json/entity_json.module.ts +9 -5
- package/src/module/entity_json/service/entity_json.service.ts +233 -49
- package/src/module/filter/controller/filter.controller.ts +1 -3
- package/src/module/filter/filter.module.ts +12 -3
- package/src/module/filter/service/filter.service.ts +130 -73
- package/src/module/filter/service/flatjson-filter.service.ts +903 -0
- package/src/module/filter/service/saved-filter.service.ts +16 -26
- package/src/module/filter/test/flatjson-filter.service.spec.ts +415 -0
- package/src/module/integration/service/integration.service.ts +6 -2
- package/src/module/integration/service/wrapper.service.ts +1 -0
- package/src/module/layout/controller/layout.controller.ts +8 -1
- package/src/module/layout/entity/header-section.entity.ts +6 -0
- package/src/module/layout/layout.module.ts +1 -1
- package/src/module/layout/repository/header-section.repository.ts +6 -0
- package/src/module/layout/service/header-section.service.ts +1 -1
- package/src/module/linked_attributes/controller/linked_attributes.controller.ts +100 -0
- package/src/module/linked_attributes/dto/create-linked-attribute-smart.dto.ts +54 -0
- package/src/module/linked_attributes/linked_attributes.module.ts +9 -2
- package/src/module/linked_attributes/service/linked_attributes.service.ts +578 -3
- package/src/module/linked_attributes/test/linked-attributes.service.spec.ts +244 -0
- package/src/module/listmaster/service/list-master.service.ts +9 -1
- package/src/module/meta/controller/meta.controller.ts +25 -3
- package/src/module/meta/entity/app-master.entity.ts +9 -22
- package/src/module/meta/entity/entity-master.entity.ts +9 -3
- package/src/module/meta/entity.module.ts +6 -5
- package/src/module/meta/repository/app-master.repository.ts +1 -1
- package/src/module/meta/service/attribute-master.service.ts +31 -1
- package/src/module/meta/service/entity-master.service.ts +1 -0
- package/src/module/meta/service/entity-relation.service.ts +10 -6
- package/src/module/meta/service/entity-service-impl.service.ts +14 -19
- package/src/module/meta/service/entity-table.service.ts +28 -20
- package/src/module/meta/service/entity.service.ts +0 -1
- package/src/module/{enterprise → meta}/service/populate-meta.service.ts +5 -2
- package/src/module/meta/service/resolver.service.ts +4 -0
- package/src/module/module/controller/menu.controller.ts +2 -2
- package/src/module/module/controller/module-access.controller.ts +11 -16
- package/src/module/module/entity/menu.entity.ts +10 -14
- package/src/module/module/entity/module-access.entity.ts +1 -41
- package/src/module/module/entity/module-action.entity.ts +6 -10
- package/src/module/module/entity/module.entity.ts +14 -7
- package/src/module/module/module.module.ts +3 -2
- package/src/module/module/repository/menu.repository.ts +31 -19
- package/src/module/module/repository/module-access.repository.ts +63 -100
- package/src/module/module/service/menu.service.ts +13 -11
- package/src/module/module/service/module-access.service.ts +38 -26
- package/src/module/notification/entity/notification.entity.ts +3 -53
- package/src/module/notification/notification.module.ts +2 -0
- package/src/module/notification/service/notification.service.ts +1 -0
- package/src/module/notification/service/otp.service.ts +2 -3
- package/src/module/user/controller/login.controller.ts +8 -7
- package/src/module/user/controller/user.controller.ts +9 -0
- package/src/module/user/dto/create-user.dto.ts +6 -19
- package/src/module/user/entity/role.entity.ts +16 -59
- package/src/module/user/entity/user-role-mapping.entity.ts +3 -29
- package/src/module/user/entity/user-session.entity.ts +19 -3
- package/src/module/user/entity/user.entity.ts +13 -48
- package/src/module/user/repository/role.repository.ts +12 -24
- package/src/module/user/repository/user-role-mapping.repository.ts +1 -5
- package/src/module/user/repository/user.repository.ts +8 -28
- package/src/module/user/repository/userSession.repository.ts +1 -5
- package/src/module/user/service/login.service.ts +51 -47
- package/src/module/user/service/role.service.ts +60 -53
- package/src/module/user/service/user-role-mapping.service.ts +1 -23
- package/src/module/user/service/user-session.service.ts +11 -14
- package/src/module/user/service/user.service.ts +91 -64
- package/src/module/user/user.module.ts +5 -3
- package/src/module/workflow/repository/action-data.repository.ts +8 -6
- package/src/module/workflow/repository/action.repository.ts +11 -11
- package/src/module/workflow/repository/form-master.repository.ts +2 -2
- package/src/module/workflow/service/action-data.service.ts +2 -3
- package/src/module/workflow/service/action.service.ts +2 -2
- package/src/module/workflow/service/comm-template.service.ts +2 -0
- package/src/module/workflow/service/entity-modification.service.ts +1 -0
- package/src/module/workflow/service/form-master.service.ts +2 -2
- package/src/module/workflow/service/populate-workflow.service.ts +1 -1
- package/src/module/workflow/service/task.service.ts +3 -0
- package/src/module/workflow/service/workflow-meta.service.ts +7 -2
- package/src/module/workflow/service/workflow.service.ts +2 -2
- package/src/module/workflow/workflow.module.ts +0 -2
- package/src/module/workflow-automation/service/workflow-automation.service.ts +7 -19
- package/src/module/workflow-automation/workflow-automation.module.ts +3 -4
- package/src/module/workflow-schedule/service/workflow-schedule.service.ts +2 -0
- package/src/resources/dev.properties.yaml +2 -2
- package/.claude/settings.local.json +0 -26
- package/.idea/250218_nodejs_core.iml +0 -9
- package/.idea/codeStyles/Project.xml +0 -59
- package/.idea/codeStyles/codeStyleConfig.xml +0 -5
- package/.idea/copilot.data.migration.agent.xml +0 -6
- package/.idea/copilot.data.migration.ask.xml +0 -6
- package/.idea/copilot.data.migration.ask2agent.xml +0 -6
- package/.idea/copilot.data.migration.edit.xml +0 -6
- package/.idea/inspectionProfiles/Project_Default.xml +0 -6
- package/.idea/misc.xml +0 -6
- package/.idea/modules.xml +0 -8
- package/.idea/prettier.xml +0 -6
- package/.idea/vcs.xml +0 -6
- package/dist/constant/status.constant.d.ts +0 -4
- package/dist/constant/status.constant.js +0 -9
- package/dist/constant/status.constant.js.map +0 -1
- package/dist/module/enterprise/controller/enterprise.controller.d.ts +0 -12
- package/dist/module/enterprise/controller/enterprise.controller.js +0 -57
- package/dist/module/enterprise/controller/enterprise.controller.js.map +0 -1
- package/dist/module/enterprise/controller/meta.controller.d.ts +0 -9
- package/dist/module/enterprise/controller/meta.controller.js +0 -43
- package/dist/module/enterprise/controller/meta.controller.js.map +0 -1
- package/dist/module/enterprise/service/brand-profile.service.d.ts +0 -0
- package/dist/module/enterprise/service/brand-profile.service.js +0 -1
- package/dist/module/enterprise/service/brand-profile.service.js.map +0 -1
- package/dist/module/enterprise/service/populate-meta.service.d.ts +0 -9
- package/dist/module/enterprise/service/populate-meta.service.js.map +0 -1
- package/dist/module/enterprise/service/school.service.d.ts +0 -0
- package/dist/module/enterprise/service/school.service.js +0 -1
- package/dist/module/enterprise/service/school.service.js.map +0 -1
- package/server.log +0 -850
- package/src/constant/status.constant.ts +0 -4
- package/src/module/enterprise/controller/enterprise.controller.ts +0 -40
- package/src/module/enterprise/controller/meta.controller.ts +0 -23
- package/src/module/enterprise/service/brand-profile.service.ts +0 -10
- package/src/module/enterprise/service/school.service.ts +0 -5
|
@@ -6,7 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
6
6
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
|
-
exports.
|
|
9
|
+
exports.ModuleModule = void 0;
|
|
10
10
|
const common_1 = require("@nestjs/common");
|
|
11
11
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
12
12
|
const module_entity_1 = require("./entity/module.entity");
|
|
@@ -23,10 +23,11 @@ const user_role_mapping_entity_1 = require("../user/entity/user-role-mapping.ent
|
|
|
23
23
|
const user_module_1 = require("../user/user.module");
|
|
24
24
|
const role_entity_1 = require("../user/entity/role.entity");
|
|
25
25
|
const module_access_entity_1 = require("./entity/module-access.entity");
|
|
26
|
-
|
|
26
|
+
const listmaster_module_1 = require("../listmaster/listmaster.module");
|
|
27
|
+
let ModuleModule = class ModuleModule {
|
|
27
28
|
};
|
|
28
|
-
exports.
|
|
29
|
-
exports.
|
|
29
|
+
exports.ModuleModule = ModuleModule;
|
|
30
|
+
exports.ModuleModule = ModuleModule = __decorate([
|
|
30
31
|
(0, common_1.Module)({
|
|
31
32
|
imports: [
|
|
32
33
|
typeorm_1.TypeOrmModule.forFeature([
|
|
@@ -39,6 +40,7 @@ exports.ModuleAccessModule = ModuleAccessModule = __decorate([
|
|
|
39
40
|
]),
|
|
40
41
|
utils_module_1.UtilsModule,
|
|
41
42
|
user_module_1.UserModule,
|
|
43
|
+
listmaster_module_1.ListMasterModule,
|
|
42
44
|
],
|
|
43
45
|
controllers: [menu_controller_1.MenuController, module_access_controller_1.ModuleAccessController],
|
|
44
46
|
providers: [
|
|
@@ -49,5 +51,5 @@ exports.ModuleAccessModule = ModuleAccessModule = __decorate([
|
|
|
49
51
|
],
|
|
50
52
|
exports: [module_access_service_1.ModuleAccessService, menu_service_1.MenuService],
|
|
51
53
|
})
|
|
52
|
-
],
|
|
54
|
+
], ModuleModule);
|
|
53
55
|
//# sourceMappingURL=module.module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.module.js","sourceRoot":"","sources":["../../../src/module/module/module.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAChD,0DAAoD;AACpD,2DAAuD;AACvD,wEAA6D;AAC7D,2EAAsE;AACtE,kEAA8D;AAC9D,yDAAqD;AACrD,kEAA8D;AAC9D,sDAAgD;AAChD,oFAA+E;AAC/E,oFAA+E;AAC/E,sFAA0E;AAC1E,qDAAiD;AACjD,4DAAkD;AAClD,wEAA6D;
|
|
1
|
+
{"version":3,"file":"module.module.js","sourceRoot":"","sources":["../../../src/module/module/module.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAChD,0DAAoD;AACpD,2DAAuD;AACvD,wEAA6D;AAC7D,2EAAsE;AACtE,kEAA8D;AAC9D,yDAAqD;AACrD,kEAA8D;AAC9D,sDAAgD;AAChD,oFAA+E;AAC/E,oFAA+E;AAC/E,sFAA0E;AAC1E,qDAAiD;AACjD,4DAAkD;AAClD,wEAA6D;AAC7D,uEAAmE;AAyB5D,IAAM,YAAY,GAAlB,MAAM,YAAY;CAAG,CAAA;AAAf,oCAAY;uBAAZ,YAAY;IAvBxB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC;gBACvB,0BAAU;gBACV,mCAAY;gBACZ,mCAAY;gBACZ,sBAAQ;gBACR,0CAAe;gBACf,kBAAI;aACL,CAAC;YACF,0BAAW;YACX,wBAAU;YACV,oCAAgB;SACjB;QACD,WAAW,EAAE,CAAC,gCAAc,EAAE,iDAAsB,CAAC;QACrD,SAAS,EAAE;YACT,2CAAmB;YACnB,0BAAW;YACX,gCAAc;YACd,iDAAsB;SACvB;QACD,OAAO,EAAE,CAAC,2CAAmB,EAAC,0BAAW,CAAC;KAC3C,CAAC;GACW,YAAY,CAAG"}
|
|
@@ -8,8 +8,8 @@ export declare class MenuRepository extends Repository<MenuData> {
|
|
|
8
8
|
private readonly reflectionHelper;
|
|
9
9
|
private readonly moduleAccessRepo;
|
|
10
10
|
constructor(dataSource: DataSource, menuData: Repository<MenuData>, reflectionHelper: ReflectionHelper, moduleAccessRepo: Repository<ModuleAccess>);
|
|
11
|
-
getUserRoles(userId: number,
|
|
12
|
-
getAccessibleModules(roleIds: number[],
|
|
13
|
-
getMenuItems(
|
|
14
|
-
resolveUserRoles(userId: number,
|
|
11
|
+
getUserRoles(userId: number, appcode: string): Promise<number[]>;
|
|
12
|
+
getAccessibleModules(roleIds: number[], appCode: string): Promise<string[]>;
|
|
13
|
+
getMenuItems(moduleCodes: string[], appcode: string, levelType: string): Promise<any[]>;
|
|
14
|
+
resolveUserRoles(userId: number, appcode: string, levelType: string, levelId: number): Promise<number[]>;
|
|
15
15
|
}
|
|
@@ -27,37 +27,46 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
|
|
|
27
27
|
this.reflectionHelper = reflectionHelper;
|
|
28
28
|
this.moduleAccessRepo = moduleAccessRepo;
|
|
29
29
|
}
|
|
30
|
-
async getUserRoles(userId,
|
|
30
|
+
async getUserRoles(userId, appcode) {
|
|
31
31
|
const userRoleMappingRepo = this.reflectionHelper.getRepoService('UserRoleMapping');
|
|
32
32
|
const roles = await userRoleMappingRepo
|
|
33
33
|
.createQueryBuilder('urm')
|
|
34
34
|
.innerJoin('sso_role', 'role', 'role.id = urm.role_id')
|
|
35
35
|
.select('urm.role_id', 'role_id')
|
|
36
36
|
.where('urm.user_id = :userId', { userId })
|
|
37
|
-
.andWhere('role.
|
|
37
|
+
.andWhere('role.appcode = :appcode', { appcode })
|
|
38
38
|
.getRawMany();
|
|
39
39
|
return roles.map((r) => r.role_id);
|
|
40
40
|
}
|
|
41
|
-
async getAccessibleModules(roleIds,
|
|
41
|
+
async getAccessibleModules(roleIds, appCode) {
|
|
42
|
+
const roleRepo = this.reflectionHelper.getRepoService('Role');
|
|
43
|
+
const roleCodes = await roleRepo
|
|
44
|
+
.createQueryBuilder('role')
|
|
45
|
+
.select('role.code', 'code')
|
|
46
|
+
.where('role.id IN (:...roleIds)', { roleIds })
|
|
47
|
+
.getRawMany();
|
|
48
|
+
const codes = roleCodes.map((r) => r.code);
|
|
49
|
+
if (codes.length === 0)
|
|
50
|
+
return [];
|
|
42
51
|
const modules = await this.moduleAccessRepo
|
|
43
52
|
.createQueryBuilder('moduleAccess')
|
|
44
|
-
.select('moduleAccess.
|
|
45
|
-
.where('moduleAccess.
|
|
53
|
+
.select('moduleAccess.module_code')
|
|
54
|
+
.where('moduleAccess.role_code IN (:...codes)', { codes })
|
|
46
55
|
.andWhere('moduleAccess.access_flag > 0')
|
|
47
|
-
.andWhere('moduleAccess.
|
|
56
|
+
.andWhere('LOWER(moduleAccess.appcode) = LOWER(:appCode)', { appCode })
|
|
48
57
|
.getMany();
|
|
49
|
-
return Array.from(new Set(modules.map((module) => module.
|
|
58
|
+
return Array.from(new Set(modules.map((module) => module.module_code)));
|
|
50
59
|
}
|
|
51
|
-
async getMenuItems(
|
|
60
|
+
async getMenuItems(moduleCodes, appcode, levelType) {
|
|
52
61
|
return await this.menuData
|
|
53
62
|
.createQueryBuilder('menu')
|
|
54
63
|
.leftJoin('sso_module', 'module', `
|
|
55
64
|
menu.module_code = module.module_code
|
|
56
|
-
AND menu.
|
|
65
|
+
AND LOWER(menu.appcode) = LOWER(module.appcode)
|
|
57
66
|
AND menu.level_type = module.level_type
|
|
58
67
|
`)
|
|
59
|
-
.where('menu.
|
|
60
|
-
.andWhere('menu.
|
|
68
|
+
.where('menu.module_code IN (:...moduleCodes)', { moduleCodes })
|
|
69
|
+
.andWhere('LOWER(menu.appcode) = LOWER(:appcode)', { appcode })
|
|
61
70
|
.andWhere('menu.level_type = :levelType', { levelType })
|
|
62
71
|
.andWhere('menu.ui_visible = 1')
|
|
63
72
|
.select([
|
|
@@ -65,11 +74,12 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
|
|
|
65
74
|
'module.component_name AS component',
|
|
66
75
|
'module.title AS title',
|
|
67
76
|
'module.entity_type AS entity_type',
|
|
68
|
-
'module.type AS type'
|
|
77
|
+
'module.type AS type',
|
|
78
|
+
'module.ui_config AS ui_config',
|
|
69
79
|
])
|
|
70
80
|
.getRawMany();
|
|
71
81
|
}
|
|
72
|
-
async resolveUserRoles(userId,
|
|
82
|
+
async resolveUserRoles(userId, appcode, levelType, levelId) {
|
|
73
83
|
const repo = this.reflectionHelper.getRepoService('UserRoleMapping');
|
|
74
84
|
if (userId) {
|
|
75
85
|
const userRepo = this.reflectionHelper.getRepoService('UserData');
|
|
@@ -81,7 +91,7 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
|
|
|
81
91
|
const getUserUrm = await repo.findOne({
|
|
82
92
|
where: {
|
|
83
93
|
user_id: userId,
|
|
84
|
-
|
|
94
|
+
appcode: appcode,
|
|
85
95
|
},
|
|
86
96
|
});
|
|
87
97
|
if (getUserDetails &&
|
|
@@ -97,7 +107,7 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
|
|
|
97
107
|
.where('urm.user_id = :userId', { userId: userId })
|
|
98
108
|
.andWhere('urm.level_type = :levelType', { levelType })
|
|
99
109
|
.andWhere('urm.level_id = :levelId', { levelId: levelId })
|
|
100
|
-
.andWhere('role.
|
|
110
|
+
.andWhere('role.appcode = :appcode', { appcode })
|
|
101
111
|
.getRawMany();
|
|
102
112
|
if (roles.length)
|
|
103
113
|
return roles.map((r) => r.urm_role_id);
|
|
@@ -118,7 +128,7 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
|
|
|
118
128
|
.where('urm.user_id = :userId', { userId })
|
|
119
129
|
.andWhere('urm.level_type = :levelType', { levelType: 'BRN' })
|
|
120
130
|
.andWhere('urm.level_id = :levelId', { levelId: brandId })
|
|
121
|
-
.andWhere('role.
|
|
131
|
+
.andWhere('role.appcode = :appcode', { appcode })
|
|
122
132
|
.getRawMany();
|
|
123
133
|
if (roles.length)
|
|
124
134
|
return roles.map((r) => r.urm_role_id);
|
|
@@ -131,7 +141,7 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
|
|
|
131
141
|
.where('urm.user_id = :userId', { userId })
|
|
132
142
|
.andWhere('urm.level_type = :levelType', { levelType: 'ORG' })
|
|
133
143
|
.andWhere('urm.level_id = :levelId', { levelId: orgId })
|
|
134
|
-
.andWhere('role.
|
|
144
|
+
.andWhere('role.appcode = :appcode', { appcode })
|
|
135
145
|
.getRawMany();
|
|
136
146
|
if (roles.length)
|
|
137
147
|
return roles.map((r) => r.urm_role_id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/menu.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAiD;AACjD,uDAAiD;AACjD,yEAA8D;AAC9D,6CAAmD;AACnD,gGAAoF;AAG7E,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,oBAAoB;IACtD,YACmB,UAAsB,EACM,QAA8B,EAC1D,gBAAkC,EAElC,gBAA0C;QAE3D,KAAK,CAAC,sBAAQ,EAAE,UAAU,CAAC,mBAAmB,EAAE,CAAC,CAAC;QANjC,eAAU,GAAV,UAAU,CAAY;QACM,aAAQ,GAAR,QAAQ,CAAsB;QAC1D,qBAAgB,GAAhB,gBAAgB,CAAkB;QAElC,qBAAgB,GAAhB,gBAAgB,CAA0B;IAG7D,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"menu.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/menu.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAiD;AACjD,uDAAiD;AACjD,yEAA8D;AAC9D,6CAAmD;AACnD,gGAAoF;AAG7E,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,oBAAoB;IACtD,YACmB,UAAsB,EACM,QAA8B,EAC1D,gBAAkC,EAElC,gBAA0C;QAE3D,KAAK,CAAC,sBAAQ,EAAE,UAAU,CAAC,mBAAmB,EAAE,CAAC,CAAC;QANjC,eAAU,GAAV,UAAU,CAAY;QACM,aAAQ,GAAR,QAAQ,CAAsB;QAC1D,qBAAgB,GAAhB,gBAAgB,CAAkB;QAElC,qBAAgB,GAAhB,gBAAgB,CAA0B;IAG7D,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAc,EAAE,OAAe;QAChD,MAAM,mBAAmB,GACvB,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;QAE1D,MAAM,KAAK,GAAG,MAAM,mBAAmB;aACpC,kBAAkB,CAAC,KAAK,CAAC;aACzB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,uBAAuB,CAAC;aACtD,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC;aAChC,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC1C,QAAQ,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,CAAC;aAChD,UAAU,EAAE,CAAC;QAEhB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,OAAiB,EACjB,OAAe;QAEf,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAE9D,MAAM,SAAS,GAAG,MAAM,QAAQ;aAC7B,kBAAkB,CAAC,MAAM,CAAC;aAC1B,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC;aAC3B,KAAK,CAAC,0BAA0B,EAAE,EAAE,OAAO,EAAE,CAAC;aAC9C,UAAU,EAAE,CAAC;QAEhB,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAE3C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAC;QAElC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB;aACxC,kBAAkB,CAAC,cAAc,CAAC;aAClC,MAAM,CAAC,0BAA0B,CAAC;aAClC,KAAK,CAAC,uCAAuC,EAAE,EAAE,KAAK,EAAE,CAAC;aACzD,QAAQ,CAAC,8BAA8B,CAAC;aACxC,QAAQ,CAAC,+CAA+C,EAAE,EAAE,OAAO,EAAE,CAAC;aACtE,OAAO,EAAE,CAAC;QAEb,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAC1E,CAAC;IAKD,KAAK,CAAC,YAAY,CAChB,WAAqB,EACrB,OAAe,EACf,SAAiB;QAEjB,OAAO,MAAM,IAAI,CAAC,QAAQ;aACvB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,QAAQ,CACP,YAAY,EACZ,QAAQ,EACR;;;;SAIC,CACF;aACA,KAAK,CAAC,uCAAuC,EAAE,EAAE,WAAW,EAAE,CAAC;aAC/D,QAAQ,CAAC,uCAAuC,EAAE,EAAE,OAAO,EAAE,CAAC;aAC9D,QAAQ,CAAC,8BAA8B,EAAE,EAAE,SAAS,EAAE,CAAC;aACvD,QAAQ,CAAC,qBAAqB,CAAC;aAC/B,MAAM,CAAC;YACN,QAAQ;YACR,oCAAoC;YACpC,uBAAuB;YACvB,mCAAmC;YACnC,qBAAqB;YACrB,+BAA+B;SAChC,CAAC;aACD,UAAU,EAAE,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,MAAc,EACd,OAAe,EACf,SAAiB,EACjB,OAAe;QAEf,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;QAErE,IAAI,MAAM,EAAE,CAAC;YAEX,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;YAClE,MAAM,cAAc,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC;gBAC5C,KAAK,EAAE;oBACL,EAAE,EAAE,MAAM;iBACX;aACF,CAAC,CAAC;YAGH,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;gBACpC,KAAK,EAAE;oBACL,OAAO,EAAE,MAAM;oBACf,OAAO,EAAE,OAAO;iBACjB;aACF,CAAC,CAAC;YAEH,IACE,cAAc;gBACd,cAAc,CAAC,aAAa,KAAK,CAAC;gBAClC,UAAU,EACV,CAAC;gBACD,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;YACtC,CAAC;QACH,CAAC;QAGD,IAAI,KAAK,GAAG,MAAM,IAAI;aACnB,kBAAkB,CAAC,KAAK,CAAC;aACzB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,uBAAuB,CAAC;aACtD,MAAM,CAAC,aAAa,CAAC;aACrB,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;aAClD,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,CAAC;aACtD,QAAQ,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;aACzD,QAAQ,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,CAAC;aAChD,UAAU,EAAE,CAAC;QAEhB,IAAI,KAAK,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAGzD,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;YACxB,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;YACrE,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;gBACnC,KAAK,EAAE;oBACL,EAAE,EAAE,OAAO;iBACZ;aACF,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,GAAG,EAAE,QAAQ,CAAC;YAC9B,MAAM,KAAK,GAAG,GAAG,EAAE,eAAe,CAAC;YAEnC,IAAI,OAAO,EAAE,CAAC;gBACZ,KAAK,GAAG,MAAM,IAAI;qBACf,kBAAkB,CAAC,KAAK,CAAC;qBACzB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,uBAAuB,CAAC;qBACtD,MAAM,CAAC,aAAa,CAAC;qBACrB,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;qBAC1C,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;qBAC7D,QAAQ,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;qBACzD,QAAQ,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,CAAC;qBAChD,UAAU,EAAE,CAAC;gBAEhB,IAAI,KAAK,CAAC,MAAM;oBAAE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YAC3D,CAAC;YAED,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,GAAG,MAAM,IAAI;qBACf,kBAAkB,CAAC,KAAK,CAAC;qBACzB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,uBAAuB,CAAC;qBACtD,MAAM,CAAC,aAAa,CAAC;qBACrB,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;qBAC1C,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;qBAC7D,QAAQ,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;qBACvD,QAAQ,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,CAAC;qBAChD,UAAU,EAAE,CAAC;gBAEhB,IAAI,KAAK,CAAC,MAAM;oBAAE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YAC3D,CAAC;QACH,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;CACF,CAAA;AAjLY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,0BAAgB,EAAC,sBAAQ,CAAC,CAAA;IAE1B,WAAA,IAAA,0BAAgB,EAAC,mCAAY,CAAC,CAAA;qCAHF,oBAAU;QACgB,oBAAU;QAC9B,4CAAgB;QAEhB,oBAAU;GANpC,cAAc,CAiL1B"}
|
|
@@ -1,23 +1,22 @@
|
|
|
1
|
-
import { Repository } from 'typeorm';
|
|
1
|
+
import { Repository, DataSource } from 'typeorm';
|
|
2
2
|
import { Role } from 'src/module/user/entity/role.entity';
|
|
3
3
|
import { ModuleAccess } from '../entity/module-access.entity';
|
|
4
4
|
import { ModuleAction } from '../entity/module-action.entity';
|
|
5
5
|
import { ModuleData } from '../entity/module.entity';
|
|
6
|
-
import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
|
|
7
6
|
export declare class ModuleAccessRepository {
|
|
8
7
|
private readonly roleRepo;
|
|
9
8
|
private readonly moduleRepo;
|
|
10
9
|
private readonly moduleAccessRepo;
|
|
11
10
|
private readonly moduleActionRepo;
|
|
12
|
-
private readonly
|
|
13
|
-
constructor(roleRepo: Repository<Role>, moduleRepo: Repository<ModuleData>, moduleAccessRepo: Repository<ModuleAccess>, moduleActionRepo: Repository<ModuleAction>,
|
|
11
|
+
private readonly dataSource;
|
|
12
|
+
constructor(roleRepo: Repository<Role>, moduleRepo: Repository<ModuleData>, moduleAccessRepo: Repository<ModuleAccess>, moduleActionRepo: Repository<ModuleAction>, dataSource: DataSource);
|
|
14
13
|
getRoles({ appcode, level_type, level_id, }: {
|
|
15
14
|
appcode: string;
|
|
16
15
|
level_type?: string;
|
|
17
16
|
level_id?: number;
|
|
18
17
|
}): Promise<{
|
|
19
|
-
label:
|
|
20
|
-
value:
|
|
18
|
+
label: any;
|
|
19
|
+
value: any;
|
|
21
20
|
}[]>;
|
|
22
21
|
getModules({ appcode, loggedInUser, }: {
|
|
23
22
|
appcode: string;
|
|
@@ -40,9 +39,10 @@ export declare class ModuleAccessRepository {
|
|
|
40
39
|
getModuleUIConfig(moduleCode: string, roleIds: number[]): Promise<{
|
|
41
40
|
entity_type: string;
|
|
42
41
|
title: string;
|
|
42
|
+
ui_config: JSON;
|
|
43
43
|
action: string[];
|
|
44
44
|
}>;
|
|
45
|
-
getModuleAccessByRoles(roleIds: number[],
|
|
45
|
+
getModuleAccessByRoles(roleIds: number[], appcode: string): Promise<{
|
|
46
46
|
action: any;
|
|
47
47
|
access: any;
|
|
48
48
|
code: any;
|
|
@@ -20,32 +20,30 @@ const role_entity_1 = require("../../user/entity/role.entity");
|
|
|
20
20
|
const module_access_entity_1 = require("../entity/module-access.entity");
|
|
21
21
|
const module_action_entity_1 = require("../entity/module-action.entity");
|
|
22
22
|
const module_entity_1 = require("../entity/module.entity");
|
|
23
|
-
const reflection_helper_service_1 = require("../../../utils/service/reflection-helper.service");
|
|
24
23
|
let ModuleAccessRepository = class ModuleAccessRepository {
|
|
25
|
-
constructor(roleRepo, moduleRepo, moduleAccessRepo, moduleActionRepo,
|
|
24
|
+
constructor(roleRepo, moduleRepo, moduleAccessRepo, moduleActionRepo, dataSource) {
|
|
26
25
|
this.roleRepo = roleRepo;
|
|
27
26
|
this.moduleRepo = moduleRepo;
|
|
28
27
|
this.moduleAccessRepo = moduleAccessRepo;
|
|
29
28
|
this.moduleActionRepo = moduleActionRepo;
|
|
30
|
-
this.
|
|
29
|
+
this.dataSource = dataSource;
|
|
31
30
|
}
|
|
32
31
|
async getRoles({ appcode, level_type, level_id, }) {
|
|
33
|
-
const
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
32
|
+
const query = this.dataSource
|
|
33
|
+
.createQueryBuilder()
|
|
34
|
+
.select('*')
|
|
35
|
+
.from('sso_role', 'role')
|
|
36
|
+
.where('role.appcode = :appcode', { appcode })
|
|
37
|
+
.andWhere('(role.is_factory IS NULL OR role.is_factory != 1)');
|
|
39
38
|
if (level_type) {
|
|
40
|
-
|
|
39
|
+
query.andWhere('role.level_type = :level_type', { level_type });
|
|
41
40
|
}
|
|
42
41
|
if (level_id !== undefined) {
|
|
43
|
-
|
|
42
|
+
query.andWhere('role.level_id = :level_id', {
|
|
43
|
+
level_id: String(level_id),
|
|
44
|
+
});
|
|
44
45
|
}
|
|
45
|
-
const roles = await
|
|
46
|
-
where,
|
|
47
|
-
select: ['id', 'name'],
|
|
48
|
-
});
|
|
46
|
+
const roles = await query.getRawMany();
|
|
49
47
|
return roles.map((role) => ({
|
|
50
48
|
label: role.name,
|
|
51
49
|
value: role.id,
|
|
@@ -55,22 +53,12 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
55
53
|
let modules;
|
|
56
54
|
if (loggedInUser.level_type == 'SCH') {
|
|
57
55
|
modules = await this.moduleRepo.find({
|
|
58
|
-
where: {
|
|
59
|
-
module_level: 'MAINMOD',
|
|
60
|
-
app: {
|
|
61
|
-
code: appcode,
|
|
62
|
-
},
|
|
63
|
-
level_type: 'SCH',
|
|
64
|
-
},
|
|
56
|
+
where: { module_level: 'MAINMOD', appcode, level_type: 'SCH' },
|
|
65
57
|
});
|
|
66
58
|
}
|
|
67
59
|
else {
|
|
68
60
|
modules = await this.moduleRepo.find({
|
|
69
|
-
where: {
|
|
70
|
-
module_level: 'MAINMOD', app: {
|
|
71
|
-
code: appcode,
|
|
72
|
-
},
|
|
73
|
-
},
|
|
61
|
+
where: { module_level: 'MAINMOD', appcode },
|
|
74
62
|
});
|
|
75
63
|
}
|
|
76
64
|
return modules
|
|
@@ -93,9 +81,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
93
81
|
roles = await this.roleRepo.find({
|
|
94
82
|
where: {
|
|
95
83
|
id: (0, typeorm_2.In)(fetchedRoleIds),
|
|
96
|
-
|
|
97
|
-
code: appcode,
|
|
98
|
-
},
|
|
84
|
+
appcode,
|
|
99
85
|
},
|
|
100
86
|
});
|
|
101
87
|
}
|
|
@@ -103,59 +89,40 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
103
89
|
roles = await this.roleRepo.find({
|
|
104
90
|
where: {
|
|
105
91
|
id: (0, typeorm_2.In)(roleIds.map((id) => Number(id))),
|
|
106
|
-
|
|
107
|
-
code: appcode,
|
|
108
|
-
},
|
|
92
|
+
appcode,
|
|
109
93
|
},
|
|
110
94
|
});
|
|
111
95
|
}
|
|
112
96
|
if (!roles.length)
|
|
113
97
|
return [];
|
|
98
|
+
const roleCodes = roles.map((role) => role.code);
|
|
114
99
|
const moduleAccesses = await this.moduleAccessRepo.find({
|
|
115
100
|
where: {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
code: appcode,
|
|
119
|
-
},
|
|
120
|
-
level_type: levelType,
|
|
121
|
-
},
|
|
122
|
-
relations: {
|
|
123
|
-
app: true,
|
|
124
|
-
module: true,
|
|
101
|
+
role_code: (0, typeorm_2.In)(roleCodes),
|
|
102
|
+
appcode,
|
|
125
103
|
},
|
|
126
104
|
});
|
|
127
105
|
return roles.map((role) => ({
|
|
128
|
-
|
|
106
|
+
role_code: role.code,
|
|
129
107
|
name: role.name,
|
|
130
108
|
permission: moduleAccesses
|
|
131
|
-
.filter((access) => access.
|
|
109
|
+
.filter((access) => access.role_code === role.code)
|
|
132
110
|
.map((access) => ({
|
|
133
111
|
action: access.action_type,
|
|
134
112
|
access: access.access_flag,
|
|
135
|
-
|
|
113
|
+
code: access.module_code,
|
|
136
114
|
level_type: access.level_type,
|
|
137
|
-
|
|
138
|
-
code: access.module.module_code,
|
|
139
|
-
appcode: access.app.code,
|
|
115
|
+
appcode: access.appcode,
|
|
140
116
|
})),
|
|
141
117
|
}));
|
|
142
118
|
}
|
|
143
119
|
async getAllModulesByLevel(mainModIds, appcode, levelType) {
|
|
144
|
-
const appMasterRepo = this.reflectionHelper.getRepoService('AppMaster');
|
|
145
|
-
const appMaster = await appMasterRepo.find({
|
|
146
|
-
where: {
|
|
147
|
-
code: appcode
|
|
148
|
-
}
|
|
149
|
-
});
|
|
150
|
-
if (!appMaster) {
|
|
151
|
-
return {};
|
|
152
|
-
}
|
|
153
120
|
const mainModules = mainModIds.length === 1 && mainModIds[0] === '-1'
|
|
154
121
|
? await this.moduleRepo.find({
|
|
155
|
-
where: { module_level: 'MAINMOD',
|
|
122
|
+
where: { module_level: 'MAINMOD', appcode },
|
|
156
123
|
})
|
|
157
124
|
: await this.moduleRepo.find({
|
|
158
|
-
where: { id: (0, typeorm_2.In)(mainModIds), module_level: 'MAINMOD',
|
|
125
|
+
where: { id: (0, typeorm_2.In)(mainModIds), module_level: 'MAINMOD', appcode },
|
|
159
126
|
});
|
|
160
127
|
if (!mainModules.length)
|
|
161
128
|
return {};
|
|
@@ -165,28 +132,28 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
165
132
|
.where(wbsCodes
|
|
166
133
|
.map((code) => `module.wbs_code LIKE :code${code}`)
|
|
167
134
|
.join(' OR '), Object.fromEntries(wbsCodes.map((code) => [`code${code}`, `${code}%`])))
|
|
168
|
-
.andWhere('module.
|
|
135
|
+
.andWhere('module.appcode = :appcode', { appcode })
|
|
169
136
|
.andWhere('module.module_code != :excludedCode', {
|
|
170
137
|
excludedCode: 'all_organization_adm_org',
|
|
171
138
|
})
|
|
172
139
|
.getMany();
|
|
173
140
|
allModules = allModules.filter((mod) => mod.module_code != 'all_organization_adm_org');
|
|
174
|
-
const
|
|
141
|
+
const moduleCodes = allModules.map((m) => m.module_code);
|
|
175
142
|
const allActions = await this.moduleActionRepo.find({
|
|
176
|
-
where: {
|
|
143
|
+
where: { module_code: (0, typeorm_2.In)(moduleCodes) },
|
|
177
144
|
});
|
|
178
145
|
const actionMap = allActions.reduce((acc, action) => {
|
|
179
|
-
if (!acc[action.
|
|
180
|
-
acc[action.
|
|
146
|
+
if (!acc[action.module_code])
|
|
147
|
+
acc[action.module_code] = [];
|
|
181
148
|
const actionItem = {
|
|
182
|
-
action: action.
|
|
149
|
+
action: action.action_type,
|
|
183
150
|
name: action.action_name,
|
|
184
151
|
};
|
|
185
|
-
if (action.
|
|
186
|
-
acc[action.
|
|
152
|
+
if (action.action_type === 'VIEW') {
|
|
153
|
+
acc[action.module_code].unshift(actionItem);
|
|
187
154
|
}
|
|
188
155
|
else {
|
|
189
|
-
acc[action.
|
|
156
|
+
acc[action.module_code].push(actionItem);
|
|
190
157
|
}
|
|
191
158
|
return acc;
|
|
192
159
|
}, {});
|
|
@@ -200,7 +167,6 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
200
167
|
parentWbs.split('.').length + 1)
|
|
201
168
|
.map((mod) => ({
|
|
202
169
|
name: mod.name,
|
|
203
|
-
module_id: mod.id,
|
|
204
170
|
code: mod.module_code,
|
|
205
171
|
permission: actionMap[mod.module_code] || [],
|
|
206
172
|
submod: buildHierarchy(mod.wbs_code),
|
|
@@ -209,7 +175,6 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
209
175
|
.filter((mod) => mod.level_type === lvl)
|
|
210
176
|
.map((mod) => ({
|
|
211
177
|
name: mod.name,
|
|
212
|
-
module_id: mod.id,
|
|
213
178
|
code: mod.module_code,
|
|
214
179
|
permission: actionMap[mod.module_code] || [],
|
|
215
180
|
submod: buildHierarchy(mod.wbs_code),
|
|
@@ -225,16 +190,10 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
225
190
|
for (const access of accessList) {
|
|
226
191
|
const existing = await this.moduleAccessRepo.findOne({
|
|
227
192
|
where: {
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
},
|
|
231
|
-
module: {
|
|
232
|
-
module_code: access.module_code,
|
|
233
|
-
},
|
|
193
|
+
role_code: access.role_code,
|
|
194
|
+
module_code: access.module_code,
|
|
234
195
|
action_type: access.action_type,
|
|
235
|
-
|
|
236
|
-
code: access.appcode,
|
|
237
|
-
},
|
|
196
|
+
appcode: access.appcode,
|
|
238
197
|
level_type: access.level_type,
|
|
239
198
|
},
|
|
240
199
|
});
|
|
@@ -243,7 +202,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
243
202
|
await this.moduleAccessRepo.save(existing);
|
|
244
203
|
}
|
|
245
204
|
else {
|
|
246
|
-
await this.moduleAccessRepo.save(this.moduleAccessRepo.create(access));
|
|
205
|
+
await this.moduleAccessRepo.save(await this.moduleAccessRepo.create(access));
|
|
247
206
|
}
|
|
248
207
|
}
|
|
249
208
|
return true;
|
|
@@ -259,10 +218,12 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
259
218
|
});
|
|
260
219
|
if (!module)
|
|
261
220
|
throw new common_1.BadRequestException('Module not found');
|
|
221
|
+
const roles = await this.roleRepo.find({ where: { id: (0, typeorm_2.In)(roleIds) } });
|
|
222
|
+
const roleCodes = roles.map((role) => role.code);
|
|
262
223
|
const actions = await this.moduleAccessRepo.find({
|
|
263
224
|
where: {
|
|
264
|
-
|
|
265
|
-
|
|
225
|
+
module_code: moduleCode,
|
|
226
|
+
role_code: (0, typeorm_2.In)(roleCodes),
|
|
266
227
|
access_flag: 1,
|
|
267
228
|
},
|
|
268
229
|
});
|
|
@@ -270,14 +231,15 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
270
231
|
return {
|
|
271
232
|
entity_type: module.entity_type,
|
|
272
233
|
title: module.title,
|
|
234
|
+
ui_config: module.ui_config || {},
|
|
273
235
|
action: uniqueActions,
|
|
274
236
|
};
|
|
275
237
|
}
|
|
276
|
-
async getModuleAccessByRoles(roleIds,
|
|
238
|
+
async getModuleAccessByRoles(roleIds, appcode) {
|
|
277
239
|
const roles = await this.roleRepo.find({
|
|
278
240
|
where: {
|
|
279
241
|
id: (0, typeorm_2.In)(roleIds),
|
|
280
|
-
|
|
242
|
+
appcode,
|
|
281
243
|
},
|
|
282
244
|
select: ['id', 'code'],
|
|
283
245
|
});
|
|
@@ -294,7 +256,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
294
256
|
'access.appcode AS appcode',
|
|
295
257
|
])
|
|
296
258
|
.where('access.role_code IN (:...roleCodes)', { roleCodes })
|
|
297
|
-
.andWhere('access.
|
|
259
|
+
.andWhere('access.appcode = :appcode', { appcode })
|
|
298
260
|
.getRawMany();
|
|
299
261
|
return accessRecords.map((record) => ({
|
|
300
262
|
action: record.action_type,
|
|
@@ -316,6 +278,6 @@ exports.ModuleAccessRepository = ModuleAccessRepository = __decorate([
|
|
|
316
278
|
typeorm_2.Repository,
|
|
317
279
|
typeorm_2.Repository,
|
|
318
280
|
typeorm_2.Repository,
|
|
319
|
-
|
|
281
|
+
typeorm_2.DataSource])
|
|
320
282
|
], ModuleAccessRepository);
|
|
321
283
|
//# sourceMappingURL=module-access.repository.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-access.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/module-access.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,6CAAmD;AACnD,
|
|
1
|
+
{"version":3,"file":"module-access.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/module-access.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { MenuRepository } from '../repository/menu.repository';
|
|
2
|
+
import { DataSource } from 'typeorm';
|
|
2
3
|
export declare class MenuService {
|
|
3
4
|
private readonly menuRepository;
|
|
4
|
-
|
|
5
|
-
|
|
5
|
+
private readonly datasource;
|
|
6
|
+
constructor(menuRepository: MenuRepository, datasource: DataSource);
|
|
7
|
+
getUserMenu(userId: number, appcode: string, levelType: 'ORG' | 'SCH', levelId: number): Promise<{
|
|
6
8
|
menu: any[];
|
|
7
9
|
}>;
|
|
8
10
|
private buildMenuHierarchy;
|
|
9
|
-
getUserRoles(userId: number,
|
|
11
|
+
getUserRoles(userId: number, appcode: string): Promise<any>;
|
|
10
12
|
}
|
|
@@ -12,18 +12,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.MenuService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const menu_repository_1 = require("../repository/menu.repository");
|
|
15
|
+
const typeorm_1 = require("typeorm");
|
|
15
16
|
let MenuService = class MenuService {
|
|
16
|
-
constructor(menuRepository) {
|
|
17
|
+
constructor(menuRepository, datasource) {
|
|
17
18
|
this.menuRepository = menuRepository;
|
|
19
|
+
this.datasource = datasource;
|
|
18
20
|
}
|
|
19
|
-
async getUserMenu(userId,
|
|
20
|
-
const roleCodes = await this.menuRepository.resolveUserRoles(userId,
|
|
21
|
+
async getUserMenu(userId, appcode, levelType, levelId) {
|
|
22
|
+
const roleCodes = await this.menuRepository.resolveUserRoles(userId, appcode, levelType, levelId);
|
|
21
23
|
if (!roleCodes.length)
|
|
22
24
|
return { menu: [] };
|
|
23
|
-
const
|
|
24
|
-
if (!
|
|
25
|
+
const moduleCodes = await this.menuRepository.getAccessibleModules(roleCodes, appcode);
|
|
26
|
+
if (!moduleCodes.length)
|
|
25
27
|
return { menu: [] };
|
|
26
|
-
const menuItems = await this.menuRepository.getMenuItems(
|
|
28
|
+
const menuItems = await this.menuRepository.getMenuItems(moduleCodes, appcode, levelType);
|
|
27
29
|
const menuTree = this.buildMenuHierarchy(menuItems);
|
|
28
30
|
return { menu: menuTree };
|
|
29
31
|
}
|
|
@@ -44,13 +46,14 @@ let MenuService = class MenuService {
|
|
|
44
46
|
});
|
|
45
47
|
return rootMenu;
|
|
46
48
|
}
|
|
47
|
-
async getUserRoles(userId,
|
|
48
|
-
return this.menuRepository.getUserRoles(userId,
|
|
49
|
+
async getUserRoles(userId, appcode) {
|
|
50
|
+
return this.menuRepository.getUserRoles(userId, appcode);
|
|
49
51
|
}
|
|
50
52
|
};
|
|
51
53
|
exports.MenuService = MenuService;
|
|
52
54
|
exports.MenuService = MenuService = __decorate([
|
|
53
55
|
(0, common_1.Injectable)(),
|
|
54
|
-
__metadata("design:paramtypes", [menu_repository_1.MenuRepository
|
|
56
|
+
__metadata("design:paramtypes", [menu_repository_1.MenuRepository,
|
|
57
|
+
typeorm_1.DataSource])
|
|
55
58
|
], MenuService);
|
|
56
59
|
//# sourceMappingURL=menu.service.js.map
|