Merge branch 'main' into CHARTS-9154

src/ui/units/datasets/containers/DatasetPage/DatasetPage.tsx

@@ -39,7 +39,7 @@ class DatasetPage extends React.Component<DatasetPageProps> {
                         workbookIdFromPath={this.props.workbookId}
                         history={this.props.history}
                         ytPath={this.ytPath}
-                        isCreationProcess={isCreationProcess()}
+                        isCreationProcess={isCreationProcess(location.pathname)}
                         isAuto={this.isAuto}
                     />
                 </DatasetPageProvider>

src/ui/units/datasets/helpers/utils.test.ts

@@ -0,0 +1,14 @@
+import {isCreationProcess} from './utils';
+
+describe('dataset/helpers/isCreationProcess', () => {
+    test.each([
+        ['', false],
+        ['/datasets/name', false],
+        ['/datasets/name-new', false],
+        ['/datasets/new-name', false],
+        ['/datasets/new', true],
+    ])('isCreationProcess (args: %j)', (pathname, expected) => {
+        const result = isCreationProcess(pathname);
+        expect(result).toEqual(expected);
+    });
+});

src/ui/units/datasets/helpers/utils.ts

@@ -150,6 +150,7 @@ export default class DatasetUtils {
     }
 }
 
-export function isCreationProcess() {
-    return /new$/.test(window.location.pathname);
+export function isCreationProcess(pathname = '') {
+    const lastPathnamePart = pathname.split('/').filter(Boolean).slice(-1)[0];
+    return lastPathnamePart === 'new';
 }

src/ui/units/datasets/store/constants.ts

@@ -23,7 +23,7 @@ const isDatasetTab = (value: unknown): value is DatasetTab => {
 };
 
 const getCurrentTab = (): DatasetTab => {
-    const defaultTab = isCreationProcess() ? TAB_SOURCES : TAB_DATASET;
+    const defaultTab = isCreationProcess(location.pathname) ? TAB_SOURCES : TAB_DATASET;
     const queryTab = DatasetUtils.getQueryParam('tab');
 
     if (isDatasetTab(queryTab)) {