Merge branch 'main' into release

telekom · Oct 9, 2023 · 1afe012 · 1afe012
2 parents 1f3a7f9 + 0ef89a0
commit 1afe012
Show file tree

Hide file tree

Showing 26 changed files with 211 additions and 45 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,62 @@
+name: release
+on:
+  push:
+    tags:
+      - "v*"
+  # workflow_dispatch: {}
+
+jobs:
+  release:
+    runs-on: ubuntu-20.04
+    # environment: RELEASE
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+
+      - name: Restore Lerna
+        id: yarn-cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            node_modules
+            */*/node_modules
+          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+
+      - name: Install project dependencies
+        if: steps.yarn-cache.outputs.cache-hit != 'true'
+        run: yarn
+
+      - name: Bootstrap
+        if: steps.yarn-cache.outputs.cache-hit != 'true'
+        run: |
+          yarn bootstrap
+
+      - name: Build Components
+        run: |
+          yarn workspace @telekom/scale-components build
+          yarn workspace @telekom/scale-components zip
+    
+      - name: Build React Proxy
+        run: |
+          yarn workspace @telekom/scale-components-react build
+          yarn workspace @telekom/scale-components-react zip
+  
+      - name: Get Package Version
+        id: package-version
+        uses: martinbeentjes/[email protected]
+        with:
+          path: packages/components
+
+      - name: Create GitHub Release
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "latest"
+          prerelease: false
+          title: ${{ steps.package-version.outputs.current-version }}
+          files: |
+            LICENSE
+            packages/components/telekom-scale-components-${{ steps.package-version.outputs.current-version }}.zip
+            packages/components-react/telekom-scale-components-react-${{ steps.package-version.outputs.current-version }}.zip
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.142](https://github.com/telekom/scale/compare/v3.0.0-beta.141...v3.0.0-beta.142) (2023-10-09)
+
+
+### Bug Fixes
+
+* align counter and helper-text ([#2150](https://github.com/telekom/scale/issues/2150)) ([8e729ca](https://github.com/telekom/scale/commit/8e729ca1900d581ff115017dd4f5eaf374dc38d6))
+* prevent sorting when resizing column ([#2149](https://github.com/telekom/scale/issues/2149)) ([e78af7c](https://github.com/telekom/scale/commit/e78af7c012ae910b6c421c760bf193ffdb1bf4e5))
+
+
+### Features
+
+* new gha workflow to create releases with bundled assets ([#2153](https://github.com/telekom/scale/issues/2153)) ([ca22494](https://github.com/telekom/scale/commit/ca2249487dd69741c4fff3877e4b00a4a7424ba1))
+
+
+
+
+
 # [3.0.0-beta.141](https://github.com/telekom/scale/compare/v3.0.0-beta.140...v3.0.0-beta.141) (2023-09-22)
 
 

diff --git a/lerna.json b/lerna.json
@@ -7,7 +7,7 @@
     "--pure-lockfile"
   ],
   "useWorkspaces": true,
-  "version": "3.0.0-beta.141",
+  "version": "3.0.0-beta.142",
   "command": {
     "version": {
       "allowBranch": "main"

diff --git a/packages/components-angular/CHANGELOG.md b/packages/components-angular/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.142](https://github.com/telekom/scale/compare/v3.0.0-beta.141...v3.0.0-beta.142) (2023-10-09)
+
+**Note:** Version bump only for package @telekom/scale-components-angular
+
+
+
+
+
 # [3.0.0-beta.141](https://github.com/telekom/scale/compare/v3.0.0-beta.140...v3.0.0-beta.141) (2023-09-22)
 
 **Note:** Version bump only for package @telekom/scale-components-angular

diff --git a/packages/components-angular/package.json b/packages/components-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@telekom/scale-components-angular",
-  "version": "3.0.0-beta.141",
+  "version": "3.0.0-beta.142",
   "description": "Angular specific wrapper for @telekom/scale-components",
   "license": "MPL-2.0",
   "homepage": "https://github.com/telekom/scale",

diff --git a/packages/components-react/CHANGELOG.md b/packages/components-react/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.142](https://github.com/telekom/scale/compare/v3.0.0-beta.141...v3.0.0-beta.142) (2023-10-09)
+
+
+### Features
+
+* new gha workflow to create releases with bundled assets ([#2153](https://github.com/telekom/scale/issues/2153)) ([ca22494](https://github.com/telekom/scale/commit/ca2249487dd69741c4fff3877e4b00a4a7424ba1))
+
+
+
+
+
 # [3.0.0-beta.141](https://github.com/telekom/scale/compare/v3.0.0-beta.140...v3.0.0-beta.141) (2023-09-22)
 
 **Note:** Version bump only for package @telekom/scale-components-react

diff --git a/packages/components-react/package.json b/packages/components-react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@telekom/scale-components-react",
   "sideEffects": false,
-  "version": "3.0.0-beta.141",
+  "version": "3.0.0-beta.142",
   "description": "React proxy for @telekom/scale-components",
   "license": "MPL-2.0",
   "homepage": "https://github.com/telekom/scale",
@@ -14,6 +14,7 @@
   },
   "scripts": {
     "build": "yarn clean && yarn rollup",
+    "zip": "zip -vr telekom-scale-components-react-$npm_package_version.zip dist/ -x '*.DS_Store'",
     "clean": "rimraf dist",
     "format": "prettier --write \"package.json\"",
     "rollup": "rollup -c"

diff --git a/packages/components-vue/CHANGELOG.md b/packages/components-vue/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.142](https://github.com/telekom/scale/compare/v3.0.0-beta.141...v3.0.0-beta.142) (2023-10-09)
+
+**Note:** Version bump only for package @telekom/scale-components-vue
+
+
+
+
+
 # [3.0.0-beta.141](https://github.com/telekom/scale/compare/v3.0.0-beta.140...v3.0.0-beta.141) (2023-09-22)
 
 **Note:** Version bump only for package @telekom/scale-components-vue

diff --git a/packages/components-vue/package.json b/packages/components-vue/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@telekom/scale-components-vue",
   "sideEffects": false,
-  "version": "3.0.0-beta.141",
+  "version": "3.0.0-beta.142",
   "description": "Vue specific wrapper for @telekom/scale-components",
   "license": "MPL-2.0",
   "homepage": "https://github.com/telekom/scale",

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.142](https://github.com/telekom/scale/compare/v3.0.0-beta.141...v3.0.0-beta.142) (2023-10-09)
+
+
+### Bug Fixes
+
+* align counter and helper-text ([#2150](https://github.com/telekom/scale/issues/2150)) ([8e729ca](https://github.com/telekom/scale/commit/8e729ca1900d581ff115017dd4f5eaf374dc38d6))
+* prevent sorting when resizing column ([#2149](https://github.com/telekom/scale/issues/2149)) ([e78af7c](https://github.com/telekom/scale/commit/e78af7c012ae910b6c421c760bf193ffdb1bf4e5))
+
+
+### Features
+
+* new gha workflow to create releases with bundled assets ([#2153](https://github.com/telekom/scale/issues/2153)) ([ca22494](https://github.com/telekom/scale/commit/ca2249487dd69741c4fff3877e4b00a4a7424ba1))
+
+
+
+
+
 # [3.0.0-beta.141](https://github.com/telekom/scale/compare/v3.0.0-beta.140...v3.0.0-beta.141) (2023-09-22)
 
 

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@telekom/scale-components",
-  "version": "3.0.0-beta.141",
+  "version": "3.0.0-beta.142",
   "description": "Scale is the digital design system for Telekom products and experiences.",
   "homepage": "https://github.com/telekom/scale",
   "repository": {
@@ -27,6 +27,7 @@
     "build:whitelabel": "WHITELABEL=1 stencil build --docs-readme",
     "build:watch": "stencil build --watch --serve --config stencil-dev.config.ts",
     "build:staging": "stencil build --config stencil-staging.config.ts",
+    "zip": "zip -vr telekom-scale-components-$npm_package_version.zip dist/ -x '*.DS_Store' 'dist/collection/**'",
     "start": "stencil build --dev --watch --serve --config stencil-dev.config.ts",
     "dev": "yarn start",
     "test": "stencil test --max-workers=2",
@@ -72,7 +73,7 @@
     "@floating-ui/dom": "^0.5.4",
     "@stencil/core": "^2.17.0",
     "@telekom/design-tokens": "1.0.0-beta.8",
-    "@telekom/scale-design-tokens": "^3.0.0-beta.141",
+    "@telekom/scale-design-tokens": "^3.0.0-beta.142",
     "classnames": "^2.2.6",
     "stencil-inline-svg": "^1.0.1"
   }

diff --git a/packages/components/src/components/data-grid/data-grid.tsx b/packages/components/src/components/data-grid/data-grid.tsx
@@ -107,6 +107,8 @@ export class DataGrid {
   @Prop() styles: any;
   /** (optional) Set to false to hide table, used for nested tables to re-render upon toggle */
   @Prop() visible?: boolean = true;
