Merge with master

.changeset/nasty-tips-bow.md → .changeset/mighty-shoes-jam.md

@@ -2,4 +2,4 @@
 '@talend/scripts-config-prettier': patch
 ---
 
-Add missing deps
+fix: prettier configuration for sort imports

fork/bootstrap-sass/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 3.5.1
+
+### Patch Changes
+
+- f14ebbe23: Add missing deps
+
 ## 3.5.0
 
 ### Minor Changes

fork/bootstrap-sass/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talend/bootstrap-sass",
-  "version": "3.5.0",
+  "version": "3.5.1",
   "description": "bootstrap-sass is a Sass-powered version of Bootstrap 3, ready to drop right into your Sass powered applications.",
   "main": "assets/javascripts/bootstrap.js",
   "style": "assets/stylesheets/_bootstrap.scss",
@@ -40,7 +40,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@talend/eslint-config": "^13.0.0",
+    "@talend/eslint-config": "^13.0.1",
     "@talend/eslint-plugin": "^1.1.0",
     "eslint": "^8.53.0"
   }

fork/dynamic-cdn-webpack-plugin/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 13.1.0
+
+### Minor Changes
+
+- f14ebbe23: Add missing deps, adapt code to keep test working with pnpm and use custom eslint config to not have circular dependency
+
 ## 13.0.1
 
 ### Patch Changes

fork/dynamic-cdn-webpack-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talend/dynamic-cdn-webpack-plugin",
-  "version": "13.0.1",
+  "version": "13.1.0",
   "description": "Dynamically get your dependencies from a cdn rather than bundling them in your app",
   "license": "MIT",
   "repository": "Talend/dynamic-cdn-webpack-plugin",

fork/module-to-cdn/.prettierrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+    printWidth: 100,
+    singleQuote: true,
+    trailingComma: 'none',
+    semi: true,
+    arrowParens: 'avoid',
+    bracketSpacing: false
+};

fork/react-bootstrap/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [v0.32.5]
 
+## 2.1.1
+
+### Patch Changes
+
+- f14ebbe23: Fix lint issue
+
 ## 2.1.0
 
 ### Minor Changes

