Merge branch 'main' of github.com:kedro-org/kedro-viz into release/9.1.0

Signed-off-by: huongg <[email protected]>
kedro-org · May 23, 2024 · f4878a5 · f4878a5
2 parents 8037134 + 6b83643
commit f4878a5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -22,6 +22,7 @@ Please follow the established format:
 - Remove default props from functional components. (#1906)
 - Fix for schema change in strawberry-graphql JSON scalar. (#1903)
 - Fix messaging level when package compatibility is not satisfied. (#1904)
+- Fix broken URL when active pipeline name changes on initial load. (#1914)
 
 # Release 9.0.0
 

diff --git a/package/kedro_viz/data_access/repositories/catalog.py b/package/kedro_viz/data_access/repositories/catalog.py
@@ -12,7 +12,7 @@
     from kedro.pipeline._transcoding import TRANSCODING_SEPARATOR, _strip_transcoding
 except ImportError:  # pragma: no cover
     # older versions
-    from kedro.pipeline.pipeline import TRANSCODING_SEPARATOR, _strip_transcoding
+    from kedro.pipeline.pipeline import TRANSCODING_SEPARATOR, _strip_transcoding  # type: ignore
 
 from packaging.version import parse
 

diff --git a/package/kedro_viz/integrations/kedro/hooks.py b/package/kedro_viz/integrations/kedro/hooks.py
@@ -17,7 +17,10 @@
     from kedro.pipeline._transcoding import TRANSCODING_SEPARATOR, _strip_transcoding
 except ImportError:  # pragma: no cover
     # older versions
-    from kedro.pipeline.pipeline import TRANSCODING_SEPARATOR, _strip_transcoding
+    from kedro.pipeline.pipeline import (  # type: ignore
+        TRANSCODING_SEPARATOR,
+        _strip_transcoding,
+    )
 
 logger = logging.getLogger(__name__)
 

diff --git a/package/kedro_viz/models/flowchart.py b/package/kedro_viz/models/flowchart.py
@@ -17,7 +17,7 @@
     from kedro.pipeline._transcoding import TRANSCODING_SEPARATOR, _strip_transcoding
 except ImportError:  # pragma: no cover
     # older versions
-    from kedro.pipeline.pipeline import TRANSCODING_SEPARATOR, _strip_transcoding
+    from kedro.pipeline.pipeline import TRANSCODING_SEPARATOR, _strip_transcoding  # type: ignore
 
 from pydantic import (
     BaseModel,

diff --git a/src/components/flowchart-wrapper/flowchart-wrapper.js b/src/components/flowchart-wrapper/flowchart-wrapper.js
@@ -92,7 +92,7 @@ export const FlowChartWrapper = ({
     if (localStorageParams) {
       const paramActions = {
         pipeline: (value) => {
-          if (!searchParams.has(params.pipeline) && activePipeline) {
+          if (activePipeline) {
             toSetQueryParam(params.pipeline, value.active || activePipeline);
           }
         },

diff --git a/src/utils/index.js b/src/utils/index.js
@@ -189,14 +189,12 @@ export const formatNumberWithCommas = (number) => {
  * @returns {Boolean} True if the app is running locally.
  */
 export const isRunningLocally = () => {
-  const hosts = ['localhost', '127.0.0.1', 'demo.kedro.org'];
-  const itemFoundIndex = hosts.indexOf(window.location.hostname);
+  const hosts = ['localhost', '127.0.0.1', 'demo.kedro.org', 'gitpod'];
+  const itemFound = hosts.some((host) =>
+    window.location.hostname.includes(host)
+  );
 
-  if (itemFoundIndex === -1) {
-    return false; // The hostname isn't in our list of local hosts
-  } else {
-    return true;
-  }
+  return itemFound;
 };
 
 /**