feat: add new folder button to move/create dialogs (#2667)

---------

Co-authored-by: Oleg Lobanov <oleg@lobanov.me>
This commit is contained in:
ArthurMousatov
2023-08-26 18:28:58 -04:00
committed by GitHub
parent 374bbd3ec1
commit 5994224468
21 changed files with 199 additions and 129 deletions

View File

@@ -50,7 +50,7 @@ export default {
};
},
computed: {
...mapState(["req", "reload", "loading", "show"]),
...mapState(["req", "reload", "loading"]),
currentView() {
if (this.req.type == undefined) {
return null;

View File

@@ -30,7 +30,7 @@ export default {
UploadFiles,
},
computed: {
...mapGetters(["isLogged", "progress"]),
...mapGetters(["isLogged", "progress", "currentPrompt"]),
...mapState(["user"]),
isExecEnabled: () => enableExec,
},
@@ -38,7 +38,7 @@ export default {
$route: function () {
this.$store.commit("resetSelected");
this.$store.commit("multiple", false);
if (this.$store.state.show !== "success")
if (this.currentPrompt?.prompt !== "success")
this.$store.commit("closeHovers");
},
},

View File

@@ -298,16 +298,8 @@ export default {
};
},
computed: {
...mapState([
"req",
"selected",
"user",
"show",
"multiple",
"selected",
"loading",
]),
...mapGetters(["selectedCount"]),
...mapState(["req", "selected", "user", "multiple", "selected", "loading"]),
...mapGetters(["selectedCount", "currentPrompt"]),
nameSorted() {
return this.req.sorting.by === "name";
},
@@ -444,7 +436,7 @@ export default {
},
keyEvent(event) {
// No prompts are shown
if (this.show !== null) {
if (this.currentPrompt !== null) {
return;
}

View File

@@ -143,7 +143,7 @@
</template>
<script>
import { mapState } from "vuex";
import { mapGetters, mapState } from "vuex";
import { files as api } from "@/api";
import { resizePreview } from "@/utils/constants";
import url from "@/utils/url";
@@ -177,7 +177,8 @@ export default {
};
},
computed: {
...mapState(["req", "user", "oldReq", "jwt", "loading", "show"]),
...mapState(["req", "user", "oldReq", "jwt", "loading"]),
...mapGetters(["currentPrompt"]),
hasPrevious() {
return this.previousLink !== "";
},
@@ -195,7 +196,7 @@ export default {
return api.getDownloadURL(this.req, true);
},
showMore() {
return this.$store.state.show === "more";
return this.currentPrompt?.prompt === "more";
},
isResizeEnabled() {
return resizePreview;
@@ -247,7 +248,7 @@ export default {
this.$router.replace({ path: this.nextLink });
},
key(event) {
if (this.show !== null) {
if (this.currentPrompt !== null) {
return;
}

View File

@@ -37,7 +37,7 @@
</form>
</div>
<div v-if="$store.state.show === 'deleteUser'" class="card floating">
<div v-if="this.currentPromptName === 'deleteUser'" class="card floating">
<div class="card-content">
<p>Are you sure you want to delete this user?</p>
</div>
@@ -61,7 +61,7 @@
</template>
<script>
import { mapState, mapMutations } from "vuex";
import { mapState, mapMutations, mapGetters } from "vuex";
import { users as api, settings } from "@/api";
import UserForm from "@/components/settings/UserForm.vue";
import Errors from "@/views/Errors.vue";
@@ -89,6 +89,7 @@ export default {
return this.$route.path === "/settings/users/new";
},
...mapState(["loading"]),
...mapGetters(["currentPrompt", "currentPromptName"]),
},
watch: {
$route: "fetchData",