Skip to content

Commit

Permalink
Add labels to revision dropdown and allow only full diff for typespec…
Browse files Browse the repository at this point in the history 
… reviews (#9624)
  • Loading branch information
@chidozieononiwu
chidozieononiwu authored Jan 14, 2025
1 parent 25b31b2 commit 256fc67
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
10 changes: 10 additions & 0 deletions ...PIView/ClientSPA/src/app/_components/review-page-options/review-page-options.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ export class ReviewPageOptionsComponent implements OnInit, OnChanges{
if (changes['review'] && changes['review'].currentValue != undefined) {
this.setSubscribeSwitch();
this.setReviewApprovalStatus();
this.updateDiffStyle();
}

if (changes['hasHiddenAPIThatIsDiff']) {
Expand Down Expand Up @@ -254,6 +255,15 @@ export class ReviewPageOptionsComponent implements OnInit, OnChanges{
return approvers.join(', ');
}

updateDiffStyle() {
if (this.review?.language === 'TypeSpec') {
this.diffStyleOptions = [
{ label: 'Full Diff', value: FULL_DIFF_STYLE },
]
this.selectedDiffStyle = this.diffStyleOptions[0];
}
}

setSelectedDiffStyle() {
const inputDiffStyle = this.diffStyleOptions.find(option => option.value === this.diffStyleInput);
this.selectedDiffStyle = (inputDiffStyle) ? inputDiffStyle : this.diffStyleOptions[0];
Expand Down
12 changes: 6 additions & 6 deletions ...et/APIView/ClientSPA/src/app/_components/revision-options/revision-options.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<div class="flex align-items-center selected-item-content" *ngIf="selectedActiveAPIRevision">
<i class="{{ selectedActiveAPIRevision.typeClass }}"></i>
<span *ngIf="selectedActiveAPIRevision.prNo"> {{ selectedActiveAPIRevision.prNo }}</span>
<span class="emphasis-badge info ms-2">version: {{ selectedActiveAPIRevision.version }}</span>
<span *ngIf="selectedActiveAPIRevision.language != 'TypeSpec'" class="emphasis-badge info ms-2">version: {{ selectedActiveAPIRevision.version }}</span>
<i class="fas fa-check-circle text-success ms-2" *ngIf="selectedActiveAPIRevision.isApproved"></i>
<span *ngIf="selectedActiveAPIRevision.apiRevisionType !== 'Automatic'" class="ms-2">{{ selectedActiveAPIRevision.createdBy }}</span>
<span *ngIf="selectedActiveAPIRevision.isReleased" class="emphasis-badge success ms-2">released: {{ selectedActiveAPIRevision.releasedOn | timeago }}</span>
Expand All @@ -48,7 +48,7 @@
<div class="flex align-items-center gap-2">
<i class="{{ apiRevision.typeClass }}"></i>
<span *ngIf="apiRevision.prNo"> {{ apiRevision.prNo }}</span>
<span class="emphasis-badge info ms-2">version: {{ apiRevision.version }}</span>
<span *ngIf="apiRevision.language != 'TypeSpec'" class="emphasis-badge info ms-2">version: {{ apiRevision.version }}</span>
<i class="fas fa-check-circle text-success ms-2" *ngIf="apiRevision.isApproved"></i>
<span *ngIf="apiRevision.apiRevisionType !== 'Automatic'" class="ms-2">{{ apiRevision.createdBy }}</span>
<span *ngIf="apiRevision.isLatestGA" class="emphasis-badge warn small ms-2">Latest GA</span>
Expand All @@ -60,7 +60,7 @@
<span class="emphasis-badge secondary ms-2">last updated: {{ apiRevision | lastUpdatedOn | timeago }}</span>
<span *ngIf="apiRevision.isReleased" class="emphasis-badge success ms-2">released: {{ apiRevision.releasedOn | timeago }}</span>
</div>
<div *ngIf="apiRevision.apiRevisionType === 'Manual' && apiRevision.label">{{ apiRevision.label }}</div>
<div *ngIf="(apiRevision.apiRevisionType === 'Manual' || apiRevision.language === 'TypeSpec') && apiRevision.label">{{ apiRevision.label }}</div>
</div>
</ng-template>
</p-dropdown>
Expand Down Expand Up @@ -108,7 +108,7 @@
<div class="flex align-items-center selected-item-content" *ngIf="selectedDiffAPIRevision">
<i class="{{ selectedDiffAPIRevision.typeClass }}"></i>
<span *ngIf="selectedDiffAPIRevision.prNo"> {{ selectedDiffAPIRevision.prNo }}</span>
<span class="emphasis-badge info ms-2">version: {{ selectedDiffAPIRevision.version }}</span>
<span *ngIf="selectedActiveAPIRevision.language != 'TypeSpec'" class="emphasis-badge info ms-2">version: {{ selectedDiffAPIRevision.version }}</span>
<i class="fas fa-check-circle text-success ms-2" *ngIf="selectedDiffAPIRevision.isApproved"></i>
<span *ngIf="selectedDiffAPIRevision.apiRevisionType !== 'Automatic'" class="ms-2">{{ selectedDiffAPIRevision.createdBy }}</span>
<span *ngIf="selectedDiffAPIRevision.isReleased" class="emphasis-badge success ms-2">released: {{ selectedDiffAPIRevision.releasedOn | timeago }}</span>
Expand All @@ -118,7 +118,7 @@
<div class="flex align-items-center gap-2">
<i class="{{ apiRevision.typeClass }}"></i>
<span *ngIf="apiRevision.prNo"> {{ apiRevision.prNo }}</span>
<span class="emphasis-badge info ms-2">version: {{ apiRevision.version }}</span>
<span *ngIf="apiRevision.language != 'TypeSpec'" class="emphasis-badge info ms-2">version: {{ apiRevision.version }}</span>
<i class="fas fa-check-circle text-success ms-2" *ngIf="apiRevision.isApproved"></i>
<span *ngIf="apiRevision.apiRevisionType !== 'Automatic'" class="ms-2">{{ apiRevision.createdBy }}</span>
<span *ngIf="apiRevision.isLatestGA" class="emphasis-badge warn small ms-2">Latest GA</span>
Expand All @@ -128,7 +128,7 @@
<div class="small"><span class="emphasis-badge secondary">created: {{ apiRevision.createdOn | timeago }}</span>
<span class="emphasis-badge secondary ms-2">last updated: {{ apiRevision | lastUpdatedOn | timeago }}</span>
<span *ngIf="apiRevision.isReleased" class="emphasis-badge success ms-2">released: {{ apiRevision.releasedOn | timeago }}</span></div>
<div *ngIf="apiRevision.apiRevisionType === 'Manual' && apiRevision.label">{{ apiRevision.label }}</div>
<div *ngIf="(apiRevision.apiRevisionType === 'Manual' || apiRevision.language === 'TypeSpec') && apiRevision.label">{{ apiRevision.label }}</div>
</div>
</ng-template>
</p-dropdown>
Expand Down

0 comments on commit 256fc67

Please sign in to comment.