diff --git a/.github/workflows/cherry-pick.yml b/.github/workflows/cherry-pick.yml
index 2536924c63..38e24ab350 100644
--- a/.github/workflows/cherry-pick.yml
+++ b/.github/workflows/cherry-pick.yml
@@ -4,7 +4,7 @@ on:
types:
- closed
branches:
- - 7.x.x
+ - 11.x.x
env:
TARGET_BRANCH: main
@@ -38,6 +38,7 @@ jobs:
run: npm ci
- name: Cherry pick
+ id: cherry-pick
run: |
# Set the git user to the author of the merge commit.
git config user.name "$(git log -1 --pretty=format:'%an' ${{ github.event.pull_request.merge_commit_sha }})"
@@ -73,7 +74,7 @@ jobs:
exit 0
fi
- echo "COMMIT_MESSAGE='$(git log -1 --pretty=%s | sed -e "s/'/\\\\'/g")'" >> $GITHUB_ENV
+ echo "commit_message=$(git log -1 --pretty=%s)" >> $GITHUB_OUTPUT
env:
GH_TOKEN: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
@@ -83,6 +84,7 @@ jobs:
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
script: |
const pr = context.payload.pull_request;
+ const title = ${{ toJson(steps.cherry-pick.outputs.commit_message) }};
let body = `:cherries: Cherry picked from #${pr.number} [${pr.title}](${pr.html_url})`
const prAzureBoardLink = pr.body?.match(/(?<=\[)AB#\d+(?=])/g);
if (prAzureBoardLink) {
@@ -93,7 +95,7 @@ jobs:
repo: context.repo.repo,
head: process.env.CHERRY_PICK_BRANCH,
base: process.env.TARGET_BRANCH,
- title: process.env.COMMIT_MESSAGE,
+ title,
body
}).then(result => {
console.log(`Created PR #${result.data.number}: ${result.data.html_url}`);
diff --git a/apps/code-examples/src/app/app.module.ts b/apps/code-examples/src/app/app.module.ts
index fbe667021c..627db59ca6 100644
--- a/apps/code-examples/src/app/app.module.ts
+++ b/apps/code-examples/src/app/app.module.ts
@@ -1,10 +1,12 @@
import { NgModule } from '@angular/core';
import { BrowserModule } from '@angular/platform-browser';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { SkyHelpService } from '@skyux/core';
import { SkyThemeService } from '@skyux/theme';
import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component';
+import { CodeExamplesHelpService } from './shared/help-service/help-service';
import { SkyThemeSelectorComponent } from './shared/theme-selector/theme-selector.component';
@NgModule({
@@ -15,7 +17,10 @@ import { SkyThemeSelectorComponent } from './shared/theme-selector/theme-selecto
BrowserModule,
SkyThemeSelectorComponent,
],
- providers: [SkyThemeService],
+ providers: [
+ SkyThemeService,
+ { provide: SkyHelpService, useClass: CodeExamplesHelpService },
+ ],
bootstrap: [AppComponent],
})
export class AppModule {}
diff --git a/apps/code-examples/src/app/shared/help-service/help-service.ts b/apps/code-examples/src/app/shared/help-service/help-service.ts
new file mode 100644
index 0000000000..f6a44cec37
--- /dev/null
+++ b/apps/code-examples/src/app/shared/help-service/help-service.ts
@@ -0,0 +1,25 @@
+import { Injectable } from '@angular/core';
+import {
+ SkyHelpOpenArgs,
+ SkyHelpService,
+ SkyHelpUpdateArgs,
+} from '@skyux/core';
+
+@Injectable()
+export class CodeExamplesHelpService extends SkyHelpService {
+ public override openHelp(args?: SkyHelpOpenArgs): void {
+ if (args) {
+ console.log('help key: ' + args.helpKey);
+ }
+ }
+
+ public override updateHelp(args: SkyHelpUpdateArgs): void {
+ if ('helpKey' in args) {
+ console.log('help key update: ' + args.helpKey);
+ }
+
+ if ('pageDefaultHelpKey' in args) {
+ console.log('page default help key update: ' + args.pageDefaultHelpKey);
+ }
+ }
+}
diff --git a/apps/e2e/layout-storybook/src/app/toolbar/toolbar.component.html b/apps/e2e/layout-storybook/src/app/toolbar/toolbar.component.html
index bc43490623..c74a181314 100644
--- a/apps/e2e/layout-storybook/src/app/toolbar/toolbar.component.html
+++ b/apps/e2e/layout-storybook/src/app/toolbar/toolbar.component.html
@@ -14,15 +14,6 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+