Merge branch 'main' into feat/move-expand-all-modular-piplines-from-s…

…ettings
kedro-org · Apr 16, 2024 · 5cdf3d9 · 5cdf3d9
2 parents 8d3e94c + 9e7ecb6
commit 5cdf3d9
Show file tree

Hide file tree

Showing 34 changed files with 11,200 additions and 45,044 deletions.
diff --git a/.circleci/continue_config.yml b/.circleci/continue_config.yml
@@ -15,7 +15,7 @@ parameters:
 
 orbs:
   win: circleci/[email protected]
-  node: circleci/node@5.0.3
+  node: circleci/node@5.2.0
 
 # No windows executor is listed here since windows builds use win/default and modify
 # the Python version through the conda environment.
@@ -45,19 +45,20 @@ commands:
   install_node_dependencies:
     steps:
       - node/install:
-          node-version: '16.13.2'
+          node-version: '18.20.0'        
       # using install-packages command from node orb
-      - node/install-packages
+      - node/install-packages:
+          override-ci-command: npm install
 
   nvm_use_npm_install:
     steps:
       - run:
-          name: Use NVM to run Node v16
+          name: Use NVM to run Node v18
           command: |
-            nvm install v16.13.2
+            nvm install v18.20.0
             node -v
-            nvm alias default v16.13.2
-            nvm use v16.13.2
+            nvm alias default v18.20.0
+            nvm use v18.20.0
       - run:
           name: Install Node dependencies
           command: |

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -125,7 +125,7 @@ To avoid needing to remember the `-s` flag on every commit, you might like to se
 
 ### JavaScript development
 
