Skip to content

Commit

Permalink
Merge branch 'master' into jmfrancois/chore/storybook-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
Nigui committed Sep 7, 2023
2 parents 6074856 + f73fdbc commit ce331ee
Show file tree
Hide file tree
Showing 136 changed files with 9,254 additions and 6,243 deletions.
5 changes: 5 additions & 0 deletions .changeset/five-balloons-tell.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@talend/react-forms': patch
---

fix: pin react-ace
5 changes: 0 additions & 5 deletions .changeset/large-carpets-film.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/sweet-houses-enjoy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@talend/react-components': patch
---

fix: change drawer header color
4 changes: 2 additions & 2 deletions .github/workflows/changeset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
with:
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
fetch-depth: 0
persist-credentials: false

- name: Setup Node.js
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
with:
node-version: 18
registry-url: "https://registry.npmjs.org/"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0

- name: Use Node.js
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
with:
node-version: 18
registry-url: "https://registry.npmjs.org/"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/design-system-component-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
browser: ["chrome", "firefox"]
steps:
- name: Checkout repository
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0

- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
- uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
with:
node-version: 18
registry-url: "https://registry.npmjs.org/"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/icons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
working-directory: ./packages/icons
steps:
- name: Checkout sources
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
with:
# Required when using a PAT for opening the PR
persist-credentials: false

- name: Use Node.js
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
with:
node-version: 18
check-latest: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0

- name: Use Node.js
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
with:
node-version: 18
registry-url: "https://registry.npmjs.org/"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
with:
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo

- name: Use Node.js
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
with:
node-version: 18
check-latest: true
Expand All @@ -48,7 +48,7 @@ jobs:
run: yarn lint-merge-report master ${GITHUB_HEAD_REF}

- name: Annotate Code Linting Results
uses: ataylorme/eslint-annotate-action@2c426a387ed738e9522e93abfcb4cfc57b46458a #v2.2.0
uses: ataylorme/eslint-annotate-action@5f4dc2e3af8d3c21b727edb597e5503510b1dc9c #v2.2.0
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
report-json: ./eslint-report.json
6 changes: 3 additions & 3 deletions .github/workflows/pr-playground.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0

- name: Use Node.js
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
with:
node-version: 18
registry-url: "https://registry.npmjs.org/"
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0

- name: Check UMD files size diff
uses: preactjs/compressed-size-action@8119d3d31b6e57b167e09c81dfa877eada3bcb35 #v2.5.0
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0

- name: Use Node.js
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
with:
node-version: 18
check-latest: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/security-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
environment: main
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
- name: Scan
uses: ./.github/actions/sourceclear
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/semgrep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
if: (github.actor != 'dependabot[bot]')

steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
# Run the "semgrep ci" command on the command line of the docker image.
- run: semgrep ci
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/surge-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: Use Node.js
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
with:
node-version: 18

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests-cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0

- name: Use Node.js
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
with:
node-version: 18
registry-url: "https://registry.npmjs.org/"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/visual-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ jobs:
environment: pull_request_unsafe
if: ( github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'need visual approval') )
steps:
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
with:
fetch-depth: 0

- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
- uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
with:
node-version: 18
cache: "yarn"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/yarn-deduplicate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ jobs:

steps:
- name: Checkout sources
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 #v3.6.0
with:
persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token
fetch-depth: 0 # otherwise, you will failed to push refs to dest repo

- name: Use Node.js
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
with:
node-version: 18
registry-url: "https://registry.npmjs.org/"
Expand Down
15 changes: 7 additions & 8 deletions fork/bootstrap-sass/assets/stylesheets/bootstrap/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -274,14 +274,13 @@ $dropdown-caret-color: #000 !default;
//
// Note: These variables are not generated into the Customizer.

$zindex-navbar: 1000 !default;
$zindex-dropdown: 1000 !default;
$zindex-popover: 1060 !default;
$zindex-tooltip: 1070 !default;
$zindex-navbar-fixed: 1030 !default;
$zindex-modal-background: 1040 !default;
$zindex-modal: 1050 !default;

$zindex-navbar: tokens.$coral-elevation-layer-flat !default; // 0
$zindex-dropdown: tokens.$coral-elevation-layer-interactive-front !default; // 8
$zindex-navbar-fixed: tokens.$coral-elevation-layer-standard-front !default; // 4
$zindex-modal-background: tokens.$coral-elevation-layer-standard-front !default; // 4
$zindex-modal: tokens.$coral-elevation-layer-standard-front !default; // 4
$zindex-popover: tokens.$coral-elevation-layer-interactive-front !default; // 8
$zindex-tooltip: tokens.$coral-elevation-layer-overlay !default; // 16

//== Media queries breakpoints
//
Expand Down
14 changes: 14 additions & 0 deletions fork/module-to-cdn/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# @talend/module-to-cdn

