@operato/layout 10.29.25 → 10.29.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2,27 +2,46 @@ import { expect, fixture } from '@open-wc/testing'
2
2
  import { html, render } from 'lit'
3
3
  import { store, UPDATE_CONTEXT } from '@operato/shell'
4
4
  import '../src/index.js'
5
- import { entity360Link, openEntity360Kind, registerEntity360Kind, type OxEntity360Dock } from '../src/index.js'
5
+ import {
6
+ closeEntity360,
7
+ entity360Link,
8
+ onEntity360Change,
9
+ openEntity360Kind,
10
+ redrawEntity360,
11
+ registerEntity360Kind,
12
+ type Entity360Subject,
13
+ type OxEntity360Dock
14
+ } from '../src/index.js'
6
15
 
7
16
  /**
8
17
  * A 360 opened by kind and id, the dock's own back trail, and the assistant subject it stands in for.
9
18
  *
10
19
  * A screen often holds an identifier, not a typed value: a location inside a stock line, an order
11
20
  * inside a task's 360. It still opens the 360 of that kind, with the same link as entity360Name.
12
- * Following a relation inside the dock keeps the one shown, and back returns to it.
21
+ * Opening is a step in the address (f=kind:id), so back - the dock's or the browser's - returns to the one before.
13
22
  */
14
23
 
15
24
  const settle = () => new Promise(resolve => setTimeout(resolve, 50))
25
+ /** Go back and wait for the address to arrive - a late popstate would land in the next test. */
26
+ const back = (go: () => void = () => history.back()) =>
27
+ new Promise<void>(resolve => {
28
+ window.addEventListener('popstate', () => setTimeout(resolve, 0), { once: true })
29
+ go()
30
+ })
16
31
  let bar: HTMLElement
17
32
  const dock = () => bar.shadowRoot!.querySelector('ox-entity360-dock') as OxEntity360Dock
18
33
  const subject = () => (store.getState() as any).route?.context?.subject
34
+ const address = () => new URLSearchParams(location.search).get('f')
19
35
 
20
36
  registerEntity360Kind({ kind: 'kx-order', typenames: [], title: s => `order ${s.id}`, assistantSubject: true })
21
37
  registerEntity360Kind({ kind: 'kx-place', typenames: [], title: s => `place ${s.id}`, assistantSubject: true })
22
38
  registerEntity360Kind({ kind: 'kx-quiet', typenames: [], title: s => `quiet ${s.id}` })
39
+ let late = ''
40
+ registerEntity360Kind({ kind: 'kx-late', typenames: [], title: s => late || s.id })
23
41
 
