@@ -32,11 +32,12 @@ describe('dashboard', () => {
3232 setMaximumColumnWidth ( dashboard , columnWidth ) ;
3333 setGap ( dashboard , 0 ) ;
3434
35- dashboard . items = [ { id : 'Item 0' } , { id : 'Item 1' } ] ;
35+ dashboard . items = [ { id : '0' } , { id : '1' } ] ;
3636 dashboard . renderer = ( root , _ , model ) => {
3737 root . textContent = '' ;
3838 const widget = document . createElement ( 'vaadin-dashboard-widget' ) ;
39- widget . widgetTitle = `${ model . item . id } title` ;
39+ widget . widgetTitle = `Item ${ model . item . id } title` ;
40+ widget . id = model . item . id ;
4041 root . appendChild ( widget ) ;
4142 } ;
4243 await nextFrame ( ) ;
@@ -55,7 +56,7 @@ describe('dashboard', () => {
5556 } ) ;
5657
5758 it ( 'should render a new widget' , async ( ) => {
58- dashboard . items = [ ...dashboard . items , { id : 'Item 2' } ] ;
59+ dashboard . items = [ ...dashboard . items , { id : '2' } ] ;
5960 await nextFrame ( ) ;
6061
6162 const newWidget = getElementFromCell ( dashboard , 1 , 0 ) ;
@@ -68,7 +69,7 @@ describe('dashboard', () => {
6869 dashboard . renderer = ( root , _ , model ) => {
6970 root . textContent = '' ;
7071 const widget = document . createElement ( 'vaadin-dashboard-widget' ) ;
71- widget . widgetTitle = `${ model . item . id } new title` ;
72+ widget . widgetTitle = `Item ${ model . item . id } new title` ;
7273 root . appendChild ( widget ) ;
7374 } ;
7475 await nextFrame ( ) ;
@@ -98,7 +99,7 @@ describe('dashboard', () => {
9899 it ( 'should remove a widget' , ( ) => {
99100 const widget = getElementFromCell ( dashboard , 0 , 1 ) ;
100101 getRemoveButton ( widget as DashboardWidget ) . click ( ) ;
101- expect ( dashboard . items ) . to . eql ( [ { id : 'Item 0' } ] ) ;
102+ expect ( dashboard . items ) . to . eql ( [ { id : '0' } ] ) ;
102103 } ) ;
103104
104105 it ( 'should dispatch an dashboard-item-removed event' , ( ) => {
@@ -107,8 +108,8 @@ describe('dashboard', () => {
107108 const widget = getElementFromCell ( dashboard , 0 , 1 ) ;
108109 getRemoveButton ( widget as DashboardWidget ) . click ( ) ;
109110 expect ( spy ) . to . be . calledOnce ;
110- expect ( spy . firstCall . args [ 0 ] . detail . item ) . to . eql ( { id : 'Item 1' } ) ;
111- expect ( spy . firstCall . args [ 0 ] . detail . items ) . to . eql ( [ { id : 'Item 0' } ] ) ;
111+ expect ( spy . firstCall . args [ 0 ] . detail . item ) . to . eql ( { id : '1' } ) ;
112+ expect ( spy . firstCall . args [ 0 ] . detail . items ) . to . eql ( [ { id : '0' } ] ) ;
112113 } ) ;
113114
114115 it ( 'should not dispatch an item-remove event' , ( ) => {
@@ -143,7 +144,7 @@ describe('dashboard', () => {
143144 } ) ;
144145
145146 it ( 'should span multiple columns' , async ( ) => {
146- dashboard . items = [ { colspan : 2 , id : 'Item 0' } ] ;
147+ dashboard . items = [ { colspan : 2 , id : '0' } ] ;
147148 await nextFrame ( ) ;
148149
149150 const widget = getElementFromCell ( dashboard , 0 , 0 ) ;
@@ -162,7 +163,7 @@ describe('dashboard', () => {
162163
163164 it ( 'should span multiple rows' , async ( ) => {
164165 dashboard . style . width = `${ columnWidth } px` ;
165- dashboard . items = [ { rowspan : 2 , id : 'Item 0' } ] ;
166+ dashboard . items = [ { rowspan : 2 , id : '0' } ] ;
166167 await onceResized ( dashboard ) ;
167168
168169 const widget = getElementFromCell ( dashboard , 0 , 0 ) ;
@@ -254,11 +255,7 @@ describe('dashboard', () => {
254255
255256 describe ( 'section' , ( ) => {
256257 beforeEach ( async ( ) => {
257- dashboard . items = [
258- { id : 'Item 0' } ,
259- { id : 'Item 1' } ,
260- { title : 'Section' , items : [ { id : 'Item 2' } , { id : 'Item 3' } ] } ,
261- ] ;
258+ dashboard . items = [ { id : '0' } , { id : '1' } , { title : 'Section' , items : [ { id : '2' } , { id : '3' } ] } ] ;
262259 await nextFrame ( ) ;
263260 } ) ;
264261
@@ -290,7 +287,7 @@ describe('dashboard', () => {
290287 const widget = getElementFromCell ( dashboard , 1 , 0 ) ;
291288 const section = widget ?. closest ( 'vaadin-dashboard-section' ) ;
292289 getRemoveButton ( section ! ) . click ( ) ;
293- expect ( dashboard . items ) . to . eql ( [ { id : 'Item 0' } , { id : 'Item 1' } ] ) ;
290+ expect ( dashboard . items ) . to . eql ( [ { id : '0' } , { id : '1' } ] ) ;
294291 } ) ;
295292 } ) ;
296293
@@ -357,11 +354,7 @@ describe('dashboard', () => {
357354
358355 describe ( 'section' , ( ) => {
359356 beforeEach ( async ( ) => {
360- dashboard . items = [
361- { id : 'Item 0' } ,
362- { id : 'Item 1' } ,
363- { title : 'Section' , items : [ { id : 'Item 2' } , { id : 'Item 3' } ] } ,
364- ] ;
357+ dashboard . items = [ { id : '0' } , { id : '1' } , { title : 'Section' , items : [ { id : '2' } , { id : '3' } ] } ] ;
365358 await nextFrame ( ) ;
366359 } ) ;
367360
@@ -420,14 +413,14 @@ describe('dashboard', () => {
420413 describe ( 'item components' , ( ) => {
421414 it ( 'should use the item component as widget' , async ( ) => {
422415 const widget = fixtureSync ( '<vaadin-dashboard-widget widget-title="Component 0"></vaadin-dashboard-widget>' ) ;
423- dashboard . items = [ { id : 'Item 0' , component : widget } ] ;
416+ dashboard . items = [ { id : '0' , component : widget } ] ;
424417 await nextFrame ( ) ;
425418
426419 expect ( getElementFromCell ( dashboard , 0 , 0 ) ) . to . equal ( widget ) ;
427420 } ) ;
428421
429422 it ( 'should render default widgets if component is not an element' , async ( ) => {
430- dashboard . items = [ { id : 'Item 0' , component : 'not-an-element' } ] ;
423+ dashboard . items = [ { id : '0' , component : 'not-an-element' } ] ;
431424 await nextFrame ( ) ;
432425
433426 const widget = getElementFromCell ( dashboard , 0 , 0 ) ;
@@ -440,7 +433,7 @@ describe('dashboard', () => {
440433 const renderer = sinon . spy ( ) ;
441434 dashboard . renderer = renderer ;
442435 const widget = fixtureSync ( '<vaadin-dashboard-widget widget-title="Component 0"></vaadin-dashboard-widget>' ) ;
443- dashboard . items = [ { id : 'Item 0' , component : widget } ] ;
436+ dashboard . items = [ { id : '0' , component : widget } ] ;
444437 await nextFrame ( ) ;
445438
446439 expect ( renderer ) . to . not . be . called ;
@@ -452,7 +445,7 @@ describe('dashboard', () => {
452445 ( dashboard as any ) . items = [
453446 {
454447 component : section ,
455- items : [ { id : 'Item 0' , component : widget } ] ,
448+ items : [ { id : '0' , component : widget } ] ,
456449 } ,
457450 ] ;
458451 await nextFrame ( ) ;
@@ -462,7 +455,7 @@ describe('dashboard', () => {
462455 } ) ;
463456
464457 it ( 'should render default section if component is not an element' , async ( ) => {
465- ( dashboard as any ) . items = [ { component : 'not-an-element' , title : 'Section' , items : [ { id : 'Item 0' } ] } ] ;
458+ ( dashboard as any ) . items = [ { component : 'not-an-element' , title : 'Section' , items : [ { id : '0' } ] } ] ;
466459 await nextFrame ( ) ;
467460
468461 const widget = getElementFromCell ( dashboard , 0 , 0 ) ;
@@ -486,7 +479,7 @@ describe('dashboard', () => {
486479 ( dashboard as any ) . items = [
487480 {
488481 component : section ,
489- items : [ { id : 'Item 0' , component : widget } ] ,
482+ items : [ { id : '0' , component : widget } ] ,
490483 } ,
491484 ] ;
492485 await nextFrame ( ) ;
@@ -523,7 +516,7 @@ describe('dashboard', () => {
523516
524517 it ( 'should not lose focus when prepending items' , async ( ) => {
525518 getElementFromCell ( dashboard , 0 , 0 ) ! . focus ( ) ;
526- dashboard . items = [ { id : 'Item -1' } , ...dashboard . items ] ;
519+ dashboard . items = [ { id : '-1' } , ...dashboard . items ] ;
527520 await nextFrame ( ) ;
528521 expect ( document . activeElement ) . to . equal ( getElementFromCell ( dashboard , 0 , 1 ) ! ) ;
529522 } ) ;
@@ -536,7 +529,7 @@ describe('dashboard', () => {
536529 } ) ;
537530
538531 it ( 'should not lose focus when reassigning section items' , async ( ) => {
539- dashboard . items = [ { title : 'Section' , items : [ { id : 'Item 0' } ] } , { id : 'Item 1' } ] ;
532+ dashboard . items = [ { title : 'Section' , items : [ { id : '0' } ] } , { id : '1' } ] ;
540533 await nextFrame ( ) ;
541534 getElementFromCell ( dashboard , 0 , 0 ) ! . focus ( ) ;
542535 dashboard . items = [ ...dashboard . items ] ;
@@ -555,7 +548,7 @@ describe('dashboard', () => {
555548 } ) ;
556549
557550 it ( 'should unhide remove button of a section when editable' , async ( ) => {
558- dashboard . items = [ { title : 'Section' , items : [ { id : 'Item 0' } ] } , { id : 'Item 1' } ] ;
551+ dashboard . items = [ { title : 'Section' , items : [ { id : '0' } ] } , { id : '1' } ] ;
559552 await nextFrame ( ) ;
560553 getElementFromCell ( dashboard , 0 , 0 ) ! . focus ( ) ;
561554 await nextFrame ( ) ;
@@ -572,11 +565,7 @@ describe('dashboard', () => {
572565 dashboard . editable = true ;
573566 await nextFrame ( ) ;
574567
575- dashboard . items = [
576- { id : 'Item 0' } ,
577- { id : 'Item 1' } ,
578- { title : 'Section' , items : [ { id : 'Item 2' } , { id : 'Item 3' } ] } ,
579- ] ;
568+ dashboard . items = [ { id : '0' } , { id : '1' } , { title : 'Section' , items : [ { id : '2' } , { id : '3' } ] } ] ;
580569 await nextFrame ( ) ;
581570
582571 /* prettier-ignore */
@@ -650,7 +639,7 @@ describe('dashboard', () => {
650639 it ( 'should focus a new widget when items are replaced' , async ( ) => {
651640 getElementFromCell ( dashboard , 0 , 0 ) ! . focus ( ) ;
652641 await nextFrame ( ) ;
653- dashboard . items = [ { id : 'Item 100' } ] ;
642+ dashboard . items = [ { id : '100' } ] ;
654643 await renderAndFocusRestore ( ) ;
655644 expect ( document . activeElement ) . to . equal ( getElementFromCell ( dashboard , 0 , 0 ) ! ) ;
656645 } ) ;
0 commit comments