Commit 59e77c00 authored by John Chilton's avatar John Chilton
Browse files

Cleanup collections PR based on reviewer comments.

parent 7a075686

client/src/components/Collections/common/PairingFilterInputGroup.vue

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ function resync() { 
}



watch(currentForwardFilter, resync);

watch(currentForwardFilter, resync);

watch(currentReverseFilter, resync);

</script>



<template>

client/src/components/Collections/wizard/PasteData.vue

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ const handleDrop = (event: DragEvent) => { 


<template>

    <div class="paste-data">

        <JaggedDataAlert :jaggedDataWarning="jaggedDataWarning" />

        <JaggedDataAlert :jagged-data-warning="jaggedDataWarning" />

        <div

            class="dropzone"

            :class="{ highlight: isDragging }"

client/src/components/Workflow/Editor/modules/terminals.test.ts

+2 −2
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ describe("canAccept", () => { 
        expect(dataIn.mapOver).toBe(NULL_COLLECTION_TYPE_DESCRIPTION);

        expect(dataIn.canAccept(collectionOut).canAccept).toBe(false);

        expect(dataIn.canAccept(collectionOut).reason).toBe(

            "Cannot attach optionally paired outputs to inputs requiring pairing, consider using the 'Split Paired and Unpaired' to extract just the pairs out from this output."

            "Cannot attach optionally paired outputs to inputs requiring pairing, consider using the 'Split Paired and Unpaired' tool to extract just the pairs out from this output."

        );

    });

    it("rejects list:paired_or_unpaired -> paired connection", () => {
@@ -391,7 +391,7 @@ describe("canAccept", () => { 
        expect(dataIn.mapOver).toBe(NULL_COLLECTION_TYPE_DESCRIPTION);

        expect(dataIn.canAccept(collectionOut).canAccept).toBe(false);

        expect(dataIn.canAccept(collectionOut).reason).toBe(

            "Cannot attach optionally paired outputs to inputs requiring pairing, consider using the 'Split Paired and Unpaired' to extract just the pairs out from this output."

            "Cannot attach optionally paired outputs to inputs requiring pairing, consider using the 'Split Paired and Unpaired' tool to extract just the pairs out from this output."

        );

    });

    it("rejects list:paired_or_unpaired -> list connection", () => {

client/src/components/Workflow/Editor/modules/terminals.ts

+1 −1
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ export class InputCollectionTerminal extends BaseInputTerminal { 
                        this.collectionTypes[0]?.collectionType?.endsWith("paired")

                    ) {

                        reason =

                            "Cannot attach optionally paired outputs to inputs requiring pairing, consider using the 'Split Paired and Unpaired' to extract just the pairs out from this output.";

                            "Cannot attach optionally paired outputs to inputs requiring pairing, consider using the 'Split Paired and Unpaired' tool to extract just the pairs out from this output.";

                    }

                }

                return new ConnectionAcceptable(false, reason);