Skip to content

Commit eda2fb2

Browse files
subdavisHartesic
authored andcommitted
SCA-1084 Migrate JIRA integration to private/libs/feature-jira (#3485)
Co-authored-by: Ambroise C. <ambroise.christea@sonarsource.com> GitOrigin-RevId: fb0ca2f92b2905a5a98d4d2efe1c587ea358bcbb
1 parent 30a7286 commit eda2fb2

File tree

5 files changed

+6
-3
lines changed

5 files changed

+6
-3
lines changed

apps/sq-server/tsconfig.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
/* shared libraries aliases, following token is used in the nx shared-library generator */
88
/* <<shared-libraries-aliases>> */
99
"~feature-architecture/*": ["private/libs/feature-architecture/src/*"],
10+
"~feature-jira/*": ["private/libs/feature-jira/src/*"],
1011
"~feature-rules/*": ["libs/feature-rules/src/*"],
1112
"~feature-sca/*": ["private/libs/feature-sca/src/*"],
1213
"~private-shared/*": ["private/libs/shared/src/*"],

config/jest/jest.config.base.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ const projectConfig = {
8383
// Shared libraries aliases, following token is used in the nx shared-library generator
8484
// <<shared-libraries-aliases>>
8585
'^~feature-architecture/(.+)': '<rootDir>/private/libs/feature-architecture/src/$1',
86+
'^~feature-jira/(.+)': '<rootDir>/private/libs/feature-jira/src/$1',
8687
'^~feature-rules/(.+)': '<rootDir>/libs/feature-rules/src/$1',
8788
'^~feature-sca/(.+)': '<rootDir>/private/libs/feature-sca/src/$1',
8889
'^~private-shared/(.+)': '<rootDir>/private/libs/shared/src/$1',

libs/shared/src/types/users.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
export interface UserBaseShared {
2222
active?: boolean;
2323
avatar?: string;
24+
email?: string | null;
2425
login: string;
2526
name?: string;
2627
}
@@ -41,6 +42,7 @@ export interface UserActiveShared extends UserBaseShared {
4142
}
4243

4344
export interface LoggedInUserShared extends CurrentUser, UserActiveShared {
45+
email?: string;
4446
externalIdentity?: string;
4547
externalProvider?: string;
4648
groups: string[];

libs/sq-server-commons/src/types/users.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ export interface User extends UserBase {
9494
tokensCount?: number;
9595
}
9696

97-
export interface UserBase extends UserBaseShared {
98-
email?: string | null;
99-
}
97+
export interface UserBase extends UserBaseShared {}
10098

10199
export interface RestUserBase {
102100
id: string;

tsconfig.base.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"~adapters/*": ["libs/sq-server-commons/src/sq-server-adapters/*"],
3232
"~design-system": ["libs/sq-server-commons/src/design-system/index.ts"],
3333
"~feature-architecture/*": ["private/libs/feature-architecture/src/*"],
34+
"~feature-jira/*": ["private/libs/feature-jira/src/*"],
3435
"~feature-rules/*": ["libs/feature-rules/src/*"],
3536
"~feature-sca/*": ["private/libs/feature-sca/src/*"],
3637
"~private-shared/*": ["private/libs/shared/src/*"],

0 commit comments

Comments
 (0)