-
Notifications
You must be signed in to change notification settings - Fork 0
maint: angular 21 upgrade #592
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 19 additions & 11 deletions
30
public/src/app/box-pr-author/box-pr-author.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,21 @@ | ||
| <table><tbody> | ||
| <tr *ngFor="let author of pullsByAuthor | keyvalue"> | ||
| <td> | ||
| <a *ngIf="!author.value[0].pull.node.headRefName.startsWith('epic')" class="author" title="{{author.value[0].pull.node.author.login}}" target="_blank" href="{{author.value[0].pull.node.author.url}}"><img class="avatar-48" src="{{getAuthorAvatar(author.value[0].pull.node.author, 48)}}"></a> | ||
| <a *ngIf="author.value[0].pull.node.headRefName.startsWith('epic')" class="author" title="epics" target="_blank" href="https://github.com/keymanapp/keyman/pulls?q=is%3Apr+is%3Aopen+head%3Aepic"><img class="avatar-48" src="/assets/artifacts/keyman.png"></a> | ||
| </td> | ||
| <td> | ||
| <span *ngFor="let pull of author.value"> | ||
| <app-pull-request [status]="status" [changeCounter]="changeCounter" [teamCity]="status.teamCity" [scope]="'platform'" [scopeValue]="''" [gravityX]="'left'" [gravityY]="'bottom'" [pull]="pull"></app-pull-request> | ||
| </span> | ||
| </td> | ||
| </tr> | ||
| @for (author of pullsByAuthor | keyvalue; track author) { | ||
| <tr> | ||
| <td> | ||
| @if (!author.value[0].pull.node.headRefName.startsWith('epic')) { | ||
| <a class="author" title="{{author.value[0].pull.node.author.login}}" target="_blank" href="{{author.value[0].pull.node.author.url}}"><img class="avatar-48" src="{{getAuthorAvatar(author.value[0].pull.node.author, 48)}}"></a> | ||
| } | ||
| @if (author.value[0].pull.node.headRefName.startsWith('epic')) { | ||
| <a class="author" title="epics" target="_blank" href="https://github.com/keymanapp/keyman/pulls?q=is%3Apr+is%3Aopen+head%3Aepic"><img class="avatar-48" src="/assets/artifacts/keyman.png"></a> | ||
| } | ||
| </td> | ||
| <td> | ||
| @for (pull of author.value; track pull) { | ||
| <span> | ||
| <app-pull-request [status]="status" [changeCounter]="changeCounter" [teamCity]="status.teamCity" [scope]="'platform'" [scopeValue]="''" [gravityX]="'left'" [gravityY]="'bottom'" [pull]="pull"></app-pull-request> | ||
| </span> | ||
| } | ||
| </td> | ||
| </tr> | ||
| } | ||
| </tbody></table> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,14 @@ | ||
| <table><tbody> | ||
| <tr *ngFor="let base of pullsByBase | keyvalue"> | ||
| <td class='base'>{{base.key == 'other' ? '⬜' : base.key}}</td> | ||
| <td> | ||
| <span *ngFor="let pull of base.value"> | ||
| <app-pull-request [status]="status" [changeCounter]="changeCounter" [teamCity]="status.teamCity" [scope]="'platform'" [scopeValue]="''" [gravityX]="'left'" [gravityY]="'bottom'" [pull]="pull"></app-pull-request> | ||
| </span> | ||
| </td> | ||
| </tr> | ||
| @for (base of pullsByBase | keyvalue; track base) { | ||
| <tr> | ||
| <td class='base'>{{base.key == 'other' ? '⬜' : base.key}}</td> | ||
| <td> | ||
| @for (pull of base.value; track pull) { | ||
| <span> | ||
| <app-pull-request [status]="status" [changeCounter]="changeCounter" [teamCity]="status.teamCity" [scope]="'platform'" [scopeValue]="''" [gravityX]="'left'" [gravityY]="'bottom'" [pull]="pull"></app-pull-request> | ||
| </span> | ||
| } | ||
| </td> | ||
| </tr> | ||
| } | ||
| </tbody></table> |
18 changes: 12 additions & 6 deletions
18
public/src/app/box-pr-platform/box-pr-platform.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,12 @@ | ||
| <div [class]="'emoji-group' + (emoji.key == '' ? '' : ' emoji-group-border')" *ngFor="let emoji of platform.value.pullsByEmoji | keyvalue"> | ||
| <span *ngIf="emoji.key != ''" class="emoji">{{emoji.key}}</span> | ||
| <span *ngFor="let pull of emoji.value"> | ||
| <app-pull-request [status]="status" [changeCounter]="changeCounter" [teamCity]="status.teamCity" [scope]="'platform'" [scopeValue]="platform.value.id" [gravityX]="'left'" [gravityY]="'bottom'" [pull]="pull"></app-pull-request> | ||
| </span> | ||
| </div> | ||
| @for (emoji of platform.pullsByEmoji | keyvalue; track emoji.key) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Throughout the PR I see |
||
| <div [class]="'emoji-group' + (emoji.key == '' ? '' : ' emoji-group-border')"> | ||
| @if (emoji.key != '') { | ||
| <span class="emoji">{{emoji.key}}</span> | ||
| } | ||
| @for (pull of emoji.value; track pull) { | ||
| <span> | ||
| <app-pull-request [status]="status" [changeCounter]="changeCounter" [teamCity]="status.teamCity" [scope]="'platform'" [scopeValue]="platform.id" [gravityX]="'left'" [gravityY]="'bottom'" [pull]="pull"></app-pull-request> | ||
| </span> | ||
| } | ||
| </div> | ||
| } | ||
20 changes: 12 additions & 8 deletions
20
public/src/app/box-pr-project/box-pr-project.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,14 @@ | ||
| <table><tbody> | ||
| <tr *ngFor="let project of pullsByProject | keyvalue"> | ||
| <td class='emoji'>{{project.key == 'other' ? '⬜' : project.key}}</td> | ||
| <td> | ||
| <span *ngFor="let pull of project.value"> | ||
| <app-pull-request [status]="status" [changeCounter]="changeCounter" [teamCity]="status.teamCity" [scope]="'platform'" [scopeValue]="''" [gravityX]="'left'" [gravityY]="'bottom'" [pull]="pull"></app-pull-request> | ||
| </span> | ||
| </td> | ||
| </tr> | ||
| @for (project of pullsByProject | keyvalue; track project) { | ||
| <tr> | ||
| <td class='emoji'>{{project.key == 'other' ? '⬜' : project.key}}</td> | ||
| <td> | ||
| @for (pull of project.value; track pull) { | ||
| <span> | ||
| <app-pull-request [status]="status" [changeCounter]="changeCounter" [teamCity]="status.teamCity" [scope]="'platform'" [scopeValue]="''" [gravityX]="'left'" [gravityY]="'bottom'" [pull]="pull"></app-pull-request> | ||
| </span> | ||
| } | ||
| </td> | ||
| </tr> | ||
| } | ||
| </tbody></table> |
84 changes: 55 additions & 29 deletions
84
public/src/app/box-pr-status/box-pr-status.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,57 @@ | ||
| <table><tbody> | ||
| <tr *ngFor="let pullStatus of pullsByStatus | keyvalue"> | ||
| <td> | ||
| <a *ngIf="pullStatus.key == 'draft'" target="_blank" href="https://github.com/keymanapp/keyman/pulls?q=is%3Apr+is%3Aopen+is%3Adraft">{{pullStatusName[pullStatus.key]}}</a> | ||
| <a *ngIf="pullStatus.key == 'epics'" target="_blank" href="https://github.com/keymanapp/keyman/pulls?q=is%3Apr+is%3Aopen+head%3Aepic%2F">{{pullStatusName[pullStatus.key]}}</a> | ||
| <a *ngIf="pullStatus.key == 'waitingTest'" target="_blank" href="https://github.com/keymanapp/keyman/pulls?q=is%3Apr+is%3Aopen+label%3Auser-test-required">{{pullStatusName[pullStatus.key]}}</a> | ||
| <a *ngIf="pullStatus.key == 'waitingReview'" target="_blank" href="https://github.com/keymanapp/keyman/pulls?q=is%3Apr+is%3Aopen+review%3Arequired+-is%3Adraft">{{pullStatusName[pullStatus.key]}}</a> | ||
| <span *ngIf="pullStatus.key != 'waitingReview' && pullStatus.key != 'draft' && pullStatus.key != 'epics' && pullStatus.key != 'waitingTest'">{{pullStatusName[pullStatus.key]}}</span> | ||
| </td> | ||
| <td> | ||
| <span *ngFor="let pull of pullStatus.value"> | ||
| <app-pull-request [status]="status" [changeCounter]="changeCounter" [teamCity]="status.teamCity" [scope]="'platform'" [scopeValue]="''" [gravityX]="'left'" [gravityY]="'bottom'" [pull]="pull"></app-pull-request> | ||
| </span> | ||
| <span *ngIf="pullStatus.key =='readyToMerge'"> | ||
| <span *ngFor="let issue of userTestIssuesPassed"> | ||
| <app-issue [changeCounter]="changeCounter" [scope]="'platform'" [scopeValue]="''" [gravityX]="'left'" [gravityY]="'bottom'" [issue]="issue"></app-issue> | ||
| </span> | ||
| </span> | ||
| <span *ngIf="pullStatus.key =='waitingTest'"> | ||
| <span *ngFor="let issue of userTestIssues | filterIssueByLabel: 'user-test-required'"> | ||
| <app-issue [changeCounter]="changeCounter" [scope]="'platform'" [scopeValue]="''" [gravityX]="'left'" [gravityY]="'bottom'" [issue]="issue"></app-issue> | ||
| </span> | ||
| </span> | ||
| <span *ngIf="pullStatus.key =='waitingResponse'"> | ||
| <span *ngFor="let issue of userTestIssues | filterIssueByLabel: 'user-test-failed'"> | ||
| <app-issue [changeCounter]="changeCounter" [scope]="'platform'" [scopeValue]="''" [gravityX]="'left'" [gravityY]="'bottom'" [issue]="issue"></app-issue> | ||
| </span> | ||
| </span> | ||
| </td> | ||
| </tr> | ||
| @for (pullStatus of pullsByStatus | keyvalue; track pullStatus) { | ||
| <tr> | ||
| <td> | ||
| @if (pullStatus.key == 'draft') { | ||
| <a target="_blank" href="https://github.com/keymanapp/keyman/pulls?q=is%3Apr+is%3Aopen+is%3Adraft">{{pullStatusName[pullStatus.key]}}</a> | ||
| } | ||
| @if (pullStatus.key == 'epics') { | ||
| <a target="_blank" href="https://github.com/keymanapp/keyman/pulls?q=is%3Apr+is%3Aopen+head%3Aepic%2F">{{pullStatusName[pullStatus.key]}}</a> | ||
| } | ||
| @if (pullStatus.key == 'waitingTest') { | ||
| <a target="_blank" href="https://github.com/keymanapp/keyman/pulls?q=is%3Apr+is%3Aopen+label%3Auser-test-required">{{pullStatusName[pullStatus.key]}}</a> | ||
| } | ||
| @if (pullStatus.key == 'waitingReview') { | ||
| <a target="_blank" href="https://github.com/keymanapp/keyman/pulls?q=is%3Apr+is%3Aopen+review%3Arequired+-is%3Adraft">{{pullStatusName[pullStatus.key]}}</a> | ||
| } | ||
| @if (pullStatus.key != 'waitingReview' && pullStatus.key != 'draft' && pullStatus.key != 'epics' && pullStatus.key != 'waitingTest') { | ||
| <span>{{pullStatusName[pullStatus.key]}}</span> | ||
| } | ||
| </td> | ||
| <td> | ||
| @for (pull of pullStatus.value; track pull) { | ||
| <span> | ||
| <app-pull-request [status]="status" [changeCounter]="changeCounter" [teamCity]="status.teamCity" [scope]="'platform'" [scopeValue]="''" [gravityX]="'left'" [gravityY]="'bottom'" [pull]="pull"></app-pull-request> | ||
| </span> | ||
| } | ||
| @if (pullStatus.key =='readyToMerge') { | ||
| <span> | ||
| @for (issue of userTestIssuesPassed; track issue) { | ||
| <span> | ||
| <app-issue [changeCounter]="changeCounter" [scope]="'platform'" [scopeValue]="''" [gravityX]="'left'" [gravityY]="'bottom'" [issue]="issue"></app-issue> | ||
| </span> | ||
| } | ||
| </span> | ||
| } | ||
| @if (pullStatus.key =='waitingTest') { | ||
| <span> | ||
| @for (issue of userTestIssues | filterIssueByLabel: 'user-test-required'; track issue) { | ||
| <span> | ||
| <app-issue [changeCounter]="changeCounter" [scope]="'platform'" [scopeValue]="''" [gravityX]="'left'" [gravityY]="'bottom'" [issue]="issue"></app-issue> | ||
| </span> | ||
| } | ||
| </span> | ||
| } | ||
| @if (pullStatus.key =='waitingResponse') { | ||
| <span> | ||
| @for (issue of userTestIssues | filterIssueByLabel: 'user-test-failed'; track issue) { | ||
| <span> | ||
| <app-issue [changeCounter]="changeCounter" [scope]="'platform'" [scopeValue]="''" [gravityX]="'left'" [gravityY]="'bottom'" [issue]="issue"></app-issue> | ||
| </span> | ||
| } | ||
| </span> | ||
| } | ||
| </td> | ||
| </tr> | ||
| } | ||
| </tbody></table> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does else work?