Merge remote-tracking branch 'origin/11.x.x' into action-hub-harness

* origin/11.x.x: ci: update `@skyux/dev-infra-private` to `10.0.0-alpha.20` (#2982) build: apply `@skyux/dev-infra-private@10.0.0-alpha.19` (#2978) feat(components/layout): remove extra space from view actions (#2974) fix: update `@skyux/dev-infra-private` to `10.0.0-alpha.18` to address issues with documentation generation (#2971) ci: update cherry pick to 11 (#2966) docs: mock `SkyHelpService` in code-examples spa (#2960)
blackbaud · Jan 7, 2025 · 728ed12 · 728ed12
2 parents b03c189 + 7f5d404
commit 728ed12
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 26 deletions.
diff --git 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
@@ -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
@@ -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
@@ -14,15 +14,6 @@
   <sky-toolbar-item>
     <button type="button" class="sky-btn sky-btn-default">Button 1</button>
   </sky-toolbar-item>
-  <sky-toolbar-item>
-    <button type="button" class="sky-btn sky-btn-default">Button 2</button>
-  </sky-toolbar-item>
-  <sky-toolbar-item>
-    <button type="button" class="sky-btn sky-btn-default">Button 3</button>
-  </sky-toolbar-item>
-  <sky-toolbar-item>
-    <button type="button" class="sky-btn sky-btn-default">Button 4</button>
-  </sky-toolbar-item>
   <sky-toolbar-item>
     <button type="button" class="sky-btn sky-btn-primary" disabled>
       Disabled (primary)
@@ -33,7 +24,16 @@
       Disabled (default)
     </button>
   </sky-toolbar-item>
+  <sky-toolbar-item>
+    <sky-search [debounceTime]="250" />
+  </sky-toolbar-item>
   <sky-toolbar-view-actions>
+    <sky-radio-group class="sky-switch-icon-group" [(ngModel)]="activeViewId">
+      <sky-radio icon="table" label="Table" value="table" />
+      <sky-radio icon="list" label="List" value="list" />
+      <sky-radio icon="map-marker" label="Map" value="map" />
+    </sky-radio-group>
+
     <button
       class="sky-btn sky-btn-default sky-btn-icon"
       title="Sort descending"

diff --git a/apps/e2e/layout-storybook/src/app/toolbar/toolbar.component.ts b/apps/e2e/layout-storybook/src/app/toolbar/toolbar.component.ts
@@ -8,6 +8,7 @@ import { SkyThemeService } from '@skyux/theme';
 })
 export class ToolbarComponent {
   public theme = 'default';
+  public activeViewId = 'table';
 
   #themeSvc = inject(SkyThemeService);
 

diff --git a/apps/e2e/layout-storybook/src/app/toolbar/toolbar.module.ts b/apps/e2e/layout-storybook/src/app/toolbar/toolbar.module.ts
@@ -1,8 +1,11 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
 import { RouterModule, Routes } from '@angular/router';
+import { SkyRadioModule } from '@skyux/forms';
 import { SkyIconModule } from '@skyux/icon';
 import { SkyToolbarModule } from '@skyux/layout';
+import { SkySearchModule } from '@skyux/lookup';
 import { SkyThemeModule } from '@skyux/theme';
 
 import { ToolbarComponent } from './toolbar.component';
@@ -12,8 +15,11 @@ const routes: Routes = [{ path: '', component: ToolbarComponent }];
   declarations: [ToolbarComponent],
   imports: [
     CommonModule,
+    FormsModule,
     RouterModule.forChild(routes),
     SkyIconModule,
+    SkyRadioModule,
+    SkySearchModule,
     SkyThemeModule,
     SkyToolbarModule,
   ],

diff --git a/libs/components/layout/src/lib/modules/toolbar/toolbar-view-actions.component.scss b/libs/components/layout/src/lib/modules/toolbar/toolbar-view-actions.component.scss
@@ -21,8 +21,6 @@
     margin-bottom: 0;
 
     ::ng-deep > :not(:last-child) {
-      margin-top: $sky-theme-modern-margin-inline-xs;
-      margin-bottom: $sky-theme-modern-margin-inline-xs;
       margin-right: $sky-theme-modern-margin-inline-sm;
     }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -158,7 +158,7 @@
     "@ryansonshine/commitizen": "4.2.8",
     "@ryansonshine/cz-conventional-changelog": "3.3.4",
     "@schematics/angular": "18.2.12",
-    "@skyux/dev-infra-private": "github:blackbaud/skyux-dev-infra-private-builds#10.0.0-alpha.17",
+    "@skyux/dev-infra-private": "github:blackbaud/skyux-dev-infra-private-builds#10.0.0-alpha.20",
     "@storybook/addon-a11y": "8.4.7",
     "@storybook/addon-actions": "8.4.7",
     "@storybook/addon-controls": "8.4.7",