Skip to content
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

Jump to bottom

NAS-131130 / 25.04 / Refactor subscribeToInstalledAppsUpdates in installed-apps-store.service #10741

Merged
merged 2 commits into from
Sep 27, 2024
Merged

NAS-131130 / 25.04 / Refactor subscribeToInstalledAppsUpdates in installed-apps-store.service #10741

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3b71c8
NAS-131130: Refactor `subscribeToInstalledAppsUpdates` in `installed-…
AlexKarpov98 Sep 20, 2024
4494a11
NAS-131130: PR update
AlexKarpov98 Sep 26, 2024
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
167 changes: 85 additions & 82 deletions src/app/pages/apps/store/installed-apps-store.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,88 +68,6 @@ export class InstalledAppsStore extends ComponentStore<InstalledAppsState> imple
});
}

private handleRemovedApps(updatedAppName: string, allApps: AvailableApp[]): AvailableApp[] {
return allApps.map((app) => {
if (app.name === updatedAppName) {
return { ...app, installed: false } as AvailableApp;
}
return app;
});
}

private subscribeToInstalledAppsUpdates(): void {
if (this.installedAppsSubscription) {
return;
}

// TODO: Messy. Refactor.
this.installedAppsSubscription = this.appsService.getInstalledAppsUpdates().pipe(
tap(() => this.patchState({ isLoading: true })),
tap((apiEvent: ApiEvent<App>) => {
if (apiEvent.msg === IncomingApiMessageType.Removed) {
this.patchState((state: InstalledAppsState): InstalledAppsState => {
return {
...state,
installedApps: state.installedApps.filter((app) => app.name !== apiEvent.id.toString()),
};
});
this.appsStore.patchState((state) => {
return {
...state,
availableApps: this.handleRemovedApps(apiEvent.id as string, state.availableApps),
recommendedApps: this.handleRemovedApps(apiEvent.id as string, state.recommendedApps),
latestApps: this.handleRemovedApps(apiEvent.id as string, state.latestApps),
};
});
}
}),
filter((apiEvent) => {
if (apiEvent.msg === IncomingApiMessageType.Removed) {
this.patchState({ isLoading: false });
}
return apiEvent.msg !== IncomingApiMessageType.Removed;
}),
tap((apiEvent) => {
const app = apiEvent.fields;
if (!app) {
return;
}
this.patchState((state: InstalledAppsState): InstalledAppsState => {
if (apiEvent.msg === IncomingApiMessageType.Added) {
return {
...state,
installedApps: [...state.installedApps, app],
};
}
return {
...state,
installedApps: state.installedApps.map((installedApp) => {
if (installedApp.name === apiEvent.id) {
return { ...installedApp, ...app };
}
return installedApp;
}),
};
});

const updateApps = (appsToUpdate: AvailableApp[]): AvailableApp[] => appsToUpdate.map((availableApp) => {
return availableApp.name === app.id ? { ...availableApp, installed: true } : availableApp;
});

this.appsStore.patchState((state) => {
return {
...state,
availableApps: updateApps(state.availableApps),
recommendedApps: updateApps(state.recommendedApps),
latestApps: updateApps(state.latestApps),
};
});
}),
tap(() => this.patchState({ isLoading: false })),
untilDestroyed(this),
).subscribe();
}

private loadInstalledApps(): Observable<unknown> {
return this.dockerStore.isLoading$.pipe(
withLatestFrom(this.dockerStore.isDockerStarted$),
Expand Down Expand Up @@ -177,4 +95,89 @@ export class InstalledAppsStore extends ComponentStore<InstalledAppsState> imple
untilDestroyed(this),
);
}

private subscribeToInstalledAppsUpdates(): void {
if (this.installedAppsSubscription) {
return;
}

this.installedAppsSubscription = this.appsService.getInstalledAppsUpdates().pipe(
tap((apiEvent: ApiEvent<App>) => {
this.handleApiEvent(apiEvent);
this.patchState({ isLoading: false });
}),
untilDestroyed(this),
).subscribe();
}

private handleApiEvent(apiEvent: ApiEvent<App>): void {
switch (apiEvent.msg) {
case IncomingApiMessageType.Removed:
this.handleRemovedEvent(apiEvent);
break;
case IncomingApiMessageType.Added:
case IncomingApiMessageType.Changed:
this.handleAddedOrUpdatedEvent(apiEvent);
break;
default:
console.error('Unknown API event type');
break;
}
}

private handleRemovedEvent(apiEvent: ApiEvent<App>): void {
const appId = apiEvent.id.toString();

this.patchState((state: InstalledAppsState): InstalledAppsState => ({
...state,
installedApps: state.installedApps.filter((app) => app.name !== appId),
}));

const updateApps = (updatedAppName: string, allApps: AvailableApp[]): AvailableApp[] => {
return allApps.map((app) => {
if (app.name === updatedAppName) {
return { ...app, installed: false };
}
return app;
});
};

this.appsStore.patchState((state) => ({
...state,
availableApps: updateApps(appId, state.availableApps),
recommendedApps: updateApps(appId, state.recommendedApps),
latestApps: updateApps(appId, state.latestApps),
}));
}

private handleAddedOrUpdatedEvent(apiEvent: ApiEvent<App>): void {
const app = apiEvent.fields;
if (!app) {
return;
}

this.patchState((state: InstalledAppsState): InstalledAppsState => {
if (apiEvent.msg === IncomingApiMessageType.Added) {
return { ...state, installedApps: [...state.installedApps, app] };
}

return {
...state,
installedApps: state.installedApps.map(
(installedApp) => (installedApp.name === apiEvent.id ? { ...installedApp, ...app } : installedApp),
),
};
});

const updateApps = (apps: AvailableApp[]): AvailableApp[] => apps.map(
(availableApp) => (availableApp.name === app.id ? { ...availableApp, installed: true } : availableApp),
);

this.appsStore.patchState((state) => ({
...state,
availableApps: updateApps(state.availableApps),
recommendedApps: updateApps(state.recommendedApps),
latestApps: updateApps(state.latestApps),
}));
}
}
Loading