24
42
  describe('entity 360 by kind', () => {
25
43
  beforeEach(async () => {
44
+ history.replaceState(null, '', location.pathname)
26
45
  bar = await fixture(html`<ox-aside-bar></ox-aside-bar>`)
27
46
  store.dispatch({ type: UPDATE_CONTEXT, context: { title: 'page', subject: { type: 'page', id: 'P' } } })
28
47
  })
@@ -46,30 +65,44 @@ describe('entity 360 by kind', () => {
46
65
  expect(dock().view!.title).to.equal('order SO-2')
47
66
  })
48
67
 
49
- it('★ following a relation inside the dock keeps the one shown; back returns to it', async () => {
68
+ it('★ opening is a step in the address; back returns to the 360 before', async () => {
50
69
  openEntity360Kind('kx-order', { id: 'SO-3' })
51
70
  await settle()
71
+ expect(address()).to.equal('kx-order:SO-3')
52
72
  expect(dock().view!.onBack).to.equal(undefined)
53
73
 
54
74
  openEntity360Kind('kx-place', { id: 'L-1' })
55
75
  await settle()
56
- expect(dock().view!.title).to.equal('place L-1')
76
+ expect(address()).to.equal('kx-place:L-1')
57
77
 
58
- dock().view!.onBack!()
59
- await settle()
78
+ await back(() => dock().view!.onBack!())
60
79
  expect(dock().view!.title).to.equal('order SO-3')
61
- expect(dock().view!.onBack).to.equal(undefined)
80
+ expect(address()).to.equal('kx-order:SO-3')
81
+ })
82
+
83
+ it('★ an id with colons (an EPC) survives the address', async () => {
84
+ openEntity360Kind('kx-order', { id: 'SO-6' })
85
+ await settle()
86
+ openEntity360Kind('kx-place', { id: 'urn:epc:id:sgln:0614141.00001.0' })
87
+ await settle()
88
+ openEntity360Kind('kx-order', { id: 'SO-7' })
89
+ await settle()
90
+ /* Back only from a step this test took - otherwise it would leave the test page. */
91
+ expect(address()).to.equal('kx-order:SO-7')
92
+ expect(dock().view!.onBack).to.be.a('function')
93
+
94
+ await back()
95
+ expect(dock().view!.title).to.equal('place urn:epc:id:sgln:0614141.00001.0')
62
96
  })
63
97
 
64
- it('a dock opened again after closing starts with no trail', async () => {
98
+ it('★ closing leaves the address without a 360', async () => {
65
99
  openEntity360Kind('kx-order', { id: 'SO-4' })
66
100
  await settle()
67
101
  dock().view!.onClose()
68
102
  await settle()
69
103
 
70
- openEntity360Kind('kx-place', { id: 'L-2' })
71
- await settle()
72
- expect(dock().view!.onBack).to.equal(undefined)
104
+ expect(address()).to.equal(null)
105
+ expect(dock()).to.equal(null)
73
106
  })
74
107
 
75
108
  it('★ while open, the 360 is the page subject; closing gives the page its own back', async () => {
@@ -91,4 +124,53 @@ describe('entity 360 by kind', () => {
91
124
  await settle()
92
125
  expect(subject()).to.deep.equal({ type: 'page', id: 'P' })
93
126
  })
127
+
128
+ it('★ an app hears what the dock shows - open, back, and close', async () => {
129
+ const heard: (Entity360Subject | undefined)[] = []
130
+ const stop = onEntity360Change(subject => heard.push(subject))
131
+
132
+ openEntity360Kind('kx-order', { id: 'SO-8' })
133
+ await settle()
134
+ openEntity360Kind('kx-place', { id: 'L-8' })
135
+ await settle()
136
+ await back(() => dock().view!.onBack!())
137
+ dock().view!.onClose()
138
+ await settle()
139
+ stop()
140
+
141
+ expect(heard.map(one => (one ? `${one.kind}:${one.id}` : 'closed'))).to.deep.equal(['kx-order:SO-8', 'kx-place:L-8', 'kx-order:SO-8', 'closed'])
142
+ })
143
+
144
+ it('an app that let go of its selection closes the 360 and its step', async () => {
145
+ openEntity360Kind('kx-order', { id: 'SO-9' })
146
+ await settle()
147
+ closeEntity360()
148
+ await settle()
149
+
150
+ expect(dock()).to.equal(null)
151
+ expect(address()).to.equal(null)
152
+ })
153
+
154
+ it('redraw reads the title again - for a title its section learns later', async () => {
155
+ late = ''
156
+ openEntity360Kind('kx-late', { id: 'X-9' })
157
+ await settle()
158
+ expect(dock().view!.title).to.equal('X-9')
159
+
160
+ late = 'named later'
161
+ redrawEntity360()
162
+ await settle()
163
+ expect(dock().view!.title).to.equal('named later')
164
+ })
165
+
166
+ it('a link carries more for the sections, beside the id', async () => {
167
+ const heard: (Entity360Subject | undefined)[] = []
168
+ const stop = onEntity360Change(subject => heard.push(subject))
169
+ const host = await fixture(html`<div>${entity360Link('kx-order', 'SO-10', undefined, { instanceId: 'twin-2' })}</div>`)
170
+ ;(host.querySelector('a') as HTMLElement).click()
171
+ await settle()
172
+ stop()
173
+
174
+ expect(heard[0]?.value).to.include({ id: 'SO-10', instanceId: 'twin-2' })
175
+ })
94
176
  })
@@ -1,224 +0,0 @@
1
- body, html {
2
- margin:0; padding: 0;
3
- height: 100%;
4
- }
5
- body {
6
- font-family: Helvetica Neue, Helvetica, Arial;
7
- font-size: 14px;
8
- color:#333;
9
- }
10
- .small { font-size: 12px; }
11
- *, *:after, *:before {
12
- -webkit-box-sizing:border-box;
13
- -moz-box-sizing:border-box;
14
- box-sizing:border-box;
15
- }
16
- h1 { font-size: 20px; margin: 0;}
17
- h2 { font-size: 14px; }
18
- pre {
19
- font: 12px/1.4 Consolas, "Liberation Mono", Menlo, Courier, monospace;
20
- margin: 0;
21
- padding: 0;
22
- -moz-tab-size: 2;
23
- -o-tab-size: 2;
24
- tab-size: 2;
25
- }
26
- a { color:#0074D9; text-decoration:none; }
27
- a:hover { text-decoration:underline; }
28
- .strong { font-weight: bold; }
29
- .space-top1 { padding: 10px 0 0 0; }
30
- .pad2y { padding: 20px 0; }
31
- .pad1y { padding: 10px 0; }
32
- .pad2x { padding: 0 20px; }
33
- .pad2 { padding: 20px; }
34
- .pad1 { padding: 10px; }
35
- .space-left2 { padding-left:55px; }
36
- .space-right2 { padding-right:20px; }
37
- .center { text-align:center; }
38
- .clearfix { display:block; }
39
- .clearfix:after {
40
- content:'';
41
- display:block;
42
- height:0;
43
- clear:both;
44
- visibility:hidden;
45
- }
46
- .fl { float: left; }
47
- @media only screen and (max-width:640px) {
48
- .col3 { width:100%; max-width:100%; }
49
- .hide-mobile { display:none!important; }
50
- }
51
-
52
- .quiet {
53
- color: #7f7f7f;
54
- color: rgba(0,0,0,0.5);
55
- }
56
- .quiet a { opacity: 0.7; }
57
-
58
- .fraction {
59
- font-family: Consolas, 'Liberation Mono', Menlo, Courier, monospace;
60
- font-size: 10px;
61
- color: #555;
62
- background: #E8E8E8;
63
- padding: 4px 5px;
64
- border-radius: 3px;
65
- vertical-align: middle;
66
- }
67
-
68
- div.path a:link, div.path a:visited { color: #333; }
69
- table.coverage {
70
- border-collapse: collapse;
71
- margin: 10px 0 0 0;
72
- padding: 0;
73
- }
74
-
75
- table.coverage td {
76
- margin: 0;
77
- padding: 0;
78
- vertical-align: top;
79
- }
80
- table.coverage td.line-count {
81
- text-align: right;
82
- padding: 0 5px 0 20px;
83
- }
84
- table.coverage td.line-coverage {
85
- text-align: right;
86
- padding-right: 10px;
87
- min-width:20px;
88
- }
89
-
90
- table.coverage td span.cline-any {
91
- display: inline-block;
92
- padding: 0 5px;
93
- width: 100%;
94
- }
95
- .missing-if-branch {
96
- display: inline-block;
97
- margin-right: 5px;
98
- border-radius: 3px;
99
- position: relative;
100
- padding: 0 4px;
101
- background: #333;
102
- color: yellow;
103
- }
104
-
105
- .skip-if-branch {
106
- display: none;
107
- margin-right: 10px;
108
- position: relative;
109
- padding: 0 4px;
110
- background: #ccc;
111
- color: white;
112
- }
113
- .missing-if-branch .typ, .skip-if-branch .typ {
114
- color: inherit !important;
115
- }
116
- .coverage-summary {
117
- border-collapse: collapse;
118
- width: 100%;
119
- }
120
- .coverage-summary tr { border-bottom: 1px solid #bbb; }
121
- .keyline-all { border: 1px solid #ddd; }
122
- .coverage-summary td, .coverage-summary th { padding: 10px; }
123
- .coverage-summary tbody { border: 1px solid #bbb; }
124
- .coverage-summary td { border-right: 1px solid #bbb; }
125
- .coverage-summary td:last-child { border-right: none; }
126
- .coverage-summary th {
127
- text-align: left;
128
- font-weight: normal;
129
- white-space: nowrap;
130
- }
131
- .coverage-summary th.file { border-right: none !important; }
132
- .coverage-summary th.pct { }
133
- .coverage-summary th.pic,
134
- .coverage-summary th.abs,
135
- .coverage-summary td.pct,
136
- .coverage-summary td.abs { text-align: right; }
137
- .coverage-summary td.file { white-space: nowrap; }
138
- .coverage-summary td.pic { min-width: 120px !important; }
139
- .coverage-summary tfoot td { }
140
-
141
- .coverage-summary .sorter {
142
- height: 10px;
143
- width: 7px;
144
- display: inline-block;
145
- margin-left: 0.5em;
146
- background: url(sort-arrow-sprite.png) no-repeat scroll 0 0 transparent;
147
- }
148
- .coverage-summary .sorted .sorter {
149
- background-position: 0 -20px;
150
- }
151
- .coverage-summary .sorted-desc .sorter {
152
- background-position: 0 -10px;
153
- }
154
- .status-line { height: 10px; }
155
- /* yellow */
156
- .cbranch-no { background: yellow !important; color: #111; }
157
- /* dark red */
158
- .red.solid, .status-line.low, .low .cover-fill { background:#C21F39 }
159
- .low .chart { border:1px solid #C21F39 }
160
- .highlighted,
161
- .highlighted .cstat-no, .highlighted .fstat-no, .highlighted .cbranch-no{
162
- background: #C21F39 !important;
163
- }
164
- /* medium red */
165
- .cstat-no, .fstat-no, .cbranch-no, .cbranch-no { background:#F6C6CE }
166
- /* light red */
167
- .low, .cline-no { background:#FCE1E5 }
168
- /* light green */
169
- .high, .cline-yes { background:rgb(230,245,208) }
170
- /* medium green */
171
- .cstat-yes { background:rgb(161,215,106) }
172
- /* dark green */
173
- .status-line.high, .high .cover-fill { background:rgb(77,146,33) }
174
- .high .chart { border:1px solid rgb(77,146,33) }
175
- /* dark yellow (gold) */
176
- .status-line.medium, .medium .cover-fill { background: #f9cd0b; }
177
- .medium .chart { border:1px solid #f9cd0b; }
178
- /* light yellow */
179
- .medium { background: #fff4c2; }
180
-
181
- .cstat-skip { background: #ddd; color: #111; }
182
- .fstat-skip { background: #ddd; color: #111 !important; }
183
- .cbranch-skip { background: #ddd !important; color: #111; }
184
-
185
- span.cline-neutral { background: #eaeaea; }
186
-
187
- .coverage-summary td.empty {
188
- opacity: .5;
189
- padding-top: 4px;
190
- padding-bottom: 4px;
191
- line-height: 1;
192
- color: #888;
193
- }
194
-
195
- .cover-fill, .cover-empty {
196
- display:inline-block;
197
- height: 12px;
198
- }
199
- .chart {
200
- line-height: 0;
201
- }
202
- .cover-empty {
203
- background: white;
204
- }
205
- .cover-full {
206
- border-right: none !important;
207
- }
208
- pre.prettyprint {
209
- border: none !important;
210
- padding: 0 !important;
211
- margin: 0 !important;
212
- }
213
- .com { color: #999 !important; }
214
- .ignore-none { color: #999; font-weight: normal; }
215
-
216
- .wrapper {
217
- min-height: 100%;
218
- height: auto !important;
219
- height: 100%;
220
- margin: 0 auto -48px;
221
- }
222
- .footer, .push {
223
- height: 48px;
224
- }
@@ -1,87 +0,0 @@
1
- /* eslint-disable */
2
- var jumpToCode = (function init() {
3
- // Classes of code we would like to highlight in the file view
4
- var missingCoverageClasses = ['.cbranch-no', '.cstat-no', '.fstat-no'];
5
-
6
- // Elements to highlight in the file listing view
7
- var fileListingElements = ['td.pct.low'];
8
-
9
- // We don't want to select elements that are direct descendants of another match
10
- var notSelector = ':not(' + missingCoverageClasses.join('):not(') + ') > '; // becomes `:not(a):not(b) > `
11
-
12
- // Selector that finds elements on the page to which we can jump
13
- var selector =
14
- fileListingElements.join(', ') +
15
- ', ' +
16
- notSelector +
17
- missingCoverageClasses.join(', ' + notSelector); // becomes `:not(a):not(b) > a, :not(a):not(b) > b`
18
-
19
- // The NodeList of matching elements
20
- var missingCoverageElements = document.querySelectorAll(selector);
21
-
22
- var currentIndex;
23
-
24
- function toggleClass(index) {
25
- missingCoverageElements
26
- .item(currentIndex)
27
- .classList.remove('highlighted');
28
- missingCoverageElements.item(index).classList.add('highlighted');
29
- }
30
-
31
- function makeCurrent(index) {
32
- toggleClass(index);
33
- currentIndex = index;
34
- missingCoverageElements.item(index).scrollIntoView({
35
- behavior: 'smooth',
36
- block: 'center',
37
- inline: 'center'
38
- });
39
- }
40
-
41
- function goToPrevious() {
42
- var nextIndex = 0;
43
- if (typeof currentIndex !== 'number' || currentIndex === 0) {
44
- nextIndex = missingCoverageElements.length - 1;
45
- } else if (missingCoverageElements.length > 1) {
46
- nextIndex = currentIndex - 1;
47
- }
48
-
49
- makeCurrent(nextIndex);
50
- }
51
-
52
- function goToNext() {
53
- var nextIndex = 0;
54
-
55
- if (
56
- typeof currentIndex === 'number' &&
57
- currentIndex < missingCoverageElements.length - 1
58
- ) {
59
- nextIndex = currentIndex + 1;
60
- }
61
-
62
- makeCurrent(nextIndex);
63
- }
64
-
65
- return function jump(event) {
66
- if (
67
- document.getElementById('fileSearch') === document.activeElement &&
68
- document.activeElement != null
69
- ) {
70
- // if we're currently focused on the search input, we don't want to navigate
71
- return;
72
- }
73
-
74
- switch (event.which) {
75
- case 78: // n
76
- case 74: // j
77
- goToNext();
78
- break;
79
- case 66: // b
80
- case 75: // k
81
- case 80: // p
82
- goToPrevious();
83
- break;
84
- }
85
- };
86
- })();
87
- window.addEventListener('keydown', jumpToCode);
Binary file