Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge develop into master #2010

Merged
merged 33 commits into from
Oct 22, 2024
Merged

Merge develop into master #2010

merged 33 commits into from
Oct 22, 2024

Commits on Aug 16, 2024

  1. Add more complete data to OntPoolFactory.

    @stevieing
    stevieing committed Aug 16, 2024
    Configuration menu
    Copy the full SHA
    540e71b View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Add more complete data to OntPoolFactory

    @stevieing
    stevieing committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    a68ace5 View commit details
    Browse the repository at this point in the history

  2. refactor: Add find function to JsonApi module

    @stevieing
    stevieing committed Aug 23, 2024
    Configuration menu
    Copy the full SHA
    55aacc8 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. Merge branch 'develop' into move-ont-pools-to-fetch

    @stevieing
    stevieing committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    ab58f62 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2024

  1. Refactor find function in JsonApi.js to include related data. 

    This commit also updates the corresponding unit test in JsonApi.spec.js to reflect the changes made to the find function.
    @stevieing
    stevieing committed Sep 30, 2024
    Configuration menu
    Copy the full SHA
    3eedaa9 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Merge branch 'develop' into move-ont-pools-to-fetch

    @stevieing
    stevieing committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    51347e2 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Refactor JsonApi find function to extract includes 

    This commit refactors the find function in the JsonApi module to extract the includes from the found data. The extractIncludes function is introduced to handle the extraction of includes from relationships. The includes are then flattened and duplicates are removed using the Set data structure. This change improves the efficiency and readability of the code.

Related issue: N/A
    @stevieing
    stevieing committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    6d8b61c View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Refactor JsonApi find function to work correctly and ensure if it is … 

    …a single record does not return data as an array.
    @stevieing
    stevieing committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    20f84aa View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Refactor JsonApi find function to prevent failure with empty relation… 

    …ships and extract includes
    @stevieing
    stevieing committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    4fc8a6c View commit details
    Browse the repository at this point in the history

  2. Add tube and plate factory for ONT. Fix method naming.

    @stevieing
    stevieing committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    fb042d3 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. Move ont pools mutations to factories. 

    Fixed dodgy tests.
    @stevieing
    stevieing committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    b131ca0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into move-ont-pools-to-fetch

    @stevieing
    stevieing committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    678b0e8 View commit details
    Browse the repository at this point in the history

  3. Refactor getters.spec.js to use factories for OntPlate and OntPool data

    @stevieing
    stevieing committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    54d2b65 View commit details
    Browse the repository at this point in the history

  4. Refactor getters.spec.js to improve readability and maintainability

    @stevieing
    stevieing committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    1df954d View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Removed OntPool json file. 

    Fixed issue with find where it was producing empty includes.

Fixed follow on issue where there was a maximum call stack exceeded and so introduced depth for extracting includes.
    @stevieing
    stevieing committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    bc1c6fc View commit details
    Browse the repository at this point in the history

  2. Refactor ONTPoolCreate and ONTSampleIndex tests to use factories for … 

    …data.

Remove unused data files.
    @stevieing
    stevieing committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    de89e9e View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. Refactor tests and improve readability 

    - Refactored ONTPoolCreate and ONTSampleIndex tests to use factories for data.
- Removed OntPool json file.
- Refactored getters.spec.js to improve readability and maintainability.
- Refactored getters.spec.js to use factories for OntPlate and OntPool data.
- Updated ontAndTags.csv with additional data.
- Updated JsonApi.spec.js to remove unnecessary code.
- Updated ont_pools_view.cy.js to use factories for OntPool and Printer data.
- Updated ont_pool_edit.cy.js to use factories for OntPool data.
- Updated ont_pool_create.cy.js to use factories for OntTagSet, Printer, and OntPlate data.
    @stevieing
    stevieing committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    0496735 View commit details
    Browse the repository at this point in the history

  2. refactor pool actions to use v2 api and fix all corresponding errors.

    @stevieing
    stevieing committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    d0389fa View commit details
    Browse the repository at this point in the history

  3. Refactor fetchOntPools to use default values for filter and page para… 

    …meters
    @stevieing
    stevieing committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    47bdfa8 View commit details
    Browse the repository at this point in the history

  4. Refactor ont.csv and ont_pool_create.cy.js

    @stevieing
    stevieing committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    c57bc57 View commit details
    Browse the repository at this point in the history

  5. Sort By in Pacbio Libraries view, by id, descending by default

    @harrietc52
    harrietc52 committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    f2045be View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. Refactor fetchOntRequests to use default values for filter and page p… 

    …arameters.

Fixed e2e tests.
    @stevieing
    stevieing committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    8d3ebbe View commit details
    Browse the repository at this point in the history

  2. Refactor e2e tests and remove unused fixtures.

    @stevieing
    stevieing committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    ab0d37b View commit details
    Browse the repository at this point in the history

  3. Refactor ont_pool_create.cy.js to use correct returns for pool.

    @stevieing
    stevieing committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    6ae3ce1 View commit details
    Browse the repository at this point in the history

  4. Fix e2e test

    @harrietc52
    harrietc52 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    5c97cbf View commit details
    Browse the repository at this point in the history

  5. Refactor extractIncludes function to add maximum depth parameter

    @stevieing
    stevieing committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    a0c40c8 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Merge pull request #1999 from sanger/Y24-362 

    Y24-361 Sort By in Pacbio Libraries view, by id, descending by default
    @harrietc52
    harrietc52 authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    7282c58 View commit details
    Browse the repository at this point in the history

  2. feat(qcResultsUpload): moves QcResultsUpload components and service t… 

    …o v2 api
    @BenTopping
    BenTopping committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    408d326 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into move-ont-pools-to-fetch

    @stevieing
    stevieing committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    984ab75 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2024

  1. Merge pull request #1891 from sanger/move-ont-pools-to-fetch 

    Y24-345 - Ont Pools store migration from axios to native fetch to reduce dependencies and increase maintainability.
    @stevieing
    stevieing authored Oct 18, 2024
    Configuration menu
    Copy the full SHA
    6410f26 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2024

  1. Merge branch 'develop' of https://github.com/sanger/traction-ui into … 

    …Y24-344-qc-result-upload-fetch-migration
    @BenTopping
    BenTopping committed Oct 21, 2024
    Configuration menu
    Copy the full SHA
    f94e72a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2003 from sanger/Y24-344-qc-result-upload-fetch-m… 

    …igration

Y24-344 - QC Results Upload migration to fetch.
    @BenTopping
    BenTopping authored Oct 21, 2024
    Configuration menu
    Copy the full SHA
    7a0a171 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. bump release

    @harrietc52
    harrietc52 committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    a3ae5c6 View commit details
    Browse the repository at this point in the history