rez_core 6.5.6 → 6.5.7
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/core.module.js +0 -2
- package/dist/core.module.js.map +1 -1
- package/dist/module/enterprise/entity/organization-app-mapping.entity.d.ts +0 -2
- package/dist/module/enterprise/entity/organization-app-mapping.entity.js +0 -8
- package/dist/module/enterprise/entity/organization-app-mapping.entity.js.map +1 -1
- package/dist/module/user/service/role.service.d.ts +0 -2
- package/dist/module/user/service/role.service.js +2 -9
- package/dist/module/user/service/role.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/core.module.ts +0 -2
- package/src/module/enterprise/entity/organization-app-mapping.entity.ts +0 -6
- package/src/module/user/service/role.service.ts +2 -11
- 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/server.log +0 -850
package/package.json
CHANGED
package/src/core.module.ts
CHANGED
|
@@ -48,7 +48,6 @@ export class CoreModule {
|
|
|
48
48
|
];
|
|
49
49
|
exportsArray = [
|
|
50
50
|
ConfigModule.forRoot({ isGlobal: true }),
|
|
51
|
-
dbModule,
|
|
52
51
|
UserModule,
|
|
53
52
|
ModuleAccessModule,
|
|
54
53
|
LayoutModule,
|
|
@@ -78,7 +77,6 @@ export class CoreModule {
|
|
|
78
77
|
|
|
79
78
|
exportsArray = [
|
|
80
79
|
ConfigModule,
|
|
81
|
-
dbModule,
|
|
82
80
|
EntityModule,
|
|
83
81
|
AuthModule,
|
|
84
82
|
UtilsModule,
|
|
@@ -8,16 +8,10 @@ export class OrganizationAppMapping {
|
|
|
8
8
|
@PrimaryGeneratedColumn({ name: 'id', type: 'int' })
|
|
9
9
|
id: number;
|
|
10
10
|
|
|
11
|
-
@Column({ type: 'int', nullable: true })
|
|
12
|
-
organization_id: number;
|
|
13
|
-
|
|
14
11
|
@ManyToOne(() => OrganizationData, { nullable: true, onDelete: 'SET NULL' })
|
|
15
12
|
@JoinColumn({ name: 'organization_id', referencedColumnName: 'id' })
|
|
16
13
|
organization: OrganizationData;
|
|
17
14
|
|
|
18
|
-
@Column({ type: 'int', nullable: true })
|
|
19
|
-
app_id: number;
|
|
20
|
-
|
|
21
15
|
@ManyToOne(() => AppMaster, { nullable: true, onDelete: 'SET NULL' })
|
|
22
16
|
@JoinColumn({ name: 'app_id', referencedColumnName: 'id' })
|
|
23
17
|
app: AppMaster;
|
|
@@ -8,7 +8,6 @@ import { InjectRepository } from '@nestjs/typeorm';
|
|
|
8
8
|
import { ModuleAccess } from '../../module/entity/module-access.entity';
|
|
9
9
|
import { UserRoleMapping } from '../entity/user-role-mapping.entity';
|
|
10
10
|
import { plainToInstance } from 'class-transformer';
|
|
11
|
-
import { StatusConstant } from '../../../constant/status.constant';
|
|
12
11
|
|
|
13
12
|
@Injectable()
|
|
14
13
|
export class RoleService {
|
|
@@ -53,7 +52,7 @@ export class RoleService {
|
|
|
53
52
|
if (role.copy_from_role_id && !sourceRole) {
|
|
54
53
|
return { success: false, error: 'Source role not found.' };
|
|
55
54
|
}
|
|
56
|
-
role.status =
|
|
55
|
+
role.status = STATUS_ACTIVE;
|
|
57
56
|
const savedRole = await this.roleRepository.saveRole(role);
|
|
58
57
|
if (sourceRole) {
|
|
59
58
|
const sourcePermissions = await this.moduleAccessRepo.find({
|
|
@@ -96,7 +95,7 @@ export class RoleService {
|
|
|
96
95
|
const associatedUsers = await this.userRoleMappingRepo
|
|
97
96
|
.createQueryBuilder('map')
|
|
98
97
|
.innerJoin('sso_user', 'usr', 'map.user_id = usr.id')
|
|
99
|
-
.where('usr.status::text = :status', { status:
|
|
98
|
+
.where('usr.status::text = :status', { status: STATUS_INACTIVE })
|
|
100
99
|
.andWhere('map.role_id::text = :roleId', {
|
|
101
100
|
roleId: String(existingRole?.id),
|
|
102
101
|
})
|
|
@@ -175,12 +174,4 @@ export class RoleService {
|
|
|
175
174
|
}): Promise<Role[] | null> {
|
|
176
175
|
return await this.roleRepository.find(data);
|
|
177
176
|
}
|
|
178
|
-
|
|
179
|
-
async findByCode(code: string) {
|
|
180
|
-
return await this.roleRepository.findByCode(code);
|
|
181
|
-
}
|
|
182
|
-
|
|
183
|
-
async findById(id: number) {
|
|
184
|
-
return await this.roleRepository.findById(id);
|
|
185
|
-
}
|
|
186
177
|
}
|
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"permissions": {
|
|
3
|
-
"allow": [
|
|
4
|
-
"Bash(npm run build:*)",
|
|
5
|
-
"Bash(npm install)",
|
|
6
|
-
"Bash(npm run lint)",
|
|
7
|
-
"Bash(npm install:*)",
|
|
8
|
-
"Bash(curl:*)",
|
|
9
|
-
"Bash(npm run start:dev:*)",
|
|
10
|
-
"Bash(mkdir:*)",
|
|
11
|
-
"Bash(lsof:*)",
|
|
12
|
-
"Bash(kill:*)",
|
|
13
|
-
"Bash(npx eslint:*)",
|
|
14
|
-
"Read(/Users/admin/yash/**)",
|
|
15
|
-
"Bash(timeout 15 npm run start:dev)",
|
|
16
|
-
"Read(/Users/admin/yash/**)",
|
|
17
|
-
"Bash(find:*)",
|
|
18
|
-
"Bash(sed:*)",
|
|
19
|
-
"Bash(git checkout:*)",
|
|
20
|
-
"Read(//Users/admin/yash/**)",
|
|
21
|
-
"Bash(npx tsc:*)"
|
|
22
|
-
],
|
|
23
|
-
"deny": [],
|
|
24
|
-
"ask": []
|
|
25
|
-
}
|
|
26
|
-
}
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
-
<module type="JAVA_MODULE" version="4">
|
|
3
|
-
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
|
4
|
-
<exclude-output />
|
|
5
|
-
<content url="file://$MODULE_DIR$" />
|
|
6
|
-
<orderEntry type="inheritedJdk" />
|
|
7
|
-
<orderEntry type="sourceFolder" forTests="false" />
|
|
8
|
-
</component>
|
|
9
|
-
</module>
|
|
@@ -1,59 +0,0 @@
|
|
|
1
|
-
<component name="ProjectCodeStyleConfiguration">
|
|
2
|
-
<code_scheme name="Project" version="173">
|
|
3
|
-
<HTMLCodeStyleSettings>
|
|
4
|
-
<option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
|
|
5
|
-
</HTMLCodeStyleSettings>
|
|
6
|
-
<JSCodeStyleSettings version="0">
|
|
7
|
-
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
|
8
|
-
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
|
9
|
-
<option name="USE_DOUBLE_QUOTES" value="false" />
|
|
10
|
-
<option name="FORCE_QUOTE_STYlE" value="true" />
|
|
11
|
-
<option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
|
|
12
|
-
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
|
13
|
-
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
|
14
|
-
</JSCodeStyleSettings>
|
|
15
|
-
<TypeScriptCodeStyleSettings version="0">
|
|
16
|
-
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
|
17
|
-
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
|
18
|
-
<option name="USE_DOUBLE_QUOTES" value="false" />
|
|
19
|
-
<option name="FORCE_QUOTE_STYlE" value="true" />
|
|
20
|
-
<option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
|
|
21
|
-
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
|
22
|
-
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
|
23
|
-
</TypeScriptCodeStyleSettings>
|
|
24
|
-
<VueCodeStyleSettings>
|
|
25
|
-
<option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
|
|
26
|
-
<option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
|
|
27
|
-
</VueCodeStyleSettings>
|
|
28
|
-
<codeStyleSettings language="HTML">
|
|
29
|
-
<option name="SOFT_MARGINS" value="80" />
|
|
30
|
-
<indentOptions>
|
|
31
|
-
<option name="INDENT_SIZE" value="2" />
|
|
32
|
-
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
33
|
-
<option name="TAB_SIZE" value="2" />
|
|
34
|
-
</indentOptions>
|
|
35
|
-
</codeStyleSettings>
|
|
36
|
-
<codeStyleSettings language="JavaScript">
|
|
37
|
-
<option name="SOFT_MARGINS" value="80" />
|
|
38
|
-
<indentOptions>
|
|
39
|
-
<option name="INDENT_SIZE" value="2" />
|
|
40
|
-
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
41
|
-
<option name="TAB_SIZE" value="2" />
|
|
42
|
-
</indentOptions>
|
|
43
|
-
</codeStyleSettings>
|
|
44
|
-
<codeStyleSettings language="TypeScript">
|
|
45
|
-
<option name="SOFT_MARGINS" value="80" />
|
|
46
|
-
<indentOptions>
|
|
47
|
-
<option name="INDENT_SIZE" value="2" />
|
|
48
|
-
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
49
|
-
<option name="TAB_SIZE" value="2" />
|
|
50
|
-
</indentOptions>
|
|
51
|
-
</codeStyleSettings>
|
|
52
|
-
<codeStyleSettings language="Vue">
|
|
53
|
-
<option name="SOFT_MARGINS" value="80" />
|
|
54
|
-
<indentOptions>
|
|
55
|
-
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
56
|
-
</indentOptions>
|
|
57
|
-
</codeStyleSettings>
|
|
58
|
-
</code_scheme>
|
|
59
|
-
</component>
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
<component name="InspectionProjectProfileManager">
|
|
2
|
-
<profile version="1.0">
|
|
3
|
-
<option name="myName" value="Project Default" />
|
|
4
|
-
<inspection_tool class="SqlNoDataSourceInspection" enabled="false" level="WARNING" enabled_by_default="false" />
|
|
5
|
-
</profile>
|
|
6
|
-
</component>
|
package/.idea/misc.xml
DELETED
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
-
<project version="4">
|
|
3
|
-
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
|
|
4
|
-
<output url="file://$PROJECT_DIR$/out" />
|
|
5
|
-
</component>
|
|
6
|
-
</project>
|
package/.idea/modules.xml
DELETED
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
-
<project version="4">
|
|
3
|
-
<component name="ProjectModuleManager">
|
|
4
|
-
<modules>
|
|
5
|
-
<module fileurl="file://$PROJECT_DIR$/.idea/250218_nodejs_core.iml" filepath="$PROJECT_DIR$/.idea/250218_nodejs_core.iml" />
|
|
6
|
-
</modules>
|
|
7
|
-
</component>
|
|
8
|
-
</project>
|
package/.idea/prettier.xml
DELETED