Trivernis
/
mediarepo
mirror of https://github.com/Trivernis/mediarepo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix scrollbar behaviour in filesearch

Browse Source 
Signed-off-by: trivernis <trivernis@protonmail.com>
pull/4/head
trivernis 3 years ago
parent 918f4b3bb8
commit 981e23a192
7 changed files with 62 additions and 173 deletions
Show Stats Download Patch File Download Diff File

10
mediarepo-ui/src/api/api-types/files.ts
Unescape Escape View File

@ -17,16 +17,6 @@ export type TagQuery = {
tag: string, tag: string,
}; };
export type PropertyKeys =
"Status"
| "FileSize"
| "ImportedTime"
| "ChangedTime"
| "CreatedTime"
| "TagCount"
| "Cd"
| "Id";
export type PropertyQuery = PropertyQueryStatus export type PropertyQuery = PropertyQueryStatus
| PropertyQueryFileSize | PropertyQueryFileSize
| PropertyQueryImportedTime | PropertyQueryImportedTime

38
mediarepo-ui/src/app/components/shared/app-common/selectable/selectable.component.spec.ts
Unescape Escape View File

@ -1,25 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing'; import {ComponentFixture, TestBed} from "@angular/core/testing";
import { SelectableComponent } from './selectable.component'; import {SelectableComponent} from "./selectable.component";
describe('SelectableComponent', () => { describe("SelectableComponent", () => {
let component: SelectableComponent; let component: SelectableComponent;
let fixture: ComponentFixture<SelectableComponent>; let fixture: ComponentFixture<SelectableComponent>;
beforeEach(async () => { beforeEach(async () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
declarations: [ SelectableComponent ] declarations: [SelectableComponent]
}) })
.compileComponents(); .compileComponents();
}); });
beforeEach(() => { beforeEach(() => {
fixture = TestBed.createComponent(SelectableComponent); fixture = TestBed.createComponent(SelectableComponent);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
}); });
it('should create', () => { it("should create", () => {
expect(component).toBeTruthy(); expect(component).toBeTruthy();
}); });
}); });

38
mediarepo-ui/src/app/components/shared/input/filter-input/filter-input.component.spec.ts
Unescape Escape View File

@ -1,25 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing'; import {ComponentFixture, TestBed} from "@angular/core/testing";
import { FilterInputComponent } from './filter-input.component'; import {FilterInputComponent} from "./filter-input.component";
describe('FilterInputComponent', () => { describe("FilterInputComponent", () => {
let component: FilterInputComponent; let component: FilterInputComponent;
let fixture: ComponentFixture<FilterInputComponent>; let fixture: ComponentFixture<FilterInputComponent>;
beforeEach(async () => { beforeEach(async () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
declarations: [ FilterInputComponent ] declarations: [FilterInputComponent]
}) })
.compileComponents(); .compileComponents();
}); });
beforeEach(() => { beforeEach(() => {
fixture = TestBed.createComponent(FilterInputComponent); fixture = TestBed.createComponent(FilterInputComponent);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
}); });
it('should create', () => { it("should create", () => {
expect(component).toBeTruthy(); expect(component).toBeTruthy();
}); });
}); });

2
mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts
Unescape Escape View File

@ -54,11 +54,13 @@ export class FileSearchComponent implements AfterViewChecked, OnInit {
this.state.sortKeys.subscribe(s => this.sortExpression = s); this.state.sortKeys.subscribe(s => this.sortExpression = s);
this.applyStatusFromFilters(); this.applyStatusFromFilters();
await this.searchForFiles(); await this.searchForFiles();
this.needsScroll = true;
} }
public ngAfterViewChecked(): void { public ngAfterViewChecked(): void {
if (this.needsScroll) { if (this.needsScroll) {
this.inputList.nativeElement.scrollLeft = this.inputList.nativeElement.scrollWidth; this.inputList.nativeElement.scrollLeft = this.inputList.nativeElement.scrollWidth;
this.needsScroll = false;
} }
} }

38
mediarepo-ui/src/app/components/shared/sidebar/file-search/filter-dialog/filter-expression-list-item/filter-expression-list-item.component.spec.ts
Unescape Escape View File

