Skip to content

Commit 356c39a

Browse files
committed
feat: implement filter icon
1 parent 41f4d94 commit 356c39a

File tree

15 files changed

+123
-29
lines changed

15 files changed

+123
-29
lines changed

apps/back-office/src/app/application/application.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
[title]="title"
1818
[navItems]="adminNavItems"
1919
[canUpdate]="application?.canUpdate!"
20+
class="overflow-hidden"
2021
></app-application-header>
2122
</ng-template>
2223
<!--Need the nav variable, don't remove let-nav, used in layout-->

apps/back-office/src/app/components/application-header/application-header.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="flex flex-row items-center justify-between gap-x-2">
2-
<div class="flex items-center gap-2">
2+
<div class="flex items-center gap-2 overflow-hidden">
33
<!-- Title -->
44
<h2 class="!m-0 truncate">
55
{{ title }}
@@ -13,6 +13,7 @@ <h2 class="!m-0 truncate">
1313
[uiMenuTriggerFor]="settingsMenu"
1414
[uiTooltip]="'common.settings' | translate"
1515
></ui-button>
16+
<shared-dashboard-filter-icon></shared-dashboard-filter-icon>
1617
</div>
1718
<div class="flex flex-row gap-2 items-center" *ngIf="canUpdate">
1819
<!-- Unlock application edition -->

apps/back-office/src/app/components/application-header/application-header.module.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@ import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { ApplicationHeaderComponent } from './application-header.component';
44
import { TranslateModule } from '@ngx-translate/core';
5-
import { IconModule, TooltipModule } from '@oort-front/ui';
5+
import {
6+
IconModule,
7+
TooltipModule,
8+
MenuModule,
9+
ButtonModule,
10+
} from '@oort-front/ui';
611
import { RouterModule } from '@angular/router';
7-
import { MenuModule, ButtonModule } from '@oort-front/ui';
12+
import { DashboardFilterIconComponent } from '@oort-front/shared';
813

914
/**
1015
* Application toolbar module.
@@ -19,6 +24,7 @@ import { MenuModule, ButtonModule } from '@oort-front/ui';
1924
RouterModule,
2025
ButtonModule,
2126
TooltipModule,
27+
DashboardFilterIconComponent,
2228
],
2329
exports: [ApplicationHeaderComponent],
2430
})

apps/front-office/src/app/application/application.component.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ <h2 class="!m-0 overflow-hidden text-ellipsis whitespace-nowrap">
3939
[uiMenuTriggerFor]="settingsMenu"
4040
[uiTooltip]="'common.settings' | translate"
4141
></ui-button>
42+
<shared-dashboard-filter-icon></shared-dashboard-filter-icon>
4243
</ng-template>
4344

4445
<!-- Admin pages -->

apps/front-office/src/app/application/application.module.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ import { NgModule } from '@angular/core';
22
import { CommonModule } from '@angular/common';
33
import { ApplicationComponent } from './application.component';
44
import { ApplicationRoutingModule } from './application-routing.module';
5-
import { LayoutModule, EmptyModule, NavbarModule } from '@oort-front/shared';
5+
import {
6+
LayoutModule,
7+
EmptyModule,
8+
NavbarModule,
9+
DashboardFilterIconComponent,
10+
} from '@oort-front/shared';
611
import { TranslateModule } from '@ngx-translate/core';
712
import {
813
ButtonModule,
@@ -30,6 +35,7 @@ import {
3035
ButtonModule,
3136
SpinnerModule,
3237
TooltipModule,
38+
DashboardFilterIconComponent,
3339
],
3440
})
3541
export class ApplicationModule {}

libs/shared/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ export * from './lib/components/content-choice/public-api';
8383
export * from './lib/components/workflow-stepper/public-api';
8484
export * from './lib/components/applications-summary/public-api';
8585
export * from './lib/components/dashboard-filter/public-api';
86+
export * from './lib/components/dashboard-filter-icon/public-api';
8687
export * from './lib/components/snackbar-spinner/public-api';
8788
export * from './lib/components/skeleton/skeleton-table/public-api';
8889
export * from './lib/components/mapping/public-api';
@@ -93,7 +94,6 @@ export * from './lib/components/utils/unsubscribe/public-api';
9394
export * from './lib/components/editable-text/public-api';
9495
export * from './lib/components/cron-expression-control/public-api';
9596
export * from './lib/components/applications-archive/public-api';
96-
export * from './lib/components/dashboard-filter/public-api';
9797
export * from './lib/components/editor-control/editor-control.component';
9898
export * from './lib/components/button-action/public-api';
9999
export * from './lib/components/custom-widget-style/custom-widget-style.component';

libs/shared/src/lib/components/applications-archive/applications-archive.component.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,10 @@ import { Component, Input, OnInit } from '@angular/core';
22
import { FormBuilder } from '@angular/forms';
33
import { TranslateService } from '@ngx-translate/core';
44
// eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
5-
import {
6-
ApplicationService,
7-
ConfirmService,
8-
UnsubscribeComponent,
9-
} from '@oort-front/shared';
105
import { distinctUntilChanged, takeUntil } from 'rxjs';
6+
import { ApplicationService } from '../../services/application/application.service';
7+
import { ConfirmService } from '../../services/confirm/confirm.service';
8+
import { UnsubscribeComponent } from '../utils/unsubscribe/unsubscribe.component';
119

1210
/**
1311
* Mocked Interface
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<kendo-badge-container>
2+
<ui-button
3+
[isIcon]="true"
4+
variant="light"
5+
icon="filter_alt"
6+
size="large"
7+
></ui-button>
8+
<kendo-badge
9+
shape="dot"
10+
themeColor="error"
11+
size="small"
12+
class="!-translate-x-1/4 !translate-y-full"
13+
*ngIf="active"
14+
></kendo-badge>
15+
</kendo-badge-container>

libs/shared/src/lib/components/dashboard-filter-icon/dashboard-filter-icon.component.scss

Whitespace-only changes.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import { ComponentFixture, TestBed } from '@angular/core/testing';
2+
3+
import { DashboardFilterIconComponent } from './dashboard-filter-icon.component';
4+
5+
describe('DashboardFilterIconComponent', () => {
6+
let component: DashboardFilterIconComponent;
7+
let fixture: ComponentFixture<DashboardFilterIconComponent>;
8+
9+
beforeEach(async () => {
10+
await TestBed.configureTestingModule({
11+
imports: [DashboardFilterIconComponent],
12+
}).compileComponents();
13+
14+
fixture = TestBed.createComponent(DashboardFilterIconComponent);
15+
component = fixture.componentInstance;
16+
fixture.detectChanges();
17+
});
18+
19+
it('should create', () => {
20+
expect(component).toBeTruthy();
21+
});
22+
});

0 commit comments

Comments
 (0)