xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00
Code Actions Projects Activity

Fixing sub directory search issue

Browse Source 
(it was failing on directory:(dir/subdir) due to the "/" in the url) #284
This commit is contained in:
Patrik J. Braun 2021-05-04 21:46:28 +02:00
parent 8b3f6ac64d
commit c5a1fa2657
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -33,7 +33,7 @@
"url": "https://github.com/bpatrik/PiGallery2/issues" "url": "https://github.com/bpatrik/PiGallery2/issues"
}, },
"dependencies": { "dependencies": {
"archiver": "^5.3.0", "archiver": "5.3.0",
"bcrypt": "5.0.1", "bcrypt": "5.0.1",
"body-parser": "1.19.0", "body-parser": "1.19.0",
"cookie-parser": "1.4.5", "cookie-parser": "1.4.5",
@ -78,7 +78,7 @@
"@asymmetrik/ngx-leaflet": "8.1.0", "@asymmetrik/ngx-leaflet": "8.1.0",
"@asymmetrik/ngx-leaflet-markercluster": "5.0.1", "@asymmetrik/ngx-leaflet-markercluster": "5.0.1",
"@ngx-loading-bar/core": "5.1.1", "@ngx-loading-bar/core": "5.1.1",
"@types/archiver": "^5.1.0", "@types/archiver": "5.1.0",
"@types/bcrypt": "3.0.1", "@types/bcrypt": "3.0.1",
"@types/bcryptjs": "2.4.2", "@types/bcryptjs": "2.4.2",
"@types/chai": "4.2.16", "@types/chai": "4.2.16",
@ -126,7 +126,7 @@
"karma-jasmine-html-reporter": "1.5.4", "karma-jasmine-html-reporter": "1.5.4",
"karma-remap-istanbul": "0.6.0", "karma-remap-istanbul": "0.6.0",
"karma-systemjs": "0.16.0", "karma-systemjs": "0.16.0",
"leaflet": "^1.7.1", "leaflet": "1.7.1",
"leaflet.markercluster": "1.5.0", "leaflet.markercluster": "1.5.0",
"mocha": "8.3.2", "mocha": "8.3.2",
"natural-orderby": "2.0.3", "natural-orderby": "2.0.3",

4
src/backend/routes/GalleryRouter.ts
View File

@ -196,7 +196,7 @@ export class GalleryRouter {
} }
protected static addSearch(app: Express): void { protected static addSearch(app: Express): void {
app.get('/api/search/:searchQueryDTO', app.get('/api/search/:searchQueryDTO(*)',
// common part // common part
AuthenticationMWs.authenticate, AuthenticationMWs.authenticate,
AuthenticationMWs.authorise(UserRoles.Guest), AuthenticationMWs.authorise(UserRoles.Guest),
@ -212,7 +212,7 @@ export class GalleryRouter {
protected static addAutoComplete(app: Express): void { protected static addAutoComplete(app: Express): void {
app.get('/api/autocomplete/:text', app.get('/api/autocomplete/:text(*)',
// common part // common part
AuthenticationMWs.authenticate, AuthenticationMWs.authenticate,
AuthenticationMWs.authorise(UserRoles.Guest), AuthenticationMWs.authorise(UserRoles.Guest),

24
src/frontend/app/ui/gallery/search/autocomplete.service.ts
View File

@ -68,17 +68,21 @@ export class AutoCompleteService {
items = items || new BehaviorSubject([]); items = items || new BehaviorSubject([]);
const cached = this.galleryCacheService.getAutoComplete(text, type); const cached = this.galleryCacheService.getAutoComplete(text, type);
if (cached == null) { try {
const acParams: any = {}; if (cached == null) {
if (type) { const acParams: any = {};
acParams[QueryParams.gallery.search.type] = type; if (type) {
acParams[QueryParams.gallery.search.type] = type;
}
this.networkService.getJson<IAutoCompleteItem[]>('/autocomplete/' + text, acParams).then(ret => {
this.galleryCacheService.setAutoComplete(text, type, ret);
items.next(this.sortResults(text, ret.map(i => this.ACItemToRenderable(i, fullText)).concat(items.value)));
});
} else {
items.next(this.sortResults(text, cached.map(i => this.ACItemToRenderable(i, fullText)).concat(items.value)));
} }
this.networkService.getJson<IAutoCompleteItem[]>('/autocomplete/' + text, acParams).then(ret => { } catch (e) {
this.galleryCacheService.setAutoComplete(text, type, ret); console.error(e);
items.next(this.sortResults(text, ret.map(i => this.ACItemToRenderable(i, fullText)).concat(items.value)));
});
} else {
items.next(this.sortResults(text, cached.map(i => this.ACItemToRenderable(i, fullText)).concat(items.value)));
} }
return items; return items;
} }