add-2024 #5

Merged
ff00ff merged 3 commits from add-2024 into main 2024-12-09 22:52:06 -05:00
12 changed files with 67 additions and 30 deletions
Showing only changes of commit 5f2e41acbc - Show all commits

View File

@@ -0,0 +1 @@
<p>filter-config works!</p>

View File

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

View File

@@ -0,0 +1,13 @@
import { Component, inject } from '@angular/core';
import { QueryService } from '../../services/query.service';
@Component({
selector: 'fbi-filter-config',
standalone: true,
imports: [],
templateUrl: './filter-config.component.html',
styleUrl: './filter-config.component.scss',
})
export class FilterConfigComponent {
private queryService = inject(QueryService);
}

View File

@@ -6,6 +6,5 @@
></fbi-tree> ></fbi-tree>
<fbi-window #filter [config]="windowConfig" <fbi-window #filter [config]="windowConfig"
>content content content content content content content content content ><fbi-filter-config></fbi-filter-config
content content content content content content content content content ></fbi-window>
</fbi-window>

View File

@@ -1,18 +1,19 @@
import { Component, ViewChild } from '@angular/core'; import { Component, ViewChild } from '@angular/core';
import { TreeComponent } from '../tree/tree.component'; import { faAdd, faFilter } from '@fortawesome/free-solid-svg-icons';
import { combineLatest } from 'rxjs';
import { Action } from '../../models/action';
import { Query } from '../../models/query';
import { TreeNode } from '../../models/tree-node'; import { TreeNode } from '../../models/tree-node';
import { MetaService } from '../../services/meta.service'; import { MetaService } from '../../services/meta.service';
import { Action } from '../../models/action';
import { faAdd, faFilter } from '@fortawesome/free-solid-svg-icons';
import { QueryService } from '../../services/query.service'; import { QueryService } from '../../services/query.service';
import { combineLatest } from 'rxjs'; import { FilterConfigComponent } from '../filter-config/filter-config.component';
import { Query } from '../../models/query'; import { TreeComponent } from '../tree/tree.component';
import { WindowComponent } from '../window/window.component'; import { WindowComponent } from '../window/window.component';
@Component({ @Component({
selector: 'fbi-metadata', selector: 'fbi-metadata',
standalone: true, standalone: true,
imports: [TreeComponent, WindowComponent], imports: [FilterConfigComponent, TreeComponent, WindowComponent],
templateUrl: './metadata.component.html', templateUrl: './metadata.component.html',
styleUrl: './metadata.component.scss', styleUrl: './metadata.component.scss',
}) })

View File

@@ -1,9 +1,4 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { TreeComponent } from '../tree/tree.component';
import { TreeNode } from '../../models/tree-node';
import { QueryService } from '../../services/query.service';
import { Query } from '../../models/query';
import { Action } from '../../models/action';
import { import {
faArrowDown, faArrowDown,
faArrowUp, faArrowUp,
@@ -13,9 +8,14 @@ import {
faSortDesc, faSortDesc,
faSortDown, faSortDown,
} from '@fortawesome/free-solid-svg-icons'; } from '@fortawesome/free-solid-svg-icons';
import { ExecuteService } from '../../services/execute.service';
import { Header } from '../../models/header';
import { SORT } from '../../enums/sort'; import { SORT } from '../../enums/sort';
import { Action } from '../../models/action';
import { Header } from '../../models/header';
import { Query } from '../../models/query';
import { TreeNode } from '../../models/tree-node';
import { ExecuteService } from '../../services/execute.service';
import { QueryService } from '../../services/query.service';
import { TreeComponent } from '../tree/tree.component';
@Component({ @Component({
selector: 'fbi-query', selector: 'fbi-query',

View File

@@ -1,13 +1,13 @@
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { TreeComponent } from '../tree/tree.component';
import { QueryService } from '../../services/query.service';
import { Query } from '../../models/query';
import { ExecuteService } from '../../services/execute.service';
import { TableComponent } from '../table/table.component';
import { Result } from '../../models/result';
import { Header } from '../../models/header'; import { Header } from '../../models/header';
import { Page } from '../../models/page'; import { Page } from '../../models/page';
import { Query } from '../../models/query';
import { Result } from '../../models/result';
import { ExecuteService } from '../../services/execute.service';
import { QueryService } from '../../services/query.service';
import { TableComponent } from '../table/table.component';
import { TreeComponent } from '../tree/tree.component';
@Component({ @Component({
selector: 'fbi-result', selector: 'fbi-result',

View File

@@ -1,9 +1,9 @@
import { Component, Input, OnInit, inject } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { Component, Input, OnInit, inject } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { KeyValue } from '../../models/key-value'; import { KeyValue } from '../../models/key-value';
import { FilterService } from '../../services/filters.service'; import { FilterService } from '../../services/filters.service';
import { FormsModule } from '@angular/forms';
@Component({ @Component({
selector: 'fbi-select', selector: 'fbi-select',

View File

@@ -7,16 +7,16 @@ import {
Output, Output,
SimpleChanges, SimpleChanges,
} from '@angular/core'; } from '@angular/core';
import { Header } from '../../models/header'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { import {
faSort, faSort,
faSortDown, faSortDown,
faSortUp, faSortUp,
} from '@fortawesome/free-solid-svg-icons'; } from '@fortawesome/free-solid-svg-icons';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { SORT } from '../../enums/sort'; import { SORT } from '../../enums/sort';
import { Result } from '../../models/result'; import { Header } from '../../models/header';
import { Page } from '../../models/page'; import { Page } from '../../models/page';
import { Result } from '../../models/result';
@Component({ @Component({
selector: 'fbi-table', selector: 'fbi-table',

View File

@@ -1,9 +1,9 @@
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { TreeNode } from '../../models/tree-node'; import { Component, EventEmitter, Input, Output } from '@angular/core';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { faCaretDown, faCaretRight } from '@fortawesome/free-solid-svg-icons'; import { faCaretDown, faCaretRight } from '@fortawesome/free-solid-svg-icons';
import { Action } from '../../models/action'; import { Action } from '../../models/action';
import { TreeNode } from '../../models/tree-node';
@Component({ @Component({
selector: 'fbi-tree', selector: 'fbi-tree',

View File

@@ -1,3 +1,4 @@
import { CommonModule, DOCUMENT } from '@angular/common';
import { import {
Component, Component,
EventEmitter, EventEmitter,
@@ -6,7 +7,6 @@ import {
Input, Input,
Output, Output,
} from '@angular/core'; } from '@angular/core';
import { CommonModule, DOCUMENT } from '@angular/common';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { faRectangleXmark } from '@fortawesome/free-regular-svg-icons'; import { faRectangleXmark } from '@fortawesome/free-regular-svg-icons';
import { WindowConfig } from './window-config'; import { WindowConfig } from './window-config';