fork/react-bootstrap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@talend/react-bootstrap",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Bootstrap 3 components built with React",
   "repository": {
     "type": "git",
@@ -41,11 +41,11 @@
     "react-dom": ">=16.3.0"
   },
   "devDependencies": {
-    "@talend/eslint-config": "^13.0.0",
+    "@talend/eslint-config": "^13.0.1",
     "@talend/eslint-plugin": "^1.1.0",
-    "@talend/scripts-core": "^16.2.0",
+    "@talend/scripts-core": "^16.3.0",
     "@talend/scripts-config-babel": "^13.2.0",
-    "@talend/scripts-config-react-webpack": "^16.3.0",
+    "@talend/scripts-config-react-webpack": "^16.3.1",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^12.1.5",
     "@testing-library/user-event": "^13.5.0",

package.json

@@ -3,9 +3,8 @@
     "@changesets/cli": "^2.26.2",
     "@talend/scripts-config-babel": "^13.2.0",
     "@talend/scripts-config-prettier": "^12.1.0",
-    "@talend/scripts-yarn-workspace": "^1.3.0",
     "@talend/scripts-core": "^16.2.0",
-    "@talend/upgrade-deps": "^2.1.0",
+    "@talend/scripts-yarn-workspace": "^1.3.0",
     "cross-env": "^7.0.3",
     "cross-spawn": "^7.0.3",
     "eslint": "^8.53.0",

packages/components/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @talend/react-components
 
+## 12.2.0
+
+### Minor Changes
+
+- e87f8e091: feat(TDP-12694): add pendo trackers to guided-tour actions
+
+### Patch Changes
+
+- 8b1dc1fac: TDOPS-5671 - Fix tooltip display on date time ranger picker
+- Updated dependencies [f14ebbe23]
+- Updated dependencies [02e2d012c]
+  - @talend/react-bootstrap@2.1.1
+  - @talend/icons@7.3.0
+
 ## 12.1.0
 
 ### Minor Changes

packages/components/package.json

@@ -37,9 +37,9 @@
     "@talend/assets-api": "^1.3.0",
     "@talend/bootstrap-theme": "^8.3.0",
     "@talend/design-tokens": "^2.10.0",
-    "@talend/icons": "^7.2.0",
+    "@talend/icons": "^7.3.0",
     "@talend/react-a11y": "^2.1.0",
-    "@talend/react-bootstrap": "^2.1.0",
+    "@talend/react-bootstrap": "^2.1.1",
     "@talend/utils": "^2.8.0",
     "ally.js": "^1.4.1",
     "classnames": "^2.3.2",
@@ -73,14 +73,14 @@
   "devDependencies": {
     "@storybook/addon-actions": "^7.5.3",
     "@talend/bootstrap-theme": "^8.3.0",
-    "@talend/design-system": "^8.3.0",
-    "@talend/eslint-config": "^13.0.0",
+    "@talend/design-system": "^8.3.1",
+    "@talend/eslint-config": "^13.0.1",
     "@talend/eslint-plugin": "^1.1.0",
     "@talend/locales-design-system": "^7.15.1",
     "@talend/locales-tui-components": "^11.4.5",
-    "@talend/scripts-core": "^16.2.0",
+    "@talend/scripts-core": "^16.3.0",
     "@talend/scripts-config-babel": "^13.2.0",
-    "@talend/scripts-config-react-webpack": "^16.3.0",
+    "@talend/scripts-config-react-webpack": "^16.3.1",
     "@talend/scripts-config-storybook-lib": "^5.2.0",
     "@talend/scripts-config-typescript": "^11.2.0",
     "@testing-library/jest-dom": "^5.17.0",
@@ -118,5 +118,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "12.1.0"
+  "version": "12.2.0"
 }

packages/components/src/AppGuidedTour/AppGuidedTour.component.js

@@ -1,11 +1,13 @@
-import { useState, useEffect } from 'react';
-import PropTypes from 'prop-types';
-import useLocalStorage from 'react-use/lib/useLocalStorage';
+import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import useLocalStorage from 'react-use/lib/useLocalStorage';
+
+import PropTypes from 'prop-types';
+
+import I18N_DOMAIN_COMPONENTS from '../constants';
 import GuidedTour from '../GuidedTour';
-import Toggle from '../Toggle';
 import Stepper from '../Stepper';
-import I18N_DOMAIN_COMPONENTS from '../constants';
+import Toggle from '../Toggle';
 import DemoContentStep from './DemoContentStep.component';
 
 const DEMO_CONTENT_STEP_ID = 1;
@@ -21,6 +23,7 @@ function AppGuidedTour({
 	onImportDemoContent,
 	onRequestClose,
 	welcomeStepBody = null,
+	tourId,
 	...rest
 }) {
 	const { t } = useTranslation(I18N_DOMAIN_COMPONENTS);
@@ -52,6 +55,7 @@ function AppGuidedTour({
 
 	return (
 		<GuidedTour
+			tourId={tourId}
 			isOpen={isOpen}
 			showButtons={!isNavigationDisabled}
 			showCloseButton={!isNavigationDisabled}
@@ -100,6 +104,7 @@ function AppGuidedTour({
 														setImportDemoContent(event.target.checked);
 													}}
 													checked={importDemoContent}
+													data-feature={tourId && `guidedtour.${tourId}.demo`}
 												/>
 											</form>
 										)}
@@ -134,6 +139,7 @@ AppGuidedTour.propTypes = {
 	onRequestOpen: PropTypes.func.isRequired,
 	onImportDemoContent: PropTypes.func,
 	onRequestClose: PropTypes.func.isRequired,
+	tourId: PropTypes.string,
 };
 
 export default AppGuidedTour;

packages/components/src/AppGuidedTour/AppGuidedTour.stories.js

@@ -1,6 +1,7 @@
 import { useState } from 'react';
-import AppGuidedTour from './AppGuidedTour.component';
+
 import Stepper from '../Stepper';
+import AppGuidedTour from './AppGuidedTour.component';
 
 // eslint-disable-next-line react/prop-types
 function AppGuidedTourContainer({ withDemoContent = false }) {
@@ -22,6 +23,7 @@ function AppGuidedTourContainer({ withDemoContent = false }) {
 
 	return (
 		<AppGuidedTour
+			tourId="preparation"
 			isOpen
 			appName="Data Preparation"
 			steps={[

packages/components/src/DateTimePickers/DateRange/Picker/__snapshots__/Picker.component.test.js.snap

@@ -16,11 +16,12 @@ exports[`DateRange.Picker should render 1`] = `
         class="theme-element-container theme-left"
       >
         <span
-          aria-label="Go to previous month"
           class="CoralButtonIcon"
           icon="arrow-left"
           tabindex="-1"
-        />
+        >
+          Go to previous month
+        </span>
       </div>
       <div
         class="theme-element-container theme-middle"
@@ -40,11 +41,12 @@ exports[`DateRange.Picker should render 1`] = `
         class="theme-element-container theme-right"
       >
         <span
-          aria-label="Go to next month"
           class="CoralButtonIcon"
           icon="arrow-right"
           tabindex="-1"
-        />
+        >
+          Go to next month
+        </span>
       </div>
     </div>
     <div

packages/components/src/DateTimePickers/LegacyDateTimePickers/views/DateTimeView/DateTimeView.component.js

@@ -1,14 +1,16 @@
 import { PureComponent } from 'react';
+
 import PropTypes from 'prop-types';
 
 import { ButtonIcon } from '@talend/design-system';
 
+import getDefaultT from '../../../../translate';
 import DatePicker from '../../pickers/DatePicker';
 import TimePicker from '../../pickers/TimePicker';
-import ViewLayout from '../ViewLayout';
 import HeaderTitle from '../HeaderTitle';
+import ViewLayout from '../ViewLayout';
+
 import theme from './DateTimeView.module.scss';
-import getDefaultT from '../../../../translate';
 
 /**
  * Get the positive euclidean modulo number from a dividend and a divisor
@@ -89,11 +91,12 @@ class DateTimeView extends PureComponent {
 			leftElement: (
 				<ButtonIcon
 					size="S"
-					aria-label={t('DATEPICKER_MONTH_PREVIOUS', 'Go to previous month')}
 					icon="arrow-left"
 					onClick={() => this.goToPreviousMonth()}
 					tabIndex="-1"
-				></ButtonIcon>
+				>
+					{t('DATEPICKER_MONTH_PREVIOUS', 'Go to previous month')}
+				</ButtonIcon>
 			),
 			middleElement: (
 				<HeaderTitle
@@ -109,13 +112,9 @@ class DateTimeView extends PureComponent {
 				/>
 			),
 			rightElement: (
-				<ButtonIcon
-					size="S"
-					aria-label={t('DATEPICKER_MONTH_NEXT', 'Go to next month')}
-					icon="arrow-right"
-					onClick={() => this.goToNextMonth()}
-					tabIndex="-1"
-				></ButtonIcon>
+				<ButtonIcon size="S" icon="arrow-right" onClick={() => this.goToNextMonth()} tabIndex="-1">
+					{t('DATEPICKER_MONTH_NEXT', 'Go to next month')}
+				</ButtonIcon>
 			),
 		};