/k/ - Advanced Search
+
-
-
-
-
-
-
+ (`${environment.apiUrl}/search/schema`,).subscribe({
- next: (response) => {
- this.fields = response.fields;
- this.fields.forEach(field => {
- field.validOperators = this.getOperators(field.type);
- })
- this.loadPreviousFromLocalStorage();
- this.isLoadingSchema = false;
- },
- error: () => {
- alert('Error fetching schema');
+ this.route.data.subscribe(data => {
+ const searchType = data['searchType'];
+ this.searchType = searchType;
+
+ if (searchType === 'user') {
+ this.schemaUrl = `${environment.apiUrl}/search-user/schema`;
+ this.searchUrl = `${environment.apiUrl}/search-user`;
+ this.pageTitle = '/m/ - user search';
+ this.localStorageKey = 'user_search_settings';
+ } else {
+ this.schemaUrl = `${environment.apiUrl}/search/schema`;
+ this.searchUrl = `${environment.apiUrl}/search`;
+ this.pageTitle = '/k/ - score search';
+ this.localStorageKey = 'search_settings';
}
+
+ this.title.setTitle(this.pageTitle);
+ this.isLoadingSchema = true;
+ this.httpClient.get(this.schemaUrl).subscribe({
+ next: (response) => {
+ this.fields = response.fields;
+ this.fields.forEach(field => {
+ field.validOperators = this.getOperators(field.type);
+ })
+ this.loadPreviousFromLocalStorage();
+ this.isLoadingSchema = false;
+ },
+ error: () => {
+ alert('Error fetching schema');
+ }
+ });
});
}
+ hasFieldsInCategory(category: string): boolean {
+ return this.fields.some(field => field.category === category);
+ }
+
getOperators(fieldType: FieldType | undefined): Operator[] {
switch (fieldType) {
case 'number':
@@ -132,7 +160,7 @@ export class SearchComponent implements OnInit {
}
private loadPreviousFromLocalStorage(): void {
- const storedQueries = localStorage.getItem('search_settings');
+ const storedQueries = localStorage.getItem(this.localStorageKey);
let parsedQueries = storedQueries ? JSON.parse(storedQueries) : null;
if (parsedQueries && this.verifySchema(parsedQueries)) {
@@ -142,7 +170,7 @@ export class SearchComponent implements OnInit {
field.active = parsedQueries.columns[field.name] ?? field.active;
});
} else {
- localStorage.removeItem('search_settings');
+ localStorage.removeItem(this.localStorageKey);
this.queries = [];
this.sortingOrder = {
field: 'user_id',
@@ -203,7 +231,36 @@ export class SearchComponent implements OnInit {
saveSettingsToLocalStorage(): void {
const settings = this.serializeSettings();
- localStorage.setItem('search_settings', JSON.stringify(settings));
+ localStorage.setItem(this.localStorageKey, JSON.stringify(settings));
+ }
+
+ exportForApi(): void {
+ if(!this.queries) {
+ return;
+ }
+
+ const body = {
+ queries: this.queries.map(query => ({
+ ...query,
+ predicates: query.predicates.map(predicate => ({
+ field: {
+ name: predicate.field!!.name,
+ type: predicate.field!!.type
+ },
+ operator: predicate.operator,
+ value: predicate.value
+ }))
+ })),
+ sorting: this.sortingOrder,
+ page: 1
+ };
+
+ // Copy to cliboard
+ navigator.clipboard.writeText(JSON.stringify(body)).then(() => {
+ alert('Copied to clipboard');
+ }, () => {
+ alert('Error copying to clipboard');
+ });
}
exportSettings(): void {
@@ -262,7 +319,7 @@ export class SearchComponent implements OnInit {
sorting: this.sortingOrder,
page: pageNumber
}
- this.httpClient.post(`${environment.apiUrl}/search`, body)
+ this.httpClient.post(this.searchUrl, body)
.subscribe({
next: (response) => {
this.response = response;
@@ -284,8 +341,12 @@ export class SearchComponent implements OnInit {
}
}
- getId(entry: any): any {
- return this.getValue(entry, 'replay_id');
+ getLink(entry: any): any {
+ if(this.searchType === 'user') {
+ return "/u/" + this.getValue(entry, 'username');
+ } else {
+ return "/s/" + this.getValue(entry, 'replay_id');
+ }
}
protected readonly countryCodeToFlag = countryCodeToFlag;
diff --git a/nise-frontend/src/app/view-user/view-user.component.ts b/nise-frontend/src/app/view-user/view-user.component.ts
index 9e1feed..4ef05d4 100644
--- a/nise-frontend/src/app/view-user/view-user.component.ts
+++ b/nise-frontend/src/app/view-user/view-user.component.ts
@@ -74,7 +74,7 @@ export class ViewUserComponent implements OnInit, OnChanges, OnDestroy {
getUserInfo(): Observable {
const body = {
- userId: this.userId
+ username: this.userId
}
return this.httpClient.post(`${environment.apiUrl}/user-details`, body);
}
diff --git a/nise-frontend/src/corelib/components/query/query.component.html b/nise-frontend/src/corelib/components/query/query.component.html
index 896000a..173a8b1 100644
--- a/nise-frontend/src/corelib/components/query/query.component.html
+++ b/nise-frontend/src/corelib/components/query/query.component.html
@@ -23,15 +23,17 @@
diff --git a/nise-frontend/src/corelib/components/query/query.component.ts b/nise-frontend/src/corelib/components/query/query.component.ts
index d13d8e7..43a6c05 100644
--- a/nise-frontend/src/corelib/components/query/query.component.ts
+++ b/nise-frontend/src/corelib/components/query/query.component.ts
@@ -43,6 +43,10 @@ export class QueryComponent {
predicate.operator = selectedField.validOperators[0];
}
+ hasFieldsInCategory(category: string): boolean {
+ return this.fields.some(field => field.category === category);
+ }
+
onOperatorChange(predicate: Predicate, event: Event): void {
const selectElement = event.target as HTMLSelectElement;
const selectedOperatorType = selectElement.value;
-
- Loading schema...
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
-
-
+
+
+
+
+
-
diff --git a/nise-frontend/src/app/search/search.component.ts b/nise-frontend/src/app/search/search.component.ts
index 9986343..4c32ece 100644
--- a/nise-frontend/src/app/search/search.component.ts
+++ b/nise-frontend/src/app/search/search.component.ts
@@ -11,7 +11,7 @@ import {
Query,
QueryBuilderComponent
} from "../../corelib/components/query-builder/query-builder.component";
-import {RouterLink} from "@angular/router";
+import {ActivatedRoute, RouterLink} from "@angular/router";
import {CalculatePageRangePipe} from "../../corelib/calculate-page-range.pipe";
import {DownloadFilesService} from "../../corelib/service/download-files.service";
import {CuteLoadingComponent} from "../../corelib/components/cute-loading/cute-loading.component";
@@ -32,7 +32,7 @@ interface SchemaResponse {
}
interface SearchResponse {
- scores: any[];
+ results: any[];
pagination: SearchPagination;
}
@@ -69,8 +69,15 @@ interface Sorting {
})
export class SearchComponent implements OnInit {
+ schemaUrl!: string;
+ searchUrl!: string;
+ pageTitle!: string;
+ localStorageKey!: string;
+ searchType!: string;
+
constructor(private httpClient: HttpClient,
private title: Title,
+ private route: ActivatedRoute,
public downloadFilesService: DownloadFilesService) { }
currentSchemaVersion = 2
@@ -86,23 +93,44 @@ export class SearchComponent implements OnInit {
queries: Query[] | null = null;
ngOnInit(): void {
- this.title.setTitle("/k/ - advanced search");
- this.isLoadingSchema = true;
- this.httpClient.get
-
Loading
please be patient - the database is working hard!
+Loading schema...
-
- No results for your query - try different parameters.
-
+
-
-
-
-
-
+
+ | - {{ column.shortName }} - | -Links | -
|---|---|
|
- |
- - - details - - | -
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
Total results: {{ response.pagination.totalResults | number }}
-Page: {{ response.pagination.currentPage | number }} / {{ response.pagination.totalPages | number }}
-
-
- ...
-
- ...
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
Loading
please be patient - the database is working hard!
+
+ Looks like something went wrong... :(
+I'll look into what caused the error - but feel free to get in touch.
+
+
+ No results for your query - try different parameters.
+
+
+
+
+
+
+ | + {{ column.shortName }} + | +Links | +
|---|---|
+ null |
+ + + details + + | +
+
+ Total results: {{ response.pagination.totalResults | number }}
+Page: {{ response.pagination.currentPage | number }} / {{ response.pagination.totalPages | number }}
+
+
+ ...
+
+ ...
+
+
+
+
+