inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-09-09 18:03:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACS-9166]: migrates both saved searches to inheritance model

Browse Source
This commit is contained in:
Anton Ramanovich
2025-11-03 07:21:59 +01:00
parent a68de54759
commit af66fecfae
2 changed files with 23 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/content-services/src/lib/common/services/saved-searches-legacy.service.ts
+12 -131
View File
@@ -15,42 +15,28 @@
* limitations under the License. * limitations under the License.
*/ */
import { NodesApi, NodeEntry } from '@alfresco/js-api'; import { NodeEntry } from '@alfresco/js-api';
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { Observable, of, from, ReplaySubject, throwError } from 'rxjs'; import { Observable, of, from, throwError } from 'rxjs';
import { catchError, concatMap, first, map, switchMap, take, tap } from 'rxjs/operators'; import { catchError, concatMap, first, map } from 'rxjs/operators';
import { AlfrescoApiService } from '../../services/alfresco-api.service'; import { AlfrescoApiService } from '../../services/alfresco-api.service';
import { SavedSearch } from '../interfaces/saved-search.interface'; import { SavedSearch } from '../interfaces/saved-search.interface';
import { AuthenticationService } from '@alfresco/adf-core'; import { AuthenticationService } from '@alfresco/adf-core';
import { SavedSearchStrategy } from '../interfaces/saved-searches-strategy.interface'; import { SavedSearchesBaseService } from './saved-searches-base.service';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class SavedSearchesLegacyService implements SavedSearchStrategy { export class SavedSearchesLegacyService extends SavedSearchesBaseService {
private _nodesApi: NodesApi;
get nodesApi(): NodesApi {
this._nodesApi = this._nodesApi ?? new NodesApi(this.apiService.getInstance());
return this._nodesApi;
}
private readonly _savedSearches$ = new ReplaySubject<SavedSearch[]>(1);
readonly savedSearches$ = this._savedSearches$.asObservable();
private savedSearchFileNodeId: string; private savedSearchFileNodeId: string;
private currentUserLocalStorageKey: string; private currentUserLocalStorageKey: string;
private createFileAttempt = false; private createFileAttempt = false;
constructor( constructor(apiService: AlfrescoApiService, authService: AuthenticationService) {
private readonly apiService: AlfrescoApiService, super(apiService, authService);
private readonly authService: AuthenticationService
) {}
init(): void {
this.fetchSavedSearches();
} }
getSavedSearches(): Observable<SavedSearch[]> { protected fetchAllSavedSearches(): Observable<SavedSearch[]> {
return this.getSavedSearchesNodeId().pipe( return this.getSavedSearchesNodeId().pipe(
concatMap(() => concatMap(() =>
from(this.nodesApi.getNodeContent(this.savedSearchFileNodeId).then((content) => this.mapFileContentToSavedSearches(content))).pipe( from(this.nodesApi.getNodeContent(this.savedSearchFileNodeId).then((content) => this.mapFileContentToSavedSearches(content))).pipe(
@@ -58,7 +44,7 @@ export class SavedSearchesLegacyService implements SavedSearchStrategy {
if (!this.createFileAttempt) { if (!this.createFileAttempt) {
this.createFileAttempt = true; this.createFileAttempt = true;
localStorage.removeItem(this.getLocalStorageKey()); localStorage.removeItem(this.getLocalStorageKey());
return this.getSavedSearches(); return this.fetchAllSavedSearches();
} }
return throwError(() => error); return throwError(() => error);
}) })
@@ -67,113 +53,14 @@ export class SavedSearchesLegacyService implements SavedSearchStrategy {
); );
} }
saveSearch(newSaveSearch: Pick<SavedSearch, 'name' | 'description' | 'encodedUrl'>): Observable<NodeEntry> { protected updateSavedSearches(searches: SavedSearch[]): Observable<NodeEntry> {
return this.getSavedSearches().pipe( return from(this.nodesApi.updateNodeContent(this.savedSearchFileNodeId, JSON.stringify(searches)));
take(1),
switchMap((savedSearches: SavedSearch[]) => {
let updatedSavedSearches: SavedSearch[] = [];
if (savedSearches.length < 5) {
updatedSavedSearches = [{ ...newSaveSearch, order: 0 }, ...savedSearches];
} else {
const firstFiveSearches = savedSearches.slice(0, 5);
const restOfSearches = savedSearches.slice(5);
updatedSavedSearches = [...firstFiveSearches, { ...newSaveSearch, order: 5 }, ...restOfSearches];
}
updatedSavedSearches = updatedSavedSearches.map((search, index) => ({
...search,
order: index
}));
return from(this.nodesApi.updateNodeContent(this.savedSearchFileNodeId, JSON.stringify(updatedSavedSearches))).pipe(
tap(() => this._savedSearches$.next(updatedSavedSearches))
);
}),
catchError((error) => {
console.error('Error saving new search:', error);
return throwError(() => error);
})
);
}
editSavedSearch(updatedSavedSearch: SavedSearch): Observable<NodeEntry> {
let previousSavedSearches: SavedSearch[];
return this.savedSearches$.pipe(
take(1),
map((savedSearches: SavedSearch[]) => {
previousSavedSearches = [...savedSearches];
return savedSearches.map((search) => (search.order === updatedSavedSearch.order ? updatedSavedSearch : search));
}),
tap((updatedSearches: SavedSearch[]) => {
this._savedSearches$.next(updatedSearches);
}),
switchMap((updatedSearches: SavedSearch[]) =>
from(this.nodesApi.updateNodeContent(this.savedSearchFileNodeId, JSON.stringify(updatedSearches)))
),
catchError((error) => {
this._savedSearches$.next(previousSavedSearches);
return throwError(() => error);
})
);
}
deleteSavedSearch(deletedSavedSearch: SavedSearch): Observable<NodeEntry> {
let previousSavedSearchesOrder: SavedSearch[];
return this._savedSearches$.pipe(
take(1),
map((savedSearches: SavedSearch[]) => {
previousSavedSearchesOrder = [...savedSearches];
const updatedSearches = savedSearches.filter((search) => search.order !== deletedSavedSearch.order);
return updatedSearches.map((search, index) => ({
...search,
order: index
}));
}),
tap((updatedSearches: SavedSearch[]) => {
this._savedSearches$.next(updatedSearches);
}),
switchMap((updatedSearches: SavedSearch[]) =>
from(this.nodesApi.updateNodeContent(this.savedSearchFileNodeId, JSON.stringify(updatedSearches)))
),
catchError((error) => {
this._savedSearches$.next(previousSavedSearchesOrder);
return throwError(() => error);
})
);
}
changeOrder(previousIndex: number, currentIndex: number): void {
let previousSavedSearchesOrder: SavedSearch[];
this.savedSearches$
.pipe(
take(1),
map((savedSearches: SavedSearch[]) => {
previousSavedSearchesOrder = [...savedSearches];
const [movedSearch] = savedSearches.splice(previousIndex, 1);
savedSearches.splice(currentIndex, 0, movedSearch);
return savedSearches.map((search, index) => ({
...search,
order: index
}));
}),
tap((savedSearches: SavedSearch[]) => this._savedSearches$.next(savedSearches)),
switchMap((updatedSearches: SavedSearch[]) =>
from(this.nodesApi.updateNodeContent(this.savedSearchFileNodeId, JSON.stringify(updatedSearches)))
),
catchError((error) => {
this._savedSearches$.next(previousSavedSearchesOrder);
return throwError(() => error);
})
)
.subscribe();
} }
private getSavedSearchesNodeId(): Observable<string> { private getSavedSearchesNodeId(): Observable<string> {
const localStorageKey = this.getLocalStorageKey(); const localStorageKey = this.getLocalStorageKey();
if (this.currentUserLocalStorageKey && this.currentUserLocalStorageKey !== localStorageKey) { if (this.currentUserLocalStorageKey && this.currentUserLocalStorageKey !== localStorageKey) {
this._savedSearches$.next([]); this.resetSavedSearchesStream();
} }
this.currentUserLocalStorageKey = localStorageKey; this.currentUserLocalStorageKey = localStorageKey;
let savedSearchesNodeId = localStorage.getItem(this.currentUserLocalStorageKey) ?? ''; let savedSearchesNodeId = localStorage.getItem(this.currentUserLocalStorageKey) ?? '';
@@ -218,10 +105,4 @@ export class SavedSearchesLegacyService implements SavedSearchStrategy {
private getLocalStorageKey(): string { private getLocalStorageKey(): string {
return `saved-searches-node-id__${this.authService.getUsername()}`; return `saved-searches-node-id__${this.authService.getUsername()}`;
} }
private fetchSavedSearches(): void {
this.getSavedSearches()
.pipe(take(1))
.subscribe((searches) => this._savedSearches$.next(searches));
}
} }
lib/content-services/src/lib/common/services/saved-searches.service.ts
+11 -135
View File
@@ -15,14 +15,14 @@
* limitations under the License. * limitations under the License.
*/ */
import { NodesApi, NodeEntry, PreferencesApi, ContentFieldsQuery, PreferenceEntry } from '@alfresco/js-api'; import { NodeEntry, PreferencesApi, ContentFieldsQuery, PreferenceEntry } from '@alfresco/js-api';
import { inject, Injectable, InjectionToken } from '@angular/core'; import { inject, Injectable, InjectionToken } from '@angular/core';
import { Observable, of, from, ReplaySubject, throwError } from 'rxjs'; import { Observable, of, from, throwError } from 'rxjs';
import { catchError, concatMap, first, map, switchMap, take, tap } from 'rxjs/operators'; import { catchError, concatMap, first, map, switchMap, take, tap } from 'rxjs/operators';
import { AlfrescoApiService } from '../../services/alfresco-api.service'; import { AlfrescoApiService } from '../../services/alfresco-api.service';
import { SavedSearch } from '../interfaces/saved-search.interface'; import { SavedSearch } from '../interfaces/saved-search.interface';
import { AuthenticationService } from '@alfresco/adf-core'; import { AuthenticationService } from '@alfresco/adf-core';
import { SavedSearchStrategy } from '../interfaces/saved-searches-strategy.interface'; import { SavedSearchesBaseService } from './saved-searches-base.service';
export interface SavedSearchesPreferencesApiService { export interface SavedSearchesPreferencesApiService {
getPreference: (personId: string, preferenceName: string, opts?: ContentFieldsQuery) => Promise<PreferenceEntry> | Observable<PreferenceEntry>; getPreference: (personId: string, preferenceName: string, opts?: ContentFieldsQuery) => Promise<PreferenceEntry> | Observable<PreferenceEntry>;
@@ -34,17 +34,11 @@ export const SAVED_SEARCHES_SERVICE_PREFERENCES = new InjectionToken<SavedSearch
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class SavedSearchesService implements SavedSearchStrategy { export class SavedSearchesService extends SavedSearchesBaseService {
private savedSearchFileNodeId: string; private savedSearchFileNodeId: string;
private _nodesApi: NodesApi;
private _preferencesApi: SavedSearchesPreferencesApiService; private _preferencesApi: SavedSearchesPreferencesApiService;
private preferencesService = inject(SAVED_SEARCHES_SERVICE_PREFERENCES, { optional: true }); private preferencesService = inject(SAVED_SEARCHES_SERVICE_PREFERENCES, { optional: true });
get nodesApi(): NodesApi {
this._nodesApi = this._nodesApi ?? new NodesApi(this.apiService.getInstance());
return this._nodesApi;
}
get preferencesApi(): SavedSearchesPreferencesApiService { get preferencesApi(): SavedSearchesPreferencesApiService {
if (this.preferencesService) { if (this.preferencesService) {
this._preferencesApi = this.preferencesService; this._preferencesApi = this.preferencesService;
@@ -55,26 +49,18 @@ export class SavedSearchesService implements SavedSearchStrategy {
return this._preferencesApi; return this._preferencesApi;
} }
private readonly _savedSearches$ = new ReplaySubject<SavedSearch[]>(1); constructor(apiService: AlfrescoApiService, authService: AuthenticationService) {
readonly savedSearches$ = this._savedSearches$.asObservable(); super(apiService, authService);
constructor(
private readonly apiService: AlfrescoApiService,
private readonly authService: AuthenticationService
) {}
init(): void {
this.fetchSavedSearches();
} }
getSavedSearches(): Observable<SavedSearch[]> { protected fetchAllSavedSearches(): Observable<SavedSearch[]> {
const savedSearchesMigrated = localStorage.getItem(this.getLocalStorageKey()) ?? ''; const savedSearchesMigrated = localStorage.getItem(this.getLocalStorageKey()) ?? '';
if (savedSearchesMigrated === 'true') { if (savedSearchesMigrated === 'true') {
return this.getSavedSearchesFromPreferenceApi(); return this.getSavedSearchesFromPreferenceApi();
} else { } else {
return this.getSavedSearchesNodeId().pipe( return this.getSavedSearchesNodeId().pipe(
take(1), take(1),
concatMap(() => { switchMap(() => {
if (this.savedSearchFileNodeId !== '') { if (this.savedSearchFileNodeId !== '') {
return this.migrateSavedSearches(); return this.migrateSavedSearches();
} else { } else {
@@ -86,116 +72,12 @@ export class SavedSearchesService implements SavedSearchStrategy {
} }
} }
saveSearch(newSaveSearch: Pick<SavedSearch, 'name' | 'description' | 'encodedUrl'>): Observable<NodeEntry> { protected updateSavedSearches(updatedSavedSearches: SavedSearch[]): Observable<NodeEntry> {
return this.getSavedSearches().pipe( return from(this.preferencesApi.updatePreference('-me-', 'saved-searches', JSON.stringify(updatedSavedSearches))).pipe(
take(1), map((preference) => JSON.parse(preference.entry.value))
switchMap((savedSearches: SavedSearch[]) => {
let updatedSavedSearches: SavedSearch[] = [];
if (savedSearches.length < 5) {
updatedSavedSearches = [{ ...newSaveSearch, order: 0 }, ...savedSearches];
} else {
const firstFiveSearches = savedSearches.slice(0, 5);
const restOfSearches = savedSearches.slice(5);
updatedSavedSearches = [...firstFiveSearches, { ...newSaveSearch, order: 5 }, ...restOfSearches];
}
updatedSavedSearches = updatedSavedSearches.map((search, index) => ({
...search,
order: index
}));
return from(this.preferencesApi.updatePreference('-me-', 'saved-searches', JSON.stringify(updatedSavedSearches))).pipe(
map((preference) => JSON.parse(preference.entry.value)),
tap(() => this._savedSearches$.next(updatedSavedSearches))
);
}),
catchError((error) => {
console.error('Error saving new search:', error);
return throwError(() => error);
})
); );
} }
editSavedSearch(updatedSavedSearch: SavedSearch): Observable<NodeEntry> {
let previousSavedSearches: SavedSearch[];
return this.savedSearches$.pipe(
take(1),
map((savedSearches: SavedSearch[]) => {
previousSavedSearches = [...savedSearches];
return savedSearches.map((search) => (search.order === updatedSavedSearch.order ? updatedSavedSearch : search));
}),
tap((updatedSearches: SavedSearch[]) => {
this._savedSearches$.next(updatedSearches);
}),
switchMap((updatedSearches: SavedSearch[]) =>
from(this.preferencesApi.updatePreference('-me-', 'saved-searches', JSON.stringify(updatedSearches))).pipe(
map((preference) => JSON.parse(preference.entry.value))
)
),
catchError((error) => {
this._savedSearches$.next(previousSavedSearches);
return throwError(() => error);
})
);
}
deleteSavedSearch(deletedSavedSearch: SavedSearch): Observable<NodeEntry> {
let previousSavedSearchesOrder: SavedSearch[];
return this.savedSearches$.pipe(
take(1),
map((savedSearches: SavedSearch[]) => {
previousSavedSearchesOrder = [...savedSearches];
const updatedSearches = savedSearches.filter((search) => search.order !== deletedSavedSearch.order);
return updatedSearches.map((search, index) => ({
...search,
order: index
}));
}),
tap((updatedSearches: SavedSearch[]) => {
this._savedSearches$.next(updatedSearches);
}),
switchMap((updatedSearches: SavedSearch[]) =>
from(this.preferencesApi.updatePreference('-me-', 'saved-searches', JSON.stringify(updatedSearches))).pipe(
map((preference) => JSON.parse(preference.entry.value))
)
),
catchError((error) => {
this._savedSearches$.next(previousSavedSearchesOrder);
return throwError(() => error);
})
);
}
changeOrder(previousIndex: number, currentIndex: number): void {
let previousSavedSearchesOrder: SavedSearch[];
this.savedSearches$
.pipe(
take(1),
map((savedSearches: SavedSearch[]) => {
previousSavedSearchesOrder = [...savedSearches];
const [movedSearch] = savedSearches.splice(previousIndex, 1);
savedSearches.splice(currentIndex, 0, movedSearch);
return savedSearches.map((search, index) => ({
...search,
order: index
}));
}),
tap((savedSearches: SavedSearch[]) => this._savedSearches$.next(savedSearches)),
switchMap((updatedSearches: SavedSearch[]) =>
from(this.preferencesApi.updatePreference('-me-', 'saved-searches', JSON.stringify(updatedSearches))).pipe(
map((preference) => JSON.parse(preference.entry.value))
)
),
catchError((error) => {
this._savedSearches$.next(previousSavedSearchesOrder);
return throwError(() => error);
})
)
.subscribe();
}
private getSavedSearchesNodeId(): Observable<string> { private getSavedSearchesNodeId(): Observable<string> {
return from(this.nodesApi.getNode('-my-', { relativePath: 'config.json' })).pipe( return from(this.nodesApi.getNode('-my-', { relativePath: 'config.json' })).pipe(
first(), first(),
@@ -224,12 +106,6 @@ export class SavedSearchesService implements SavedSearchStrategy {
return `saved-searches-${this.authService.getUsername()}-migrated`; return `saved-searches-${this.authService.getUsername()}-migrated`;
} }
private fetchSavedSearches(): void {
this.getSavedSearches()
.pipe(take(1))
.subscribe((searches) => this._savedSearches$.next(searches));
}
private migrateSavedSearches(): Observable<SavedSearch[]> { private migrateSavedSearches(): Observable<SavedSearch[]> {
return from(this.nodesApi.getNodeContent(this.savedSearchFileNodeId).then((content) => this.mapFileContentToSavedSearches(content))).pipe( return from(this.nodesApi.getNodeContent(this.savedSearchFileNodeId).then((content) => this.mapFileContentToSavedSearches(content))).pipe(
tap((savedSearches) => { tap((savedSearches) => {