-_*Note*: We suggest using the [latest release of Node.js v16](https://nodejs.org/download/release/latest-v16.x/) in your development environment._
+_*Note*: We suggest using the [latest release of Node.js v18](https://nodejs.org/download/release/latest-v18.x/) in your development environment._
 
 First clone this repo, then download and install dependencies:
 

diff --git a/RELEASE.md b/RELEASE.md
@@ -9,15 +9,19 @@ Please follow the established format:
 
 ## Major features and improvements
 
+- Extending stateful URLs with node filters and expand/collapse modular pipelines. (#1799)
 - Introduce `--include-hooks` option and remove `--ignore-plugins` from cli commands. (#1818)
 - Add Dataset Factory Patterns to Experiment Tracking. (#1824)
+- Upgrade to Node 18. (#1811)
 
 ## Bug fixes and other changes
 
 - Add support for `JSONDataset` preview. (#1800)
 - Increase Kedro-Viz timeout. (#1803)
 - Remove demo data source and update feature hints. (#1804)
 - Add markdown support for backticks in the pop-up reminder. (#1826)
+- Fix posix path conversion on Windows in DatasetStatsHook. (#1843)
+- Add `pydantic` pin to requirements. (#1861)
 
 # Release 8.0.1 
 

diff --git a/cypress/tests/ui/experiment-tracking/experiment-tracking.cy.js b/cypress/tests/ui/experiment-tracking/experiment-tracking.cy.js
@@ -198,10 +198,7 @@ describe('Experiment Tracking', () => {
       cy.get('.accordion__title--hyperlink').first().click();
 
       // Assert after action
-      cy.location('search').should(
-        'eq',
-        `?pipeline_id=__default__&selected_name=${plotNameText}`
-      );
+      cy.location('search').should('contain', `?pid=__default__&sn=${plotNameText}`);
       cy.__checkForText__(
         '.pipeline-node--selected > .pipeline-node__text',
         prettifyName(stripNamespace(plotNameText))

diff --git a/cypress/tests/ui/flowchart/flowchart.cy.js b/cypress/tests/ui/flowchart/flowchart.cy.js
@@ -190,7 +190,7 @@ describe('Flowchart DAG', () => {
     // Assert after action
     cy.get('.pipeline-warning__title')
       .should('exist')
-      .and('have.text', `Oops, there's nothing to see here`);
+      .and('include.text', `Oops, there's nothing to see here`);
   });
 
   it('verifies that users can open and see the dataset statistics in the metadata panel for datasets. #TC-51', () => {

diff --git a/cypress/tests/ui/flowchart/menu.cy.js b/cypress/tests/ui/flowchart/menu.cy.js
@@ -31,7 +31,7 @@ describe('Flowchart Menu', () => {
 
       cy.location('search').should((queryParams) => {
         expect(decodeURIComponent(queryParams).toLowerCase()).to.contain(
-          menuOptionValue.toLowerCase()
+          menuOptionValue.toLowerCase().replace(/ /g, '+')
         );
       });
 
@@ -170,4 +170,48 @@ describe('Flowchart Menu', () => {
       .should('have.class', 'pipeline-nodelist__row__label--faded')
       .should('have.class', 'pipeline-nodelist__row__label--disabled');
   });
+
+  it('verifies that after checking node type URL should be updated with correct query params', () => {
+    const nodeToToggleText = 'Parameters';
+
+    // Alias
+    cy.get(`.pipeline-nodelist__row__checkbox[name=${nodeToToggleText}]`).as(
+      'nodeToToggle'
+    );
+
+    // Assert before action
+    cy.get('@nodeToToggle').should('not.be.checked');
+
+    // Action
+    cy.get('@nodeToToggle').check({ force: true });
+
+    // Assert after action
+    cy.url().should('include', 'parameters');
+  });
+
+  it('Verify that if the URL contains the nodeTag query parameter, the same parameter should be reflected on the UI.', () => {
+    const visibleRowLabel = 'Companies';
+    cy.visit(`/?tags=${visibleRowLabel}`);
+
+    // Alias
+    cy.get(`.pipeline-nodelist__row__checkbox[name=${visibleRowLabel}]`).as(
+      'nodeToToggle'
+    );
+
+    // Assert
+    cy.get('@nodeToToggle').should('be.checked');
+  });
+
+  it('Verify that if the URL contains the nodeType query parameter, the same parameter should be reflected on the UI.', () => {
+    const visibleRowLabel = 'Datasets';
+    cy.visit('/?types=datasets');
+
+    // Alias
+    cy.get(`.pipeline-nodelist__row__checkbox[name=${visibleRowLabel}]`).as(
+      'nodeToToggle'
+    );
+
+    // Assert
+    cy.get('@nodeToToggle').should('be.checked');
+  });
 });
diff --git a/cypress/tests/ui/flowchart/panel.cy.js b/cypress/tests/ui/flowchart/panel.cy.js
@@ -73,13 +73,14 @@ describe('Flowchart Primary Toolbar', () => {
     });
   });
 
-  it('verifies that users can download a PNG of their visualisation. #TC-12', () => {
-    // Action
-    cy.get('[data-test=btnDownloadPNG]').click({ force: true });
-
-    // Assertion
-    cy.__validateImage__('kedro-pipeline.png');
-  });
+  // TO FIX in a separately PR
+  // it('verifies that users can download a PNG of their visualisation. #TC-12', () => {
+  //   // Action
+  //   cy.get('[data-test=btnDownloadPNG]').click({ force: true });
+
+  //   // Assertion
+  //   cy.__validateImage__('kedro-pipeline.png');
+  // });
 
   it('verifies that users can download an SVG of their visualisation. #TC-13', () => {
     // Action

diff --git a/demo-project/data/09_tracking/linear_score.json/2023-01-16T15.55.27.850Z/linear_score.json b/demo-project/data/09_tracking/linear_score.json/2023-01-16T15.55.27.850Z/linear_score.json
@@ -1,3 +1,5 @@
 {
+  "a2_score": 3.100000000000005,
+  "b2_score": 4.4,
   "r2_score": 0.40296896595214116
 }
diff --git a/demo-project/data/09_tracking/rf_score.json/2023-01-16T15.55.27.850Z/rf_score.json b/demo-project/data/09_tracking/rf_score.json/2023-01-16T15.55.27.850Z/rf_score.json
@@ -1,3 +1,5 @@
 {
+  "a2_score": 4.1000000000000005,
+  "b2_score": 8.4,
   "r2_score": 0.4113266331219384
 }
diff --git a/demo-project/src/demo_project/pipelines/data_ingestion/nodes.py b/demo-project/src/demo_project/pipelines/data_ingestion/nodes.py
@@ -86,9 +86,9 @@ def aggregate_company_data(typed_companies: pd.DataFrame) -> pd.DataFrame:
 
     working_companies = typed_companies.groupby(["id"]).agg(
         {
-            "company_rating": np.mean,
+            "company_rating": "mean",
             "company_location": lambda x: list(set(x))[0],  # Take first item
-            "total_fleet_count": max,
+            "total_fleet_count": "max",
             "iata_approved": any,
         }
     )

diff --git a/demo-project/src/demo_project/requirements.in b/demo-project/src/demo_project/requirements.in
@@ -5,7 +5,7 @@ isort~=5.0
 jupyter~=1.0
 jupyter_client>=5.1, <7.0
 jupyterlab~=3.0
-kedro~=0.18.0
+kedro>=0.19
 kedro-datasets[pandas.CSVDataset,pandas.ExcelDataset, pandas.ParquetDataset, plotly.PlotlyDataset]>=2.1.0
 nbstripout~=0.4
 pytest-cov~=2.5

diff --git a/docs/source/images/kedro-viz-filter-share.gif b/docs/source/images/kedro-viz-filter-share.gif
diff --git a/docs/source/share_kedro_viz.md b/docs/source/share_kedro_viz.md
@@ -9,6 +9,7 @@ The publish and share feature on Kedro-Viz enables seamless sharing of pipeline
 * [Publish and share on Azure](./publish_and_share_kedro_viz_on_azure)
 * [Publish and share on GCP](./publish_and_share_kedro_viz_on_gcp)
 
+3. **Publish and Share Kedro-Viz with Github Actions**: Use the `publish-kedro-viz` action available on the Github Marketplace to deploy Kedro-Viz for your Kedro project repository on GitHub Pages. For further information and usage instructions, please refer to [publish-kedro-viz](https://github.com/marketplace/actions/publish-kedro-viz)
 
 ```{toctree}
 :maxdepth: 1
@@ -19,3 +20,12 @@ publish_and_share_kedro_viz_on_azure
 publish_and_share_kedro_viz_on_gcp
 ```
 
+## Filtering and sharing Kedro-Viz pipelines 
+
+Kedro-Viz allows you to focus on specific aspects of your data pipeline by filtering the visualization. Once filters are applied, you can share the resulting visualisation with others by copying the URL
+
+As filters are applied, the URL in the browser automatically updates to reflect the current state of your filtered pipeline. By selecting filters like type, tags, or focus mode through the user interface, you can generate a URL that can be shared, granting others access to the same filtered view of the pipeline.
+
+
+
+![](./images/kedro-viz-filter-share.gif)