## 9.9.1

### Patch Changes

- d465adb68: fix: ace code editor

Issue1: 404 on react-ace min in dev mode.
The copy of the assets during the build is not able to support different forlders and this is the case for react-ace.
The getUMD point to the production version (becaue of babel) but we are in dev so this make a 404.
Fix: point to prod for both versions

Issue 2: function f is not defined (trace in ace-build).
Fix: pin ace-builds in react-forms because there is a bug in the latest version

## 9.9.0

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion fork/module-to-cdn/modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@
"production": "/dist/react-ace.min.js"
},
">= 9.4.0": {
"development": "/dist/react-ace.js/main.js",
"development": "/dist/react-ace.min.js/main.js",
"production": "/dist/react-ace.min.js/main.js"
}
}
Expand Down
2 changes: 1 addition & 1 deletion fork/module-to-cdn/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@talend/module-to-cdn",
"version": "9.9.0",
"version": "9.9.1",
"description": "Get cdn config from npm module name",
"license": "MIT",
"repository": "https://github.com/Talend/ui",
Expand Down
58 changes: 58 additions & 0 deletions packages/components/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,63 @@
# @talend/react-components

## 11.3.1

### Patch Changes

- 8277e1f39: TDOPS-4488: Add VList Link column to disctionary

## 11.3.0

### Minor Changes

- a6ac16f28: TDOPS-4488 - Allow to have links in VirtualList in Title cell and dedicated Link cell

## 11.2.3

### Patch Changes

- fbce059c2: Improve usage of design tokens for info variants
- 72b95c880: TDOPS-5081 - Fixed FilterBar in VList header having wrong style on hover
- Updated dependencies [fbce059c2]
- @talend/bootstrap-theme@8.1.2

## 11.2.2

### Patch Changes

- 79cc47c03: Use elevation token for headerbar to be in line with other components

## 11.2.1

### Patch Changes

- 58f8ff666: Fix button style for filter bar clear button
- a5348a439: TDOPS-4964 - Fix SidePanel colors
- 82e08d6e5: TDOPS-4890 - Fix Notifications text color
- Updated dependencies [58f8ff666]
- Updated dependencies [a5348a439]
- @talend/bootstrap-theme@8.1.1

## 11.2.0

### Minor Changes

- c65edb127: fix(TDP-12557): use lighter gray for format value whitespace

## 11.1.3

### Patch Changes

- 3345262d2: fix: tokens on the Slider component and migration to typescript
- Updated dependencies [b36165add]
- @talend/design-tokens@2.8.0

## 11.1.2

### Patch Changes

- 62bcde608: fix: setup the interactive stuff in accent color for the subheader bar

## 11.1.1

### Patch Changes
Expand Down
11 changes: 6 additions & 5 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
},
"dependencies": {
"@popperjs/core": "^2.11.8",
"@talend/bootstrap-theme": "^8.0.0",
"@talend/design-tokens": "^2.7.3",
"@talend/bootstrap-theme": "^8.1.2",
"@talend/design-tokens": "^2.8.0",
"@talend/react-a11y": "^1.1.0",
"@talend/icons": "^6.58.1",
"@talend/utils": "^2.5.1",
Expand Down Expand Up @@ -70,8 +70,8 @@
},
"devDependencies": {
"@storybook/addon-actions": "^7.1.0",
"@talend/bootstrap-theme": "^8.0.0",
"@talend/design-system": "^7.10.0",
"@talend/bootstrap-theme": "^8.1.2",
"@talend/design-system": "^7.14.2",
"@talend/icons": "^6.58.1",
"@talend/locales-design-system": "^7.3.0",
"@talend/locales-tui-components": "^9.5.0",
Expand All @@ -95,6 +95,7 @@
"react": "^17.0.2",
"react-a11y": "^0.3.4",
"react-dom": "^17.0.2",
"react-router-dom": "~6.3.0",
"react-i18next": "^11.18.6",
"react-storybook-addon-props-combinations": "^1.1.0",
"react-test-renderer": "^17.0.2"
Expand All @@ -113,5 +114,5 @@
"publishConfig": {
"access": "public"
},
"version": "11.1.1"
"version": "11.3.1"
}
2 changes: 1 addition & 1 deletion packages/components/src/ActionList/ActionList.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ function ActionList(props) {
'tc-action-list',
className,
{
'nav-inverse': props.reverse,
'nav-inverse': !props.reverse,
},
)}
>
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/ActionList/ActionList.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ $tc-action-list-item-border-size: 0.2rem !default;
text-overflow: inherit;
text-transform: none;

> span {
>span {
margin-left: $padding-normal;
vertical-align: middle;
transition: 0.1s opacity ease-out;
Expand Down
Loading

0 comments on commit ce331ee

Please sign in to comment.