Unverified Commit 5c121b43 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #19555 from davelopez/24.0_fix_export_remote_tool_dialog 

[24.2] Fix "export datasets" tool displaying dialog right away
parents e3b17952 ec4aa2ba

client/src/components/FilesDialog/FilesDialog.vue

+4 −1
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ interface FilesDialogProps { 
    requireWritable?: boolean;

    /** Optional selected item to start browsing from */

    selectedItem?: SelectionItem;

    /** Whether the dialog is visible at the start */

    isOpen?: boolean;

}



const props = withDefaults(defineProps<FilesDialogProps>(), {
@@ -54,6 +56,7 @@ const props = withDefaults(defineProps<FilesDialogProps>(), { 
    multiple: false,

    requireWritable: false,

    selectedItem: undefined,

    isOpen: true,

});



const { config, isConfigLoaded } = useConfig();
@@ -66,7 +69,7 @@ const errorMessage = ref<string>(); 
const filter = ref();

const items = ref<SelectionItem[]>([]);

const itemsProvider = ref<ItemsProvider>();

const modalShow = ref(true);

const modalShow = ref(props.isOpen);

const optionsShow = ref(false);

const undoShow = ref(false);

const hasValue = ref(false);

client/src/components/Form/Elements/FormDirectory.vue

+10 −1
Original line number Diff line number Diff line
@@ -4,7 +4,12 @@ 
            <b-button id="select-btn" @click="reset">

                <FontAwesomeIcon icon="folder-open" /> {{ selectText }}

            </b-button>

            <FilesDialog :key="modalKey" mode="directory" :callback="setUrl" :require-writable="true" />

            <FilesDialog

                :key="modalKey"

                mode="directory"

                :callback="setUrl"

                :require-writable="true"

                :is-open="isModalShown" />

        </div>

        <b-breadcrumb v-if="url">

            <b-breadcrumb-item title="Select another folder" class="align-items-center" @click="reset">
@@ -69,6 +74,9 @@ export default { 
            return regex.test(this.currentDirectoryName);

        },

    },

    mounted() {

        this.updateURL(true);

    },

    methods: {

        removePath(index) {

            this.pathChunks = this.pathChunks.slice(0, index);
@@ -83,6 +91,7 @@ export default { 
        // https://michaelnthiessen.com/force-re-render/

        redrawModal() {

            this.modalKey += 1;

            this.isModalShown = true;

        },

        removeLastPath(event) {

            // check whether the last item is editable