Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/lang/en/metas.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{
"path": "Path",
"password": "Password",
"write": "Write",
"read_users": "Read Users",
"read_users_help": "Only selected users with the required permission can read this path.",
"write_users": "Write Users",
"write_users_help": "Only selected users with the required permission can write this path.",
"all_permitted_users": "All Permitted Users",
"write": "Write Content Bypass",
"write_help": "Bypasses user permission checks for content writes (create/upload/modify). USE WITH CAUTION.",
"hide": "Hide",
"readme": "Readme",
"readme_help": "Render a markdown at the bottom, support content or link",
Expand Down
2 changes: 1 addition & 1 deletion src/lang/en/users.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"see_hides": "Can see hiddens",
"access_without_password": "Access without password",
"offline_download": "Add offline download tasks",
"write": "Make dir or upload",
"write_content": "Write content (Create / Upload / Modify)",
"rename": "Rename",
"move": "Move",
"copy": "Copy",
Expand Down
25 changes: 15 additions & 10 deletions src/pages/home/folder/context-menu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ import { HStack, Icon, Text, useColorMode, Image } from "@hope-ui/solid"
import { operations } from "../toolbar/operations"
import { For, Show } from "solid-js"
import { bus, convertURL, notify } from "~/utils"
import { ObjType, UserMethods, UserPermissions } from "~/types"
import { ObjType, UserMethods } from "~/types"
import {
getSettingBool,
haveSelected,
me,
objStore,
oneChecked,
selectedObjs,
userCan,
} from "~/store"
import { players } from "../previews/video_box"
import { BsPlayCircleFill } from "solid-icons/bs"
Expand Down Expand Up @@ -50,13 +52,10 @@ export const ContextMenu = () => {
theme={colorMode() !== "dark" ? "light" : "dark"}
style="z-index: var(--hope-zIndices-popover)"
>
<For each={["rename", "move", "copy", "delete", "share"]}>
<For each={["rename", "move", "copy", "delete"] as const}>
{(name) => (
<Item
hidden={() => {
const index = UserPermissions.findIndex((item) => item === name)
return isShare() || !UserMethods.can(me(), index)
}}
hidden={!userCan(name) || !objStore.write || isShare()}
onClick={() => {
bus.emit("tool", name)
}}
Expand All @@ -65,14 +64,20 @@ export const ContextMenu = () => {
</Item>
)}
</For>
<Item
hidden={!userCan("share")}
onClick={() => {
bus.emit("tool", "share")
}}
>
<ItemContent name="share" />
</Item>
<Item
hidden={() => {
const index = UserPermissions.findIndex(
(item) => item === "decompress",
)
return (
isShare() ||
!UserMethods.can(me(), index) ||
!userCan("decompress") ||
!objStore.write ||
selectedObjs().some((o) => o.is_dir) ||
selectedObjs().some((o) => !isArchive(o.name))
)
Expand Down
7 changes: 6 additions & 1 deletion src/pages/home/previews/text-editor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,12 @@ function Editor(props: { data?: string | ArrayBuffer; contentType?: string }) {
setValue(value)
}}
/>
<Show when={userCan("write") || objStore.write}>
<Show
when={
objStore.write &&
(userCan("write_content") || objStore.write_content_bypass)
}
>
<Button loading={loading()} onClick={onSave}>
{t("global.save")}
</Button>
Expand Down
36 changes: 23 additions & 13 deletions src/pages/home/toolbar/Center.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
import { Box, HStack, useColorModeValue } from "@hope-ui/solid"
import { createMemo, For, Show } from "solid-js"
import { checkboxOpen, haveSelected, objStore, selectAll, State } from "~/store"
import {
checkboxOpen,
haveSelected,
objStore,
selectAll,
State,
userCan,
} from "~/store"
import { CopyLink } from "./CopyLink"
import { CenterIcon } from "./Icon"
import { bus } from "~/utils"
Expand All @@ -27,7 +34,7 @@ export const Center = () => {
w="max-content"
color="$neutral11"
as={Motion.div}
initial={{ opacity: 0, scale: 0.9, x: "50% ", y: 10 }}
initial={{ opacity: 0, scale: 0.9, x: "50%", y: 10 }}
animate={{ opacity: 1, scale: 1, x: "50%", y: 0 }}
exit={{ opacity: 0, scale: 0.9 }}
// @ts-ignore
Expand All @@ -43,29 +50,32 @@ export const Center = () => {
backdropFilter: "blur(8px)",
}}
>
<Show when={!isShare()}>
<Show when={!isShare() && objStore.write}>
<For
Comment thread
Lanfei marked this conversation as resolved.
each={[
"rename",
"move",
"copy",
"delete",
"share",
"decompress",
]}
each={
["rename", "move", "copy", "delete", "decompress"] as const
}
>
{(name) => {
return (
return userCan(name) ? (
<CenterIcon
name={name}
onClick={() => {
bus.emit("tool", name)
}}
/>
)
) : null
}}
</For>
</Show>
<Show when={userCan("share")}>
<CenterIcon
name="share"
onClick={() => {
bus.emit("tool", "share")
}}
/>
</Show>
<CopyLink />
<Download />
<CenterIcon
Expand Down
5 changes: 2 additions & 3 deletions src/pages/home/toolbar/CopyMove.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ import { Checkbox, createDisclosure, VStack, Button } from "@hope-ui/solid"
import { createSignal, onCleanup } from "solid-js"
import { ModalFolderChoose, FolderTreeHandler } from "~/components"
import { useFetch, usePath, useRouter, useT } from "~/hooks"
import { me, selectedObjs } from "~/store"
import { selectedObjs, userCan } from "~/store"
import { bus, fsCopy, fsMove, handleRespWithNotifySuccess } from "~/utils"
import { CgFolderAdd } from "solid-icons/cg"
import { UserMethods, UserPermissions } from "~/types"

export const CreateFolderButton = (props: { handler?: FolderTreeHandler }) => {
if (!UserMethods.can(me(), UserPermissions.indexOf("write"))) {
if (!userCan("write_content")) {
return null
}
const t = useT()
Expand Down
54 changes: 44 additions & 10 deletions src/pages/home/toolbar/Right.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,21 @@ export const Right = () => {
transition={{ duration: 0.2 }}
>
<VStack spacing="$1" class="left-toolbar-in">
<RightIcon
as={RiSystemRefreshLine}
tips="refresh"
onClick={() => {
refresh(undefined, true)
}}
/>
<Show
when={
isFolder() && !isShare() && (userCan("write") || objStore.write)
isFolder() &&
!isShare() &&
(userCan("write_content") || objStore.write_content_bypass) &&
objStore.write
}
>
{/* <Add /> */}
<RightIcon
as={RiSystemRefreshLine}
tips="refresh"
onClick={() => {
refresh(undefined, true)
}}
/>
<RightIcon
as={operations.new_file.icon}
tips="new_file"
Expand All @@ -87,20 +89,38 @@ export const Right = () => {
bus.emit("tool", "mkdir")
}}
/>
</Show>
<Show
when={
isFolder() && !isShare() && userCan("move") && objStore.write
}
>
<RightIcon
as={operations.recursive_move.icon}
tips="recursive_move"
onClick={() => {
bus.emit("tool", "recursiveMove")
}}
/>
</Show>
<Show
when={
isFolder() && !isShare() && userCan("delete") && objStore.write
}
>
<RightIcon
as={operations.remove_empty_directory.icon}
tips="remove_empty_directory"
onClick={() => {
bus.emit("tool", "removeEmptyDirectory")
}}
/>
</Show>
<Show
when={
isFolder() && !isShare() && userCan("rename") && objStore.write
}
>
<RightIcon
as={operations.batch_rename.icon}
tips="batch_rename"
Expand All @@ -109,6 +129,15 @@ export const Right = () => {
bus.emit("tool", "batchRename")
}}
/>
</Show>
<Show
when={
isFolder() &&
!isShare() &&
(userCan("write_content") || objStore.write_content_bypass) &&
objStore.write
}
>
<RightIcon
as={AiOutlineCloudUpload}
tips="upload"
Expand All @@ -118,7 +147,12 @@ export const Right = () => {
/>
</Show>
<Show
when={isFolder() && !isShare() && userCan("offline_download")}
when={
isFolder() &&
!isShare() &&
userCan("offline_download") &&
objStore.write
}
>
<RightIcon
as={IoMagnetOutline}
Expand Down
Loading