-
Notifications
You must be signed in to change notification settings - Fork 4
[NAE-1703] Dashboard #120
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
[NAE-1703] Dashboard #120
Changes from all commits
Commits
Show all changes
56 commits
Select commit
Hold shift + click to select a range
7af984b
[NAE-1704] Dashboard data field component
minop eceb7ec
[NAE-1704] Dashboard data field component
minop d1a6063
[NAE-1704] Dashboard data field component
minop 10f6b1e
[NAE-1704] Dashboard data field component
minop ec2d72c
[NAE-1704] Dashboard data field component
minop 828c472
[NAE-1704] Dashboard data field component
minop c8d09f8
[NAE-1704] Dashboard data field component
minop 30256c2
[NAE-1704] Dashboard data field component
minop 2aaed33
[NAE-1704] Dashboard data field component
minop 6da15d3
[NAE-1704] Dashboard data field component
minop f94ef37
[NAE-1704] Dashboard data field component
minop 3c0821d
[NAE-1704] Dashboard data field component
minop e137a86
[NAE-1704] Dashboard data field component
minop 370aafb
[NAE-1704] Dashboard data field component
minop c95484d
[NAE-1704] Dashboard data field component
minop 03981f3
[NAE-1704] Dashboard data field component
minop c2a187a
[NAE-1704] Dashboard data field component
mazarijuraj 8b860bd
[NAE-1704] Dashboard data field component
minop dfd8d5f
Merge remote-tracking branch 'origin/NAE-1704' into NAE-1704
minop 2e2496b
[NAE-1711] Dashboard tile content component
minop 8b07963
[NAE-1711] Dashboard tile content component
minop 5d9741b
[NAE-1704] Dashboard data field component
mazarijuraj 84bd5f5
Merge branch 'NAE-1704' into NAE-1711
mazarijuraj 462caef
[NAE-1711] Dashboard tile content component
mazarijuraj ee1457e
[NAE-1711] Dashboard tile content component
mazarijuraj 960c639
[NAE-1711] Dashboard tile content component
mazarijuraj f42a15e
[NAE-1711] Dashboard tile content component
0f051d7
[NAE-1711] Dashboard tile content component
71ce1f5
[NAE-1711] Dashboard tile content component
mazarijuraj 5cdb90f
[NAE-1711] Dashboard tile content component
9fe045a
[NAE-1711] Dashboard tile content component
71f54cf
[NAE-1711] Dashboard tile content component
ca93334
[NAE-1711] Dashboard tile content component
14b1d61
Merge remote-tracking branch 'origin/release/6.3.0' into NAE-1711
Kovy95 d07ce75
[NAE-1703] Dashboard
Kovy95 b7037af
[NAE-1703] Dashboard
45e49f6
Merge remote-tracking branch 'origin/NAE-1711' into NAE-1711
5337c46
[NAE-1703] Dashboard
517f509
[NAE-1703] Dashboard
0698718
Merge remote-tracking branch 'origin/release/6.3.0' into NAE-1711
machacjozef 998c14f
[NAE-1711] Dashboard
renczesstefan 854d004
Release 6.3.0-beta.1
machacjozef 268ca70
Release 6.3.0-beta.1
machacjozef d956e29
Release 6.3.0-beta.1
machacjozef af8867b
[NAE-1711] Dashboard
renczesstefan c119a96
[NAE-1711] Dashboard
renczesstefan e3e2b10
Merge remote-tracking branch 'origin/release/6.3.0' into NAE-1711
machacjozef 8f2aeeb
Merge remote-tracking branch 'origin/release/6.3.0' into NAE-1711
machacjozef 5c186c3
[NAE-1711] Dashboard
renczesstefan e2692bd
Merge remote-tracking branch 'origin/release/6.3.0' into NAE-1711
machacjozef 16b659c
Merge remote-tracking branch 'origin/release/6.3.0' into NAE-1711
machacjozef 32c6984
Release 6.3.0-beta.4
machacjozef c85578a
Merge branch 'release/6.3.0' into NAE-1711
renczesstefan 0ee1cfc
[NAE-1703] Dashboard
renczesstefan c9ad4bd
[NAE-1871] Fields change its position in task
renczesstefan 34fc5eb
Merge branch 'release/6.3.0' into NAE-1711
renczesnetgrif File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
.../nae-example-app/src/app/doc/dashboard-case-example/dashboard-case-example.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<div fxLayout="column" fxLayoutAlign="start stretch" class="full-height"> | ||
<nc-tab-view #tabView [initialTabs]="tabs" stretch="true" class="full-height" fxFlex="100"></nc-tab-view> | ||
</div> |
4 changes: 4 additions & 0 deletions
4
.../nae-example-app/src/app/doc/dashboard-case-example/dashboard-case-example.component.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
.full-height { | ||
height: 100%; | ||
min-height: 100%; | ||
} |
25 changes: 25 additions & 0 deletions
25
...e-example-app/src/app/doc/dashboard-case-example/dashboard-case-example.component.spec.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
import {ComponentFixture, TestBed} from '@angular/core/testing'; | ||
|
||
import {DashboardCaseExampleComponent} from './dashboard-case-example.component'; | ||
|
||
describe('DashboardCaseExampleComponent', () => { | ||
let component: DashboardCaseExampleComponent; | ||
let fixture: ComponentFixture<DashboardCaseExampleComponent>; | ||
|
||
beforeEach(async () => { | ||
await TestBed.configureTestingModule({ | ||
declarations: [DashboardCaseExampleComponent] | ||
}) | ||
.compileComponents(); | ||
}); | ||
|
||
beforeEach(() => { | ||
fixture = TestBed.createComponent(DashboardCaseExampleComponent); | ||
component = fixture.componentInstance; | ||
fixture.detectChanges(); | ||
}); | ||
|
||
it('should create', () => { | ||
expect(component).toBeTruthy(); | ||
}); | ||
}); |
109 changes: 109 additions & 0 deletions
109
...ts/nae-example-app/src/app/doc/dashboard-case-example/dashboard-case-example.component.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
import {Component, OnInit} from '@angular/core'; | ||
import { | ||
AllowedNetsService, | ||
AllowedNetsServiceFactory, | ||
CaseViewService, | ||
CategoryFactory, | ||
defaultCaseSearchCategoriesFactory, | ||
FilterRepository, | ||
MergeOperator, | ||
NAE_BASE_FILTER, | ||
NAE_NEW_CASE_COMPONENT, | ||
NAE_NEW_CASE_CONFIGURATION, | ||
NAE_SEARCH_CATEGORIES, | ||
NAE_VIEW_ID_SEGMENT, | ||
SearchService, | ||
SimpleFilter, | ||
UserService, | ||
ViewIdService | ||
} from '@netgrif/components-core'; | ||
import {NewCaseComponent} from '@netgrif/components'; | ||
import { | ||
SingleTabbedCaseViewComponent | ||
} from '../single-tabbed-view/single-tabbed-case-view/single-tabbed-case-view.component'; | ||
import { | ||
SingleTabbedTaskViewComponent | ||
} from '../single-tabbed-view/single-tabbed-task-view/single-tabbed-task-view.component'; | ||
|
||
export const newCaseConfigFactory = () => { | ||
return {useCachedProcesses: false}; | ||
}; | ||
|
||
export const dashboardAllowedNetsFactory = (factory: AllowedNetsServiceFactory) => { | ||
return factory.createFromArray(['dashboard']); | ||
}; | ||
|
||
const baseFilterFactory = (filterRepository: FilterRepository, userService: UserService) => { | ||
const filter = SimpleFilter.fromCaseQuery({process: {identifier: 'dashboard'}}) | ||
.merge(SimpleFilter.fromCaseQuery({author: {email: userService.user.email}}), MergeOperator.AND); | ||
return {filter}; | ||
}; | ||
|
||
@Component({ | ||
selector: 'nae-app-dashboard-case-example', | ||
templateUrl: './dashboard-case-example.component.html', | ||
styleUrls: ['./dashboard-case-example.component.scss'], | ||
providers: [ | ||
{ | ||
provide: NAE_NEW_CASE_CONFIGURATION, | ||
useFactory: newCaseConfigFactory, | ||
deps: [] | ||
}, | ||
CategoryFactory, | ||
CaseViewService, | ||
SearchService, | ||
ViewIdService, | ||
{ | ||
provide: NAE_VIEW_ID_SEGMENT, | ||
useValue: 'my-dashboards' | ||
}, | ||
{ | ||
provide: NAE_SEARCH_CATEGORIES, | ||
useFactory: defaultCaseSearchCategoriesFactory, | ||
deps: [CategoryFactory] | ||
}, | ||
{ | ||
provide: NAE_BASE_FILTER, | ||
useFactory: baseFilterFactory, | ||
deps: [FilterRepository, UserService] | ||
}, | ||
{ | ||
provide: AllowedNetsService, | ||
useFactory: dashboardAllowedNetsFactory, | ||
deps: [AllowedNetsServiceFactory] | ||
}, | ||
{ | ||
provide: NAE_NEW_CASE_COMPONENT, | ||
useValue: NewCaseComponent | ||
} | ||
] | ||
}) | ||
export class DashboardCaseExampleComponent implements OnInit { | ||
|
||
public tabs = []; | ||
|
||
constructor(public userService: UserService) { | ||
const filter = SimpleFilter.fromCaseQuery({process: {identifier: 'dashboard'}}).merge( | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why are you using |
||
SimpleFilter.fromCaseQuery({author: {email: userService.user.email}}), MergeOperator.AND | ||
); | ||
this.tabs = [ | ||
{ | ||
label: { | ||
text: 'My dashboards', | ||
}, | ||
canBeClosed: false, | ||
tabContentComponent: SingleTabbedCaseViewComponent, | ||
injectedObject: { | ||
tabViewComponent: SingleTabbedTaskViewComponent, | ||
loadFilter: filter, | ||
tabViewOrder: 0, | ||
shouldUseCache: false | ||
} | ||
}, | ||
] | ||
} | ||
|
||
ngOnInit(): void { | ||
} | ||
|
||
} |
25 changes: 25 additions & 0 deletions
25
...app/doc/single-tabbed-view/single-tabbed-case-view/single-tabbed-case-view.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
<div class="case-view-container" fxLayout="column" fxLayoutAlign="start stretch"> | ||
|
||
<mat-card class="case-view-search-container"> | ||
<div fxLayout="row" fxLayoutAlign="space-between"> | ||
<div fxLayoutAlign="start center" fxFlex> | ||
<nc-search class="search-width" (filterLoaded)="loadFilter($event)" | ||
(filterSaved)="saveFilter($event)"></nc-search> | ||
</div> | ||
<nc-create-case-button [newCaseCreationConfig]="newCaseCreationConfig" | ||
(caseCreatedEvent)="handleCaseClick($event)"></nc-create-case-button> | ||
</div> | ||
</mat-card> | ||
|
||
<div class="full-height transform-div custom-scrollbar" [ngClass]="{'overflow-div': getOverflowStatus()}" | ||
fxLayout="column" fxLayoutAlign="start stretch"> | ||
<div class="full-height transform-div max-width-fix" fxLayout="column" fxLayoutAlign="start stretch"> | ||
<nc-header #header [type]="headerType" [maxHeaderColumns]="7" [responsiveHeaders]="true" | ||
class="case-header-padding" [ngStyle]="{'width': getWidth()}"></nc-header> | ||
|
||
<nc-case-list [selectedHeaders$]="selectedHeaders$" [showDeleteMenu]="true" [width]="getWidth()" | ||
(caseClick)="handleCaseClick($event)" [responsiveBody]="true" fxFlex [textEllipsis]="true" | ||
[redirectEnabled]="true"></nc-case-list> | ||
</div> | ||
</div> | ||
</div> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it would be better to replace these string literals with constants.