@ -1,25 +1,25 @@
import { ComponentFixture, TestBed } from '@angular/core/testing'; import {ComponentFixture, TestBed} from "@angular/core/testing";
import { FilterExpressionListItemComponent } from './filter-expression-list-item.component'; import {FilterExpressionListItemComponent} from "./filter-expression-list-item.component";
describe('FilterExpressionListItemComponent', () => { describe("FilterExpressionListItemComponent", () => {
let component: FilterExpressionListItemComponent; let component: FilterExpressionListItemComponent;
let fixture: ComponentFixture<FilterExpressionListItemComponent>; let fixture: ComponentFixture<FilterExpressionListItemComponent>;
beforeEach(async () => { beforeEach(async () => {
await TestBed.configureTestingModule({ await TestBed.configureTestingModule({
declarations: [ FilterExpressionListItemComponent ] declarations: [FilterExpressionListItemComponent]
}) })
.compileComponents(); .compileComponents();
}); });
beforeEach(() => { beforeEach(() => {
fixture = TestBed.createComponent(FilterExpressionListItemComponent); fixture = TestBed.createComponent(FilterExpressionListItemComponent);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
}); });
it('should create', () => { it("should create", () => {
expect(component).toBeTruthy(); expect(component).toBeTruthy();
}); });
}); });

4
mediarepo-ui/src/app/components/shared/sidebar/sidebar.module.ts
Unescape Escape View File

@ -43,7 +43,9 @@ import {TagQueryItemComponent} from "./file-search/filter-expression-item/tag-qu
import { import {
PropertyQueryItemComponent PropertyQueryItemComponent
} from "./file-search/filter-expression-item/property-query-item/property-query-item.component"; } from "./file-search/filter-expression-item/property-query-item/property-query-item.component";
import { FilterExpressionListItemComponent } from './file-search/filter-dialog/filter-expression-list-item/filter-expression-list-item.component'; import {
FilterExpressionListItemComponent
} from "./file-search/filter-dialog/filter-expression-list-item/filter-expression-list-item.component";
@NgModule({ @NgModule({

105
mediarepo-ui/src/app/models/GenericFilter.ts
Unescape Escape View File

@ -1,105 +0,0 @@
import {TagQuery} from "./TagQuery";
import {createRustEnum} from "./rust-types";
import {FilterExpression} from "../../api/api-types/files";
export interface GenericFilter {
filter_type: "OrExpression" | "Query";
filter: TagQuery[] | TagQuery;
eq(value: any): boolean;
partiallyEq(value: any): boolean;
getDisplayName(): string;
clone(): GenericFilter;
queryList(): TagQuery[];
toBackendType(): FilterExpression;
}
export class OrFilterExpression implements GenericFilter {
public filter_type: "OrExpression" = "OrExpression";
public filter: TagQuery[] = [];
constructor(tags: TagQuery[]) {
this.filter = tags;
}
public eq(value: any): boolean {
return this == value;
}
public partiallyEq(value: any): boolean {
return this == value;
}
public getDisplayName(): string {
return this.filter.map(t => t.getNormalizedTag()).join(" OR ");
}
public clone(): OrFilterExpression {
let tags = this.filter.map(
(t: TagQuery) => new TagQuery(t.tag, t.negate));
return new OrFilterExpression(tags);
}
public queryList(): TagQuery[] {
return this.filter;
}
public removeQueryEntry(index: number) {
this.filter.splice(index, 1);
}
public removeDuplicates() {
const filters = this.filter.reverse();
let newEntries: TagQuery[] = [];
for (const entry of filters) {
if (newEntries.findIndex(f => f.tag === entry.tag) < 0) {
newEntries.push(entry);
}
}
this.filter = newEntries.reverse();
}
public toBackendType(): FilterExpression {
return createRustEnum(this.filter_type, createRustEnum("Tag", this.filter)) as unknown as FilterExpression;
}
}
export class SingleFilterExpression implements GenericFilter {
public filter_type: "Query" = "Query";
public filter: TagQuery;
constructor(tag: TagQuery) {
this.filter = tag;
}
public eq(value: any): boolean {
return (this.filter.tag === value?.name && this.filter.negate === value?.negate) || this.filter.getNormalizedTag() === value;
}
public partiallyEq(value: any): boolean {
return this.filter.tag === value || this.filter.tag === value?.name;
}
public getDisplayName(): string {
return this.filter.getNormalizedTag();
}
public clone(): GenericFilter {
return new SingleFilterExpression(
new TagQuery(this.filter.tag, this.filter.negate));
}
public queryList(): TagQuery[] {
return [this.filter];
}
public toBackendType(): FilterExpression {
return createRustEnum(this.filter_type, createRustEnum("Tag", this.filter)) as unknown as FilterExpression;
}
}
Write Preview
Loading…
Cancel
Save