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.

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

merge release_23.0 into dev #15830

Merged
merged 4 commits into from Mar 27, 2023
Merged

merge release_23.0 into dev #15830

merged 4 commits into from Mar 27, 2023

Conversation

martenson
Copy link
Member

resolved some conflict in code from @mvdbeek @jmchilton -- please sanity check

License

  • I agree to license these and all my past contributions to the core galaxy codebase under the MIT license.

Copy link
Member

@jmchilton jmchilton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sanity checked unless CI reveals I am wrong.

@martenson
Copy link
Member Author

martenson commented Mar 20, 2023

There is an issue in compiling .ts that I'd expect to work with duck typing but it does not seem to be the case.

details: The shallow clone of const step = { ...stepStore.getStep(stepId.value) }; somehow does not match the expected type for step.id. Why?

@ElectronicBlueberry
Copy link
Member

ElectronicBlueberry commented Mar 21, 2023

step.id for const step = ... is of type number | undefined, since getStep potentially returns undefined.

Due to the object being spread here, if getStep returns undefined, step will be an empty object, which can not be caught by assertDefined. This leads to step.id remaining potentially undefined after the assertion.

The spread must be preformed after the assertion, so that this potential error can be caught.

    let step = stepStore.getStep(stepId.value);
    assertDefined(step);
    step = { ...step };

or, a bit safer

    const sourceStep = stepStore.getStep(stepId.value);
    assertDefined(sourceStep);
    const step = { ...sourceStep };

martenson and others added 2 commits March 22, 2023 16:33
Co-authored-by: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
@martenson
Copy link
Member Author

the rest of the test fails do not seem relevant to this merge -- I'm going forward with it

@martenson martenson merged commit 2f114e5 into galaxyproject:dev Mar 27, 2023
37 of 41 checks passed
@martenson martenson deleted the merge23 branch March 27, 2023 16:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants