Updated unit tests
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
parent
035bdfb1ad
commit
7568a1c066
|
@ -1,4 +1,5 @@
|
||||||
import Component from '../../lib/component';
|
import Component from '../../lib/component';
|
||||||
|
import './style.scss';
|
||||||
|
|
||||||
export default class SearchPanel extends Component {
|
export default class SearchPanel extends Component {
|
||||||
set filter(value) {
|
set filter(value) {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
@import "variables";
|
@import "./variables";
|
||||||
|
|
||||||
vn-searchbar {
|
vn-searchbar {
|
||||||
display: block;
|
display: block;
|
||||||
|
@ -44,4 +44,27 @@ vn-searchbar {
|
||||||
& > form {
|
& > form {
|
||||||
padding: $spacing-lg;
|
padding: $spacing-lg;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
& > form#manifold-form {
|
||||||
|
padding: 0;
|
||||||
|
|
||||||
|
.manifold-panel {
|
||||||
|
border: $border-thin-light;
|
||||||
|
border-radius: 5px;
|
||||||
|
position: relative;
|
||||||
|
text-align: right;
|
||||||
|
|
||||||
|
.or {
|
||||||
|
font-weight: bold;
|
||||||
|
font-size: 26px;
|
||||||
|
color: $color-font-secondary
|
||||||
|
}
|
||||||
|
|
||||||
|
vn-icon[icon="info"] {
|
||||||
|
position: absolute;
|
||||||
|
top: 2px;
|
||||||
|
right: 2px
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -1,5 +1,5 @@
|
||||||
<div class="search-panel">
|
<div class="search-panel">
|
||||||
<form id="ticket-form" ng-submit="$ctrl.onSearch()">
|
<form id="manifold-form" ng-submit="$ctrl.onSearch()">
|
||||||
<vn-horizontal class="vn-px-lg vn-pt-lg">
|
<vn-horizontal class="vn-px-lg vn-pt-lg">
|
||||||
<vn-textfield
|
<vn-textfield
|
||||||
vn-one
|
vn-one
|
||||||
|
@ -22,18 +22,18 @@
|
||||||
</vn-textfield>
|
</vn-textfield>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
<section class="vn-px-md">
|
<section class="vn-px-md">
|
||||||
<vn-horizontal class="scope-days vn-pa-md">
|
<vn-horizontal class="manifold-panel vn-pa-md">
|
||||||
<vn-date-picker
|
<vn-date-picker
|
||||||
vn-one
|
vn-one
|
||||||
label="From"
|
label="From"
|
||||||
ng-model="filter.from"
|
ng-model="filter.from"
|
||||||
on-change="filter.scopeDays = null">
|
on-change="$ctrl.from = value">
|
||||||
</vn-date-picker>
|
</vn-date-picker>
|
||||||
<vn-date-picker
|
<vn-date-picker
|
||||||
vn-one
|
vn-one
|
||||||
label="To"
|
label="To"
|
||||||
ng-model="filter.to"
|
ng-model="filter.to"
|
||||||
on-change="filter.scopeDays = null">
|
on-change="$ctrl.to = value">
|
||||||
</vn-date-picker>
|
</vn-date-picker>
|
||||||
<vn-none class="or vn-px-md">O</vn-none>
|
<vn-none class="or vn-px-md">O</vn-none>
|
||||||
<vn-input-number
|
<vn-input-number
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
import ngModule from '../module';
|
import ngModule from '../module';
|
||||||
import SearchPanel from 'core/components/searchbar/search-panel';
|
import SearchPanel from 'core/components/searchbar/search-panel';
|
||||||
import './style.scss';
|
|
||||||
|
|
||||||
class Controller extends SearchPanel {
|
class Controller extends SearchPanel {
|
||||||
constructor($, $element) {
|
constructor($, $element) {
|
||||||
|
@ -24,6 +23,24 @@ class Controller extends SearchPanel {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get from() {
|
||||||
|
return this._from;
|
||||||
|
}
|
||||||
|
|
||||||
|
set from(value) {
|
||||||
|
this._from = value;
|
||||||
|
this.filter.scopeDays = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
get to() {
|
||||||
|
return this._to;
|
||||||
|
}
|
||||||
|
|
||||||
|
set to(value) {
|
||||||
|
this._to = value;
|
||||||
|
this.filter.scopeDays = null;
|
||||||
|
}
|
||||||
|
|
||||||
get scopeDays() {
|
get scopeDays() {
|
||||||
return this._scopeDays;
|
return this._scopeDays;
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ describe('Ticket Component vnTicketSearchPanel', () => {
|
||||||
}));
|
}));
|
||||||
|
|
||||||
describe('getGroupedStates()', () => {
|
describe('getGroupedStates()', () => {
|
||||||
it('should set an array of groupedStates with the aditionof a name translation', () => {
|
it('should set an array of groupedStates with the adition of a name translation', () => {
|
||||||
jest.spyOn(controller, '$t').mockReturnValue('miCodigo');
|
jest.spyOn(controller, '$t').mockReturnValue('miCodigo');
|
||||||
const data = [
|
const data = [
|
||||||
{
|
{
|
||||||
|
@ -34,8 +34,30 @@ describe('Ticket Component vnTicketSearchPanel', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('from() setter', () => {
|
||||||
|
it('should clear the scope days when setting the from property', () => {
|
||||||
|
controller.filter.scopeDays = 1;
|
||||||
|
|
||||||
|
controller.from = new Date();
|
||||||
|
|
||||||
|
expect(controller.filter.scopeDays).toBeNull();
|
||||||
|
expect(controller.from).toBeDefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('to() setter', () => {
|
||||||
|
it('should clear the scope days when setting the to property', () => {
|
||||||
|
controller.filter.scopeDays = 1;
|
||||||
|
|
||||||
|
controller.to = new Date();
|
||||||
|
|
||||||
|
expect(controller.filter.scopeDays).toBeNull();
|
||||||
|
expect(controller.to).toBeDefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
describe('scopeDays() setter', () => {
|
describe('scopeDays() setter', () => {
|
||||||
it('should clear the date range', () => {
|
it('should clear the date range when setting the scopeDays property', () => {
|
||||||
controller.filter.from = new Date();
|
controller.filter.from = new Date();
|
||||||
controller.filter.to = new Date();
|
controller.filter.to = new Date();
|
||||||
|
|
||||||
|
@ -43,6 +65,7 @@ describe('Ticket Component vnTicketSearchPanel', () => {
|
||||||
|
|
||||||
expect(controller.filter.from).toBeNull();
|
expect(controller.filter.from).toBeNull();
|
||||||
expect(controller.filter.to).toBeNull();
|
expect(controller.filter.to).toBeNull();
|
||||||
|
expect(controller.scopeDays).toBeDefined();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
@import "./effects";
|
|
||||||
@import "./variables";
|
|
||||||
|
|
||||||
|
|
||||||
form#ticket-form {
|
|
||||||
padding: 0
|
|
||||||
}
|
|
||||||
|
|
||||||
.scope-days {
|
|
||||||
border: $border-thin-light;
|
|
||||||
border-radius: 5px;
|
|
||||||
position: relative;
|
|
||||||
text-align: right;
|
|
||||||
|
|
||||||
& > p {
|
|
||||||
font-size: 1.2rem;
|
|
||||||
margin: 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.or {
|
|
||||||
font-weight: bold;
|
|
||||||
font-size: 26px;
|
|
||||||
color: $color-font-secondary
|
|
||||||
}
|
|
||||||
|
|
||||||
vn-icon[icon="info"] {
|
|
||||||
position: absolute;
|
|
||||||
top: 2px;
|
|
||||||
right: 2px
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue