Skip to content

Fix style for status card, change style for Cancelling status #1230

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.

Sign up for GitHub

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
sofyakurilova merged 2 commits into from
Apr 9, 2025
Merged

Fix style for status card, change style for Cancelling status #1230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5e1818
Fix style for status card, change style for Cancelling status
sofyakurilova Apr 9, 2025
9f9f2e3
Fix tests
sofyakurilova Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 34 additions & 29 deletions ...i/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,35 +20,38 @@
[class.progress-card-pilot]="data.device.test_pack === TestingType.Pilot"
aria-live="assertive"
role="alert">
<div class="progress-card-info progress-card-info-tests">
<p class="progress-card-info-title">Tests executed</p>
<p class="progress-card-info-text">
<span>{{ getTestsResult(data) }}</span>
</p>
</div>

<div class="progress-card-info progress-card-info-status">
<div>
<p class="progress-card-info-title">{{ getTestStatusText(data) }}</p>
<div class="progress-card-header">
<div class="progress-card-info progress-card-info-tests">
<p class="progress-card-info-title">Tests executed</p>
<p class="progress-card-info-text">
<span>{{ getTestStatus(data) }}</span>
<span>{{ getTestsResult(data) }}</span>
</p>
</div>
<div
*ngIf="
data.finished &&
(data.status === StatusOfTestrun.Proceed ||
data.status === StatusOfTestrun.DoNotProceed)
">
<p class="progress-card-info-title">Preliminary Pilot Recommendation</p>
<p class="progress-card-info-text">
<span>{{ data.status }}</span>
</p>

<div class="progress-card-info progress-card-info-status">
<div>
<p class="progress-card-info-title">{{ getTestStatusText(data) }}</p>
<p class="progress-card-info-text">
<span>{{ getTestStatus(data) }}</span>
</p>
</div>
<div
*ngIf="
data.finished &&
(data.status === StatusOfTestrun.Proceed ||
data.status === StatusOfTestrun.DoNotProceed)
">
<p class="progress-card-info-title">
Preliminary Pilot Recommendation
</p>
<p class="progress-card-info-text">
<span>{{ data.status }}</span>
</p>
</div>
</div>
</div>

<div
*ngIf="!data.finished"
*ngIf="!data.finished && data.status !== StatusOfTestrun.InProgress"
class="progress-card-status"
[ngSwitch]="data.status">
<ng-container
Expand Down Expand Up @@ -87,11 +90,13 @@
</ng-container>

<ng-template #Cancelling>
<div>
<p class="progress-card-result-title">
Please wait, this operation could take up to a minute
</p>
</div>
<ng-container
*ngTemplateOutlet="
Spinner;
context: {
text: 'Please wait, this operation could take up to a minute',
}
"></ng-container>
</ng-template>

<ng-template #WaitingForDevice>
Expand Down Expand Up @@ -136,7 +141,7 @@
</ng-template>

<ng-template #WithProgressBar let-data="data">
<div class="progress-card-status">
<div class="progress-card-status progress-card-status-bar">
<mat-progress-bar
class="progress-bar"
mode="determinate"
Expand Down
22 changes: 11 additions & 11 deletions ...i/src/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,23 @@

.progress-card {
display: grid;
grid-template-areas:
'tests status'
'. .';
width: fit-content;
box-sizing: border-box;
gap: 16px;
padding: 16px 0;
grid-template-columns: min-content 1fr;
justify-items: center;

p {
margin: 0;
}

.progress-card-header {
display: flex;
justify-content: flex-start;
flex-wrap: nowrap;
column-gap: 16px;
}

.progress-bar {
padding-bottom: 28px;
width: 100%;
Expand Down Expand Up @@ -120,25 +124,21 @@
}

.progress-card-info-tests {
grid-area: tests;
@include progress-card-info(
colors.$surface-variant,
colors.$on-surface-variant,
colors.$on-surface
);
justify-self: end;
}

.progress-card-info-status {
grid-area: status;
@include progress-card-info(
colors.$primary,
colors.$primary-container,
colors.$on-primary
);
flex-direction: row;
gap: 32px;
justify-self: start;

&-pilot {
gap: 6px;
Expand All @@ -154,10 +154,10 @@

.progress-card-status {
overflow: hidden;
grid-area: 2/1/2/3;
white-space: normal;
justify-self: center;
width: 100%;
&-bar {
width: 100%;
}
}

.progress-card-result-loading {
Expand Down
6 changes: 4 additions & 2 deletions ...rc/app/pages/testrun/components/testrun-status-card/testrun-status-card.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,8 +478,10 @@ describe('ProgressStatusCardComponent', () => {
'.progress-card-info-status .progress-card-info-text'
)[1];

expect(titleEl.textContent).toEqual('Preliminary Pilot Recommendation');
expect(textEl.textContent).toEqual('Proceed');
expect(titleEl.textContent?.trim()).toEqual(
'Preliminary Pilot Recommendation'
);
expect(textEl.textContent?.trim()).toEqual('Proceed');
});
});
});
Expand Down