+  /** (optional) Title for sortable columns */
+  @Prop() sortableColumnTitle?: string = 'Activate to sort column';
   /**
    * (optional) set localization for sort, toggle and select/deselect table
    * Default is English.
@@ -1008,7 +1010,7 @@ export class DataGrid {
               }
               return (
                 <th
-                  title="Activate to sort column"
+                  title={sortable ? this.sortableColumnTitle : undefined}
                   {...props}
                   {...(sortable
                     ? {
@@ -1021,12 +1023,15 @@ export class DataGrid {
                             );
                           }
                         },
-                        onClick: () => {
-                          this.toggleTableSorting(
-                            sortDirection,
-                            columnIndex,
-                            type
-                          );
+                        onClick: (e) => {
+                          const clickedElement = e.target as HTMLElement;
+                          if (!clickedElement.matches('.thead__divider')) {
+                            this.toggleTableSorting(
+                              sortDirection,
+                              columnIndex,
+                              type
+                            );
+                          }
                         },
                         tabindex: 0,
                         class: `${props.class} thead-sortable`,

diff --git a/packages/components/src/components/data-grid/readme.md b/packages/components/src/components/data-grid/readme.md
@@ -5,25 +5,26 @@
 
 ## Properties
 
-| Property         | Attribute         | Description                                                                                  | Type                                                  | Default     |
-| ---------------- | ----------------- | -------------------------------------------------------------------------------------------- | ----------------------------------------------------- | ----------- |
-| `fields`         | `fields`          | Input fields config array                                                                    | `any`                                                 | `undefined` |
-| `freezeHeader`   | `freeze-header`   | (optional) Freeze header row from scrolling                                                  | `boolean`                                             | `false`     |
-| `heading`        | `heading`         | (optional) Heading string                                                                    | `string`                                              | `''`        |
-| `height`         | `height`          | (optional) Set static table height, by default will auto-resize                              | `string`                                              | `undefined` |
-| `hideBorder`     | `hide-border`     | (optional) Set to true to remove border                                                      | `boolean`                                             | `false`     |
-| `hideHeader`     | `hide-header`     | (optional) Set to true to hide header row                                                    | `boolean`                                             | `false`     |
-| `hideInfo`       | `hide-info`       | (optional) Set to true to remove info footer block including pagination and selection status | `boolean`                                             | `false`     |
-| `hideMenu`       | `hide-menu`       | (optional) Set to true to hide settings menu                                                 | `boolean`                                             | `false`     |
-| `localization`   | --                | (optional) set localization for sort, toggle and select/deselect table Default is English.   | `{ sortBy: string; toggle: string; select: string; }` | `undefined` |
-| `numbered`       | `numbered`        | (optional) Set to true to add numbers column                                                 | `boolean`                                             | `false`     |
-| `pageSize`       | `page-size`       | (optional) Set number of rows to display per pagination page                                 | `number`                                              | `Infinity`  |
-| `rows`           | `rows`            | Input data array                                                                             | `any`                                                 | `undefined` |
-| `selectable`     | `selectable`      | (optional) Set to true to add selection column                                               | `boolean`                                             | `false`     |
-| `selection`      | --                | Read-only selection array - populated with raw data from selected rows                       | `string[]`                                            | `[]`        |
-| `shadeAlternate` | `shade-alternate` | (optional) Shade every second row darker                                                     | `boolean`                                             | `true`      |
-| `styles`         | `styles`          | (optional) Injected css styles                                                               | `any`                                                 | `undefined` |
-| `visible`        | `visible`         | (optional) Set to false to hide table, used for nested tables to re-render upon toggle       | `boolean`                                             | `true`      |
+| Property              | Attribute               | Description                                                                                  | Type                                                  | Default                     |
+| --------------------- | ----------------------- | -------------------------------------------------------------------------------------------- | ----------------------------------------------------- | --------------------------- |
+| `fields`              | `fields`                | Input fields config array                                                                    | `any`                                                 | `undefined`                 |
+| `freezeHeader`        | `freeze-header`         | (optional) Freeze header row from scrolling                                                  | `boolean`                                             | `false`                     |
+| `heading`             | `heading`               | (optional) Heading string                                                                    | `string`                                              | `''`                        |
+| `height`              | `height`                | (optional) Set static table height, by default will auto-resize                              | `string`                                              | `undefined`                 |
+| `hideBorder`          | `hide-border`           | (optional) Set to true to remove border                                                      | `boolean`                                             | `false`                     |
+| `hideHeader`          | `hide-header`           | (optional) Set to true to hide header row                                                    | `boolean`                                             | `false`                     |
+| `hideInfo`            | `hide-info`             | (optional) Set to true to remove info footer block including pagination and selection status | `boolean`                                             | `false`                     |
+| `hideMenu`            | `hide-menu`             | (optional) Set to true to hide settings menu                                                 | `boolean`                                             | `false`                     |
+| `localization`        | --                      | (optional) set localization for sort, toggle and select/deselect table Default is English.   | `{ sortBy: string; toggle: string; select: string; }` | `undefined`                 |
+| `numbered`            | `numbered`              | (optional) Set to true to add numbers column                                                 | `boolean`                                             | `false`                     |
+| `pageSize`            | `page-size`             | (optional) Set number of rows to display per pagination page                                 | `number`                                              | `Infinity`                  |
+| `rows`                | `rows`                  | Input data array                                                                             | `any`                                                 | `undefined`                 |
+| `selectable`          | `selectable`            | (optional) Set to true to add selection column                                               | `boolean`                                             | `false`                     |
+| `selection`           | --                      | Read-only selection array - populated with raw data from selected rows                       | `string[]`                                            | `[]`                        |
+| `shadeAlternate`      | `shade-alternate`       | (optional) Shade every second row darker                                                     | `boolean`                                             | `true`                      |
+| `sortableColumnTitle` | `sortable-column-title` | (optional) Title for sortable columns                                                        | `string`                                              | `'Activate to sort column'` |
+| `styles`              | `styles`                | (optional) Injected css styles                                                               | `any`                                                 | `undefined`                 |
+| `visible`             | `visible`               | (optional) Set to false to hide table, used for nested tables to re-render upon toggle       | `boolean`                                             | `true`                      |
 
 
 ## Events

diff --git a/packages/components/src/components/helper-text/helper-text.css b/packages/components/src/components/helper-text/helper-text.css
@@ -28,7 +28,7 @@
 
 scale-icon-alert-information,
 scale-icon-alert-error,
-scale-icon-alert-success {
+scale-icon-action-success {
   display: flex;
   justify-content: center;
   align-items: center;

diff --git a/packages/components/src/components/text-field/text-field.tsx b/packages/components/src/components/text-field/text-field.tsx
@@ -286,6 +286,13 @@ export class TextField {
               aria-live="polite"
               aria-relevant="additions removals"
             >
+              {this.helperText && (
+                <scale-helper-text
+                  id={helperTextId}
+                  helperText={this.helperText}
+                  variant={this.invalid ? 'danger' : this.variant}
+                ></scale-helper-text>
+              )}
               {this.counter && (
                 <div class="text-field__counter">
                   {!!this.value ? String(this.value).length : 0} /{' '}
@@ -294,13 +301,6 @@ export class TextField {
               )}
             </div>
           )}
-          {this.helperText && (
-            <scale-helper-text
-              id={helperTextId}
-              helperText={this.helperText}
-              variant={this.invalid ? 'danger' : this.variant}
-            ></scale-helper-text>
-          )}
         </div>
       </Host>
     );

diff --git a/packages/design-tokens/CHANGELOG.md b/packages/design-tokens/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.142](https://github.com/telekom/scale/compare/v3.0.0-beta.141...v3.0.0-beta.142) (2023-10-09)
+
+**Note:** Version bump only for package @telekom/scale-design-tokens
+
+
+
+
+
 # [3.0.0-beta.141](https://github.com/telekom/scale/compare/v3.0.0-beta.140...v3.0.0-beta.141) (2023-09-22)
 
 **Note:** Version bump only for package @telekom/scale-design-tokens