Merge branch 'master' into jmfrancois/chore/update-postcss

Talend · May 21, 2024 · a73aea0 · a73aea0
2 parents cc6955e + d548b21
commit a73aea0
Show file tree

Hide file tree

Showing 10 changed files with 61 additions and 22 deletions.
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @talend/react-components
 
+## 16.1.3
+
+### Patch Changes
+
+- 003c7a4: fix(TDC-7452/Tour): Fix tour is changing to first step when closing
+
 ## 16.1.2
 
 ### Patch Changes

diff --git a/packages/components/package.json b/packages/components/package.json
@@ -120,5 +120,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "16.1.2"
+  "version": "16.1.3"
 }
diff --git a/packages/components/src/AppGuidedTour/AppGuidedTour.component.js b/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;
@@ -73,8 +75,10 @@ function AppGuidedTour({
 			onRequestClose={() => {
 				onRequestClose();
 				setIsAlreadyViewed(true);
-				setCurrentStep(0);
-				setImportDemoContent(false);
+				if (importDemoContent) {
+					setImportDemoContent(false);
+					setCurrentStep(Math.max(0, currentStep - 1));
+				}
 			}}
 			steps={[
 				{

diff --git a/packages/components/src/AppGuidedTour/AppGuidedTour.test.js b/packages/components/src/AppGuidedTour/AppGuidedTour.test.js
@@ -95,4 +95,21 @@ describe('AppGuidedTour', () => {
 		);
 		expect(screen.queryByText('Import demo content')).not.toBeInTheDocument();
 	});
+	it('Should stay on the last page when finished', async () => {
+		const user = userEvent.setup();
+		const steps = [
+			{
+				content: {
+					header: 'Header',
+					body: () => 'Last page',
+				},
+			},
+		];
+		render(<AppGuidedTour {...DEFAULT_PROPS} steps={steps} demoContentSteps={null} />);
+		expect(screen.queryByText(/Last page/i)).not.toBeInTheDocument();
+		const nextBtn = document.querySelector('button[data-tour-elem="right-arrow"]');
+		await user.click(nextBtn);
+		await user.click(screen.getByText('Let me try'));
+		expect(screen.queryByText(/Last page/i)).toBeInTheDocument();
+	});
 });
diff --git a/packages/dataviz/CHANGELOG.md b/packages/dataviz/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 6.1.5
+
+### Patch Changes
+
+- 0f408a7: Fix(Dataviz): Range filter - date time inputs overlap
+
 ## 6.1.4
 
 ### Patch Changes

diff --git a/packages/dataviz/package.json b/packages/dataviz/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@talend/react-dataviz",
-  "version": "6.1.4",
+  "version": "6.1.5",
   "description": "Talend charts and visualization components",
   "main": "lib/index.js",
   "mainSrc": "src/index.ts",
@@ -52,7 +52,7 @@
     "@talend/design-system": "^10.4.2",
     "@talend/eslint-config": "^13.0.3",
     "@talend/eslint-plugin": "^1.1.1",
-    "@talend/icons": "^7.7.2",
+    "@talend/icons": "^7.8.0",
     "@talend/locales-tui-components": "^11.4.5",
     "@talend/locales-tui-dataviz": "^3.0.1",
     "@talend/react-components": "^16.1.1",

diff --git a/...onents/RangeFilter/handlers/DateTimeRangeHandler/DateTimeInputField.component.module.scss b/...onents/RangeFilter/handlers/DateTimeRangeHandler/DateTimeInputField.component.module.scss
@@ -5,12 +5,16 @@
 	}
 
 	:global(.date-picker) {
-		flex-basis: 75%;
-		margin-right: 2px;
+		> div {
+			flex-basis: 75%;
+			margin-right: 2px;
+		}
 	}
 
 	:global(.time-picker) {
-		flex-basis: 50%;
-		margin-right: 5px;
+		> div {
+			flex-basis: 50%;
+			margin-right: 5px;
+		}
 	}
 }
diff --git a/packages/icons/CHANGELOG.md b/packages/icons/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @talend/icons
 
+## 7.8.0
+
+### Minor Changes
+
+- d409b57: feat(TMC-27713/icons): update qlik favicon
+
 ## 7.7.2
 
 ### Patch Changes

diff --git a/packages/icons/package.json b/packages/icons/package.json
@@ -72,5 +72,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "7.7.2"
+  "version": "7.8.0"
 }
diff --git a/packages/icons/src/svg/products/qlik-favicon.svg b/packages/icons/src/svg/products/qlik-favicon.svg