Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion web/src/app/header/header.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
<khi-title pageName="Main view">
<khi-main-menu></khi-main-menu>
</khi-title>
<khi-header-toolbar></khi-header-toolbar>
<khi-timeline-toolbar></khi-timeline-toolbar>
2 changes: 1 addition & 1 deletion web/src/app/header/header.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import { Component } from '@angular/core';
import { TitleBarComponent } from './titlebar.component';
import { MainMenuComponent } from './main-menu.component';
import { ToolbarComponent } from './toolbar.component';
import { ToolbarComponent } from '../timeline-toolbar/toolbar.component';

@Component({
selector: 'khi-header',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';

@Component({
selector: 'khi-header-regex-input',
selector: 'khi-timeline-regex-input',
templateUrl: './regex-input.component.html',
styleUrls: ['./regex-input.component.scss'],
imports: [MatFormFieldModule, MatInputModule, ReactiveFormsModule],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ describe('SetInputComponent', () => {

@Component({
template: `
<khi-header-set-input
<khi-timeline-set-input
label="test"
[selectedItems]="selected"
[choices]="choices"
(selectedItemsChange)="onUpdate($event)"
>
</khi-header-set-input>
</khi-timeline-set-input>
`,
imports: [SetInputComponent],
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import { MatTooltipModule } from '@angular/material/tooltip';
import { MatInputModule } from '@angular/material/input';
import { MatButtonModule } from '@angular/material/button';
@Component({
selector: 'khi-header-set-input',
selector: 'khi-timeline-set-input',
templateUrl: './set-input.component.html',
styleUrls: ['./set-input.component.scss'],
imports: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@
[cdkConnectedOverlayHasBackdrop]="true"
(backdropClick)="setPopupState('NONE_OPEN')"
>
<khi-header-set-input
<khi-timeline-set-input
label="Kinds"
[choices]="(kinds$ | async)!"
[selectedItems]="(includedKinds$ | async)!"
(selectedItemsChange)="onKindFilterCommit($event)"
(closeButtonClicked)="setPopupState('NONE_OPEN')"
>
</khi-header-set-input>
</khi-timeline-set-input>
</ng-template>
<!--Namespace filter-->
<button
Expand Down Expand Up @@ -82,13 +82,13 @@
[cdkConnectedOverlayHasBackdrop]="true"
(backdropClick)="setPopupState('NONE_OPEN')"
>
<khi-header-set-input
<khi-timeline-set-input
label="Namespaces"
[choices]="(namespaces$ | async)!"
[selectedItems]="(includedNamespaces$ | async)!"
(selectedItemsChange)="onNamespaceFilterCommit($event)"
(closeButtonClicked)="setPopupState('NONE_OPEN')"
></khi-header-set-input>
></khi-timeline-set-input>
</ng-template>
<!--Subresource relationship filter-->
<button
Expand Down Expand Up @@ -119,22 +119,22 @@
[cdkConnectedOverlayHasBackdrop]="true"
(backdropClick)="setPopupState('NONE_OPEN')"
>
<khi-header-set-input
<khi-timeline-set-input
label="Subresources"
[choices]="(subresourceRelationships | async)!"
[selectedItems]="(includedSubresourceRelationships | async)!"
(selectedItemsChange)="
onSubresourceRelationshipFilterCommit($event)
"
(closeButtonClicked)="setPopupState('NONE_OPEN')"
></khi-header-set-input>
></khi-timeline-set-input>
</ng-template>
<!--Regex resource name filter-->
<khi-header-regex-input
<khi-timeline-regex-input
class="resource-name-filter"
label="Resource name(regex)"
(regexFilterChange)="onNameFilterChange($event)"
></khi-header-regex-input>
></khi-timeline-regex-input>
</div>
</div>
<div class="center-control"></div>
Expand Down Expand Up @@ -163,12 +163,12 @@
<mat-icon color="primary">search_off</mat-icon>
</mat-button-toggle>
</mat-button-toggle-group>
<khi-header-regex-input
<khi-timeline-regex-input
#logFilterInput
class="log-filter"
label="Log body(regex)"
(regexFilterChange)="onLogFilterChange($event)"
></khi-header-regex-input>
></khi-timeline-regex-input>
<div class="timezone-control">
<p>UTC+</p>
<input
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ type ToolbarPopupStatus =
| 'SUBRESOURCE_FILTER_OPEN';

@Component({
selector: 'khi-header-toolbar',
selector: 'khi-timeline-toolbar',
templateUrl: './toolbar.component.html',
styleUrls: ['./toolbar.component.scss'],
imports: [
Expand Down
Loading