Skip to content

Migrate secondary side panels to Angular Signals #2420

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

Open
rfontanarosa wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Migrate secondary side panels to Angular Signals #2420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c17bcaa
secondary panel migrated to signal + loading spinner
rfontanarosa Jan 30, 2026
f4b71a5
remove: console.log + duplicate if statement
rfontanarosa Jan 31, 2026
3f83433
Merge branch 'master' into rfontanarosa/1669/submission-list-brief-de…
rfontanarosa Jan 31, 2026
76a74e0
added a check because submissions can be null
rfontanarosa Jan 31, 2026
cfe49ba
Merge branch 'rfontanarosa/1669/submission-list-brief-delay-when-sele…
rfontanarosa Jan 31, 2026
c860d78
improved use of signal
rfontanarosa Feb 3, 2026
bd20f4c
moved selectedLoi in the parent component
rfontanarosa Feb 3, 2026
ae7d1fb
Merge branch 'master' into rfontanarosa/1669/submission-list-brief-de…
rfontanarosa Feb 3, 2026
0a126b0
Merge branch 'master' into rfontanarosa/1669/submission-list-brief-de…
rfontanarosa Feb 9, 2026
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
57 changes: 40 additions & 17 deletions web/src/app/components/create-survey/create-survey.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,16 @@
<div class="page">
<ground-header [survey]="survey"></ground-header>
<!-- TODO(#1170): Extract the spinner into a component -->
<div id="loading-spinner" class="loading-spinner" *ngIf="createSurveyPhase === CreateSurveyPhase.LOADING">
<div
id="loading-spinner"
class="loading-spinner"
*ngIf="createSurveyPhase === CreateSurveyPhase.LOADING"
>
<div>
<mat-spinner></mat-spinner>
<p class="loading-label" i18n="@@app.labels.loadingSurvey">Loading survey...</p>
<p class="loading-label" i18n="@@app.labels.loadingSurvey">
Loading survey...
</p>
</div>
</div>

Expand All @@ -34,11 +40,21 @@
/>
<div class="create-survey-content">
<div class="progress-bar-title">{{ progressBarTitle() }}</div>
<mat-progress-bar mode="determinate" [value]="progressBarValue()"></mat-progress-bar>
<mat-progress-bar
mode="determinate"
[value]="progressBarValue()"
></mat-progress-bar>
<ground-step-card
[title]="cardTitle()"
[description]="cardDescription()"
[jobName]="[CreateSurveyPhase.DEFINE_LOIS, CreateSurveyPhase.DEFINE_TASKS].includes(createSurveyPhase) ? jobName() : ''"
[jobName]="
[
CreateSurveyPhase.DEFINE_LOIS,
CreateSurveyPhase.DEFINE_TASKS,
].includes(createSurveyPhase)
? jobName()
: ''
"
>
<ng-container [ngSwitch]="createSurveyPhase">
<survey-details
Expand Down Expand Up @@ -86,10 +102,9 @@
id="back-button"
class="button"
color="primary"
i18n="@@app.labels.back"
(click)="back()"
>
Back
<span i18n="@@app.labels.back">Back</span>
</button>
</div>

Expand All @@ -99,17 +114,25 @@
[surveyId]="surveyId"
></ground-copy-survey-controls>

<button
id="continue-button"
class="continue-button"
mat-flat-button
color="primary"
(click)="continue()"
[disabled]="!canContinue"
>
<span *ngIf="createSurveyPhase === CreateSurveyPhase.SHARE_SURVEY" i18n="@@app.labels.goToSurvey">Go to survey</span>
<span *ngIf="createSurveyPhase !== CreateSurveyPhase.SHARE_SURVEY" i18n="@@app.labels.continue">Continue</span>
</button>
<button
id="continue-button"
class="continue-button"
mat-flat-button
color="primary"
(click)="continue()"
[disabled]="!canContinue"
>
<span
*ngIf="createSurveyPhase === CreateSurveyPhase.SHARE_SURVEY"
i18n="@@app.labels.goToSurvey"
>Go to survey</span
>
<span
*ngIf="createSurveyPhase !== CreateSurveyPhase.SHARE_SURVEY"
i18n="@@app.labels.continue"
>Continue</span
>
</button>
</div>
</div>
</div>
Expand Down
61 changes: 37 additions & 24 deletions ...nts/main-page-container/main-page/secondary-side-panel/loi-panel/loi-panel.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,19 @@
limitations under the License.
-->

<div *ngIf="loi" class="loi-panel" [ngClass]="{loading: isLoading}">
<div *ngIf="isLoading" class="progress-spinner">
<div class="loi-panel" [ngClass]="{ loading: isLoading() }">
<div *ngIf="isLoading()" class="progress-spinner">
<mat-spinner mode="indeterminate" diameter="50"></mat-spinner>
</div>

<ng-container *ngIf="!isLoading">
<ng-container *ngIf="!isLoading()">
<div class="header">
<div class="header-left">
<mat-icon svgIcon={{icon}} [ngStyle]="{color: iconColor}"></mat-icon>
<div>{{ name }}</div>
<mat-icon
svgIcon="{{ icon() }}"
[ngStyle]="{ color: iconColor() }"
></mat-icon>
<div>{{ name() }}</div>
</div>

<button
Expand All @@ -41,27 +44,37 @@
</button>
</div>

<div *ngIf="submissions && submissions.count() === 0" class="no-lois-container">
<div class="mat-icon-container">
<mat-icon>inbox</mat-icon>
<ng-container *ngIf="submissions() as subs">
<div *ngIf="subs.count() === 0" class="no-lois-container">
<div class="mat-icon-container">
<mat-icon>inbox</mat-icon>
</div>
<span i18n="@@app.loiPanel.noDataForThisSite"
>No data collected for this site</span
>
</div>
No data collected for this site
</div>

<mat-list *ngIf="submissions && submissions.count() > 0">
<div *ngFor="let submission of submissions; let i = index">
<mat-divider *ngIf="i > 0"></mat-divider>
<div class="submission-item">
<mat-list-item (click)="onSelectSubmission(submission.id)">
<mat-icon matListItemIcon class="material-symbols-outlined">text_snippet</mat-icon>
<h3 matListItemTitle>{{ submission.created.user.displayName }}</h3>
<p matListItemLine>{{ submission.created.clientTime | date: 'longDate' }}</p>
</mat-list-item>
<button mat-icon-button (click)="onSelectSubmission(submission.id)">
<mat-icon>chevron_right</mat-icon>
</button>
<mat-list *ngIf="subs.count() > 0">
<div *ngFor="let submission of subs; let i = index">
<mat-divider *ngIf="i > 0"></mat-divider>
<div class="submission-item">
<mat-list-item (click)="onSelectSubmission(submission.id)">
<mat-icon matListItemIcon class="material-symbols-outlined"
>text_snippet</mat-icon
>
<h3 matListItemTitle>
{{ submission.created.user.displayName }}
</h3>
<p matListItemLine>
{{ submission.created.clientTime | date: 'longDate' }}
</p>
</mat-list-item>
<button mat-icon-button (click)="onSelectSubmission(submission.id)">
<mat-icon>chevron_right</mat-icon>
</button>
</div>
</div>
</div>
</mat-list>
</mat-list>
</ng-container>
</ng-container>
</div>
38 changes: 25 additions & 13 deletions .../main-page-container/main-page/secondary-side-panel/loi-panel/loi-panel.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,12 @@
*/

import { NO_ERRORS_SCHEMA } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import {
ComponentFixture,
TestBed,
fakeAsync,
tick,
} from '@angular/core/testing';
import { MatDialog, MatDialogModule } from '@angular/material/dialog';
import { MatIconModule } from '@angular/material/icon';
import { MatListModule } from '@angular/material/list';
Expand Down Expand Up @@ -111,27 +116,34 @@ describe('LocationOfInterestPanelComponent', () => {
beforeEach(() => {
fixture = TestBed.createComponent(LocationOfInterestPanelComponent);
component = fixture.componentInstance;
});

function setupPanelWithLoi() {
fixture.componentRef.setInput('activeSurvey', mockSurvey);
fixture.componentRef.setInput('selectedLoi', mockLoi);
fixture.detectChanges();
});
tick(100);
fixture.detectChanges();
}

it('should create', () => {
expect(component).toBeTruthy();
});

it('should initialize component state on init', () => {
fixture.componentRef.setInput('lois', List([mockLoi]));
fixture.detectChanges();
it('should initialize component state on init', fakeAsync(() => {
setupPanelWithLoi();

expect(component.loi).toEqual(mockLoi);
expect(component.isLoading()).toBe(false);
expect(component.selectedLoi()).toEqual(mockLoi);
expect(component.iconColor()).toBe('#000');
expect(component.name()).toBe('Unnamed point');
expect(component.submissions).toBeDefined();
expect(component.isLoading).toBe(false);
expect(component.iconColor).toBe('#000');
expect(component.name).toBe('Unnamed point'); // Default name for mockLoi
});
}));

it('should navigate to submission detail on selection', () => {
component.loi = mockLoi;
it('should navigate to submission detail on selection', fakeAsync(() => {
setupPanelWithLoi();

fixture.componentRef.setInput('loi', mockLoi);
const submissionId = 'sub1';
component.onSelectSubmission(submissionId);

Expand All @@ -140,7 +152,7 @@ describe('LocationOfInterestPanelComponent', () => {
mockLoi.id,
submissionId
);
});
}));

it('should clear LOI on close', () => {
component.onClosePanel();
Expand Down
Loading