Skip to content

Commit 9bddd98

Browse files
Merge branch 'main' into confirm-test-harness
2 parents dd5a4d2 + 8f1b8f5 commit 9bddd98

File tree

150 files changed

+2441
-1541
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+2441
-1541
lines changed

.github/workflows/e2e-cleanup.yml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Nightly cleanup to remove old PRs from skyux-pr-preview. Runs at 3:00 AM UTC.
2+
3+
name: E2E Cleanup
4+
5+
on:
6+
schedule:
7+
- cron: '0 3 * * *'
8+
9+
jobs:
10+
cleanup:
11+
name: Cleanup
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout blackbaud/skyux-pr-preview
15+
uses: actions/checkout@v3
16+
with:
17+
repository: blackbaud/skyux-pr-preview
18+
ref: 'main'
19+
fetch-depth: 1
20+
token: ${{secrets.GH_PERSONAL_ACCESS_TOKEN}}
21+
- name: Delete old PR previews
22+
run: |
23+
# List open PR numbers and save to a temporary file.
24+
gh pr list -R blackbaud/skyux -s open --json number --jq '.[] | .number' > ${{ runner.temp }}/open-prs.txt
25+
26+
# List the checkout files, filter to just number directories, filter out open PRs.
27+
ls | grep -E '^[0-9]+$' | grep -v -f ${{ runner.temp }}/open-prs.txt > ${{ runner.temp }}/delete-prs.txt
28+
29+
# Delete the directories.
30+
for pr in $(cat ${{ runner.temp }}/delete-prs.txt)
31+
do
32+
if [[ -d $pr ]]
33+
then
34+
echo "Deleting $pr"
35+
git rm -qrf $pr
36+
fi
37+
done
38+
39+
# If there are any changes, configure the user, commit the deletions, and push to skyux-pr-preview repo.
40+
if [[ -n "$(git status --porcelain)" ]]
41+
then
42+
git config user.name 'Blackbaud Sky Build User'
43+
git config user.email 'sky-build-user@blackbaud.com'
44+
git commit -m "Delete old PR previews $(date +'%Y-%m-%d')"
45+
git push
46+
fi
47+
env:
48+
GITHUB_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}

.github/workflows/release-please.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ jobs:
1111
- uses: google-github-actions/release-please-action@v3
1212
id: release
1313
with:
14+
changelog-types: '[{"type":"feat","section":"Features","hidden":false},{"type":"fix","section":"Bug Fixes","hidden":false},{"type":"deprecation","section":"Deprecations","hidden":false}]'
1415
release-type: 'node'
1516
default-branch: '${{ github.ref_name }}'
1617
package-name: 'skyux'

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,18 @@
11
# Changelog
22

3+
## [6.19.0](https://github.com/blackbaud/skyux/compare/6.18.0...6.19.0) (2022-09-14)
4+
5+
6+
### Features
7+
8+
* **components/indicators:** add key info component harness ([#498](https://github.com/blackbaud/skyux/issues/498)) ([4ba11a0](https://github.com/blackbaud/skyux/commit/4ba11a050ad09e762f718cc613ffb55bfdb686ff))
9+
* **components/indicators:** update alert test harness with accessibility functions ([#500](https://github.com/blackbaud/skyux/issues/500)) ([ee7c8bf](https://github.com/blackbaud/skyux/commit/ee7c8bf424b3542674cfbeb2a145a4e88bd86cba))
10+
11+
12+
### Deprecations
13+
14+
* **components/modals:** deprecate confirm autofocus ([#507](https://github.com/blackbaud/skyux/issues/507)) ([67a0fa9](https://github.com/blackbaud/skyux/commit/67a0fa92f6a185e2976fd63330fc0694510c0964))
15+
316
## [6.18.0](https://github.com/blackbaud/skyux/compare/6.17.1...6.18.0) (2022-09-08)
417

518

apps/ag-grid-storybook-e2e/src/integration/ag-grid-stories.component.spec.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ describe(`ag-grid-storybook`, () => {
1818
.should('exist')
1919
.should('be.visible')
2020
.screenshot(
21-
`aggridstoriescomponent-aggridstories--ag-grid-stories-${theme}`
21+
`aggridstoriescomponent-aggridstories--ag-grid-stories-${theme}`,
22+
{
23+
clip: { x: 0, y: 0, width: 1300, height: 600 },
24+
}
2225
)
2326
.percySnapshot(
2427
`aggridstoriescomponent-aggridstories--ag-grid-stories-${theme}`,
@@ -27,8 +30,8 @@ describe(`ag-grid-storybook`, () => {
2730
scope: '#root',
2831
percyCSS: `
2932
/* Avoid "virtual rows" in the screenshot. */
30-
:root {
31-
--viewport-height: 600px;
33+
#root {
34+
height: 600px;
3235
}
3336
`,
3437
}

apps/ag-grid-storybook-e2e/src/integration/data-manager.component.spec.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ describe(`ag-grid-storybook data manager`, () => {
2525
.should('exist')
2626
.should('be.visible')
2727
.screenshot(
28-
`datamanagercomponent-datamanager--data-manager-${domLayout}-${theme}`
28+
`datamanagercomponent-datamanager--data-manager-${domLayout}-${theme}`,
29+
{
30+
clip: { x: 0, y: 0, width: 1300, height: 600 },
31+
}
2932
)
3033
.percySnapshot(
3134
`datamanagercomponent-datamanager--data-manager-${domLayout}-${theme}`,
@@ -34,8 +37,8 @@ describe(`ag-grid-storybook data manager`, () => {
3437
scope: '#root',
3538
percyCSS: `
3639
/* Avoid "virtual rows" in the screenshot. */
37-
:root {
38-
--viewport-height: 600px;
40+
#root {
41+
height: 600px;
3942
}
4043
`,
4144
}

apps/ag-grid-storybook/src/app/ag-grid/ag-grid-stories.component.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import {
88
import { SkyAgGridService, SkyCellType } from '@skyux/ag-grid';
99

1010
import { GridOptions } from 'ag-grid-community';
11-
import { BehaviorSubject } from 'rxjs';
11+
import { BehaviorSubject, timer } from 'rxjs';
12+
import { first } from 'rxjs/operators';
1213

1314
import { columnDefinitions, data } from '../shared/baseball-players-data';
1415

@@ -67,7 +68,10 @@ export class AgGridStoriesComponent implements OnInit {
6768
},
6869
domLayout: this.domLayout,
6970
onGridReady: () => {
70-
this.ready.next(true);
71+
// Delay to allow the grid to render before capturing the screenshot.
72+
timer(800)
73+
.pipe(first())
74+
.subscribe(() => this.ready.next(true));
7175
},
7276
},
7377
});

apps/ag-grid-storybook/src/app/data-manager/data-manager.component.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import {
1414
} from '@skyux/data-manager';
1515

1616
import { GridOptions } from 'ag-grid-community';
17-
import { BehaviorSubject } from 'rxjs';
17+
import { BehaviorSubject, timer } from 'rxjs';
18+
import { first } from 'rxjs/operators';
1819

1920
import { columnDefinitions, data } from '../shared/baseball-players-data';
2021

@@ -152,7 +153,10 @@ export class DataManagerComponent implements OnInit {
152153
},
153154
domLayout: this.domLayout,
154155
onGridReady: () => {
155-
this.ready.next(true);
156+
// Delay to allow the grid to render before capturing the screenshot.
157+
timer(800)
158+
.pipe(first())
159+
.subscribe(() => this.ready.next(true));
156160
},
157161
},
158162
});

apps/code-examples/src/app/app-routing.module.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,13 @@ const routes: Routes = [
115115
(m) => m.DataManagerFeatureModule
116116
),
117117
},
118+
{
119+
path: 'text-editor',
120+
loadChildren: () =>
121+
import('./features/text-editor.module').then(
122+
(m) => m.TextEditorFeatureModule
123+
),
124+
},
118125
];
119126

120127
@NgModule({

apps/code-examples/src/app/app.component.html

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,22 @@
321321
</li>
322322
</ul>
323323
</li>
324+
325+
<li>
326+
Text Editor
327+
<ul>
328+
<li>
329+
<a routerLink="text-editor/rich-text-display">Rich text display</a>
330+
</li>
331+
<li><a routerLink="text-editor/text-editor">Text Editor</a></li>
332+
<li>
333+
<a routerLink="text-editor/text-editor-inline-help"
334+
>Text Editor with inline help</a
335+
>
336+
</li>
337+
</ul>
338+
</li>
339+
324340
<li>
325341
Tiles
326342
<ul>

apps/code-examples/src/app/code-examples/forms/checkbox/basic/checkbox-demo.component.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@ import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
88
export class CheckboxDemoComponent implements OnInit {
99
public myForm: FormGroup;
1010

11-
constructor(private formBuilder: FormBuilder) {}
11+
#formBuilder: FormBuilder;
12+
13+
constructor(formBuilder: FormBuilder) {
14+
this.#formBuilder = formBuilder;
15+
}
1216

1317
public ngOnInit(): void {
14-
this.myForm = this.formBuilder.group({
18+
this.myForm = this.#formBuilder.group({
1519
email: new FormControl(false),
1620
phone: new FormControl(false),
1721
text: new FormControl(false),

0 commit comments

Comments
 (0)