Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Commit

Permalink
file properties on context menu
Browse files Browse the repository at this point in the history
  • Loading branch information
aditya-mitra committed Jun 17, 2024
1 parent bfec725 commit bd1f4a3
Show file tree
Hide file tree
Showing 5 changed files with 264 additions and 26 deletions.
5 changes: 4 additions & 1 deletion packages/client-core/i18n/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
"close": "Close",
"submit": "Submit",
"search": "Search",
"copyText": "Copy Text"
"copyText": "Copy Text",
"edit": "Edit",
"save": "Save",
"none": "None"
},
"tooltip": {
"pressKey": "Press {{tip}} to {{message}}"
Expand Down
21 changes: 12 additions & 9 deletions packages/client-core/i18n/en/editor.json
Original file line number Diff line number Diff line change
Expand Up @@ -1173,15 +1173,18 @@
"search-placeholder": "Search folders",
"generatingThumbnails": "Generating Thumbnails ({{count}} remaining)",
"fileProperties": {
"name": "Name:",
"type": "Type:",
"size": "Size:",
"url": "URL:",
"attribution": "Attribution:",
"licensing": "Licensing:",
"tag": "Tag:",
"addTag": "Add Tag",
"save-changes": "Save Changes"
"header": "{{fileName}} Info",
"name": "Name",
"type": "Type",
"size": "Size",
"url": "URL",
"attribution": "Attribution",
"licensing": "Licensing",
"tag": "Tag",
"addTag": "Add New Tag",
"add": "Add",
"save-changes": "Save Changes",
"discard": "Discard"
},
"view-mode": {
"icons": "View: Icons",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,241 @@
/*
CPAL-1.0 License
The contents of this file are subject to the Common Public Attribution License
Version 1.0. (the "License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
https://github.com/EtherealEngine/etherealengine/blob/dev/LICENSE.
The License is based on the Mozilla Public License Version 1.1, but Sections 14
and 15 have been added to cover use of software over a computer network and
provide for limited attribution for the Original Developer. In addition,
Exhibit A has been modified to be consistent with Exhibit B.
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the
specific language governing rights and limitations under the License.
The Original Code is Ethereal Engine.
The Original Developer is the Initial Developer. The Initial Developer of the
Original Code is the Ethereal Engine team.
All portions of the code written by the Ethereal Engine team are Copyright © 2021-2023
Ethereal Engine. All Rights Reserved.
*/

import React, { useEffect } from 'react'
import { useTranslation } from 'react-i18next'

import { PopoverState } from '@etherealengine/client-core/src/common/services/PopoverState'
import { StaticResourceType, fileBrowserPath, staticResourcePath } from '@etherealengine/common/src/schema.type.module'
import { projectResourcesPath } from '@etherealengine/common/src/schemas/media/project-resource.schema'
import { FileDataType } from '@etherealengine/editor/src/components/assets/FileBrowser/FileDataType'
import { EditorState } from '@etherealengine/editor/src/services/EditorServices'
import { getMutableState, useHookstate } from '@etherealengine/hyperflux'
import { useFind, useMutation } from '@etherealengine/spatial/src/common/functions/FeathersHooks'
import { HiPencil, HiPlus, HiXMark } from 'react-icons/hi2'
import { RiSave2Line } from 'react-icons/ri'
import Button from '../../../../../primitives/tailwind/Button'
import Input from '../../../../../primitives/tailwind/Input'
import Modal from '../../../../../primitives/tailwind/Modal'
import Text from '../../../../../primitives/tailwind/Text'

export default function FilePropertiesModal({ file }: { file: FileDataType }) {
const { t } = useTranslation()
const newFileName = useHookstate(file.name)
const fileService = useMutation(fileBrowserPath)

const handleSubmit = async () => {
fileService.update(null, {
oldName: file.fullName,
newName: file.isFolder ? newFileName.value : `${newFileName.value}.${file.type}`,
oldPath: file.path,
newPath: file.path,
isCopy: false
})
PopoverState.hidePopupover()
}

const staticResource = useFind(staticResourcePath, {
query: {
key: file.key,
project: getMutableState(EditorState).projectName.value!
}
})

const staticResourceMutation = useMutation(staticResourcePath)
const projectResourcesMutation = useMutation(projectResourcesPath)

const resourceProperties = useHookstate({
id: '',
project: '',
tags: {
input: '',
all: [] as string[]
},
attribution: {
editing: false,
input: ''
},
licensing: {
editing: false,
input: ''
}
})

useEffect(() => {
if (staticResource.data.length > 0) {
if (staticResource.data.length > 1) console.info('Multiple resources with same key found')
const resources = JSON.parse(JSON.stringify(staticResource.data[0])) as StaticResourceType
if (resources) {
resourceProperties.id.set(resources.id)
resourceProperties.project.set(resources.project ?? '')
resourceProperties.tags.all.set(resources.tags ?? [])
resourceProperties.attribution.input.set(resources.attribution ?? '')
resourceProperties.licensing.input.set(resources.licensing ?? '')
}
}
}, [staticResource.data])

const handleAddTag = () => {
const newTags = [...resourceProperties.tags.all.value, resourceProperties.tags.input.value]
staticResourceMutation.patch(resourceProperties.id.value, {
tags: newTags
})
resourceProperties.tags.input.set('')
resourceProperties.tags.all.set(newTags)
}

const handleRemoveTag = (removedTag: string) => {
const currentTags = resourceProperties.tags.all.value.filter((tag) => tag !== removedTag)
staticResourceMutation.patch(resourceProperties.id.value, {
tags: currentTags
})
resourceProperties.tags.all.set(currentTags)
}

return (
<Modal
title={t('editor:layout.filebrowser.fileProperties.header', { fileName: file.name.toUpperCase() })}
className="w-96"
onSubmit={handleSubmit}
onClose={PopoverState.hidePopupover}
submitButtonText={t('editor:layout.filebrowser.fileProperties.save-changes')}
closeButtonText={t('editor:layout.filebrowser.fileProperties.discard')}
>
<div className="flex flex-col items-center gap-2">
<div className="grid grid-cols-2 gap-2">
<Text className="text-end">{t('editor:layout.filebrowser.fileProperties.name')}</Text>
<Text className="text-[#9CA0AA]">{file.name}</Text>
</div>
<div className="grid grid-cols-2 gap-2">
<Text className="text-end">{t('editor:layout.filebrowser.fileProperties.type')}</Text>
<Text className="text-[#9CA0AA]">{file.type.toUpperCase()}</Text>
</div>
<div className="grid grid-cols-2 gap-2">
<Text className="text-end">{t('editor:layout.filebrowser.fileProperties.size')}</Text>
<Text className="text-[#9CA0AA]">{file.size}</Text>
</div>
<div className="grid grid-cols-2 items-center gap-2">
<Text className="text-end">{t('editor:layout.filebrowser.fileProperties.attribution')}</Text>
<span className="flex items-center">
{resourceProperties.attribution.editing.value ? (
<>
<Input
value={resourceProperties.attribution.input.value}
onChange={(event) => resourceProperties.attribution.input.set(event.target.value)}
/>
<Button
title={t('common:components.save')}
variant="transparent"
size="small"
startIcon={<RiSave2Line />}
onClick={() => resourceProperties.attribution.editing.set(false)}
/>
</>
) : (
<>
<Text className="text-[#9CA0AA]">
{resourceProperties.attribution.input.value || <em>{t('common:components.none')}</em>}
</Text>
<Button
title={t('common:components.edit')}
variant="transparent"
size="small"
startIcon={<HiPencil />}
onClick={() => {
resourceProperties.attribution.editing.set(true)
staticResourceMutation.patch(resourceProperties.id.value, {
attribution: resourceProperties.attribution.input.value
})
}}
/>
</>
)}
</span>
</div>
<div className="grid grid-cols-2 items-center gap-2">
<Text className="text-end">{t('editor:layout.filebrowser.fileProperties.licensing')}</Text>
<span className="flex items-center">
{resourceProperties.licensing.editing.value ? (
<>
<Input
value={resourceProperties.licensing.input.value}
onChange={(event) => resourceProperties.licensing.input.set(event.target.value)}
/>
<Button
title={t('common:components.save')}
variant="transparent"
size="small"
startIcon={<RiSave2Line />}
onClick={() => resourceProperties.licensing.editing.set(false)}
/>
</>
) : (
<>
<Text className="text-[#9CA0AA]">
{resourceProperties.licensing.input.value || <em>{t('common:components.none')}</em>}
</Text>
<Button
title={t('common:components.edit')}
variant="transparent"
size="small"
startIcon={<HiPencil />}
onClick={() => {
resourceProperties.licensing.editing.set(true)
staticResourceMutation.patch(resourceProperties.id.value, {
licensing: resourceProperties.licensing.input.value
})
}}
/>
</>
)}
</span>
</div>
<div className="mt-10 flex flex-col gap-2">
<Text className="text-[#D3D5D9]" fontSize="sm">
{t('editor:layout.filebrowser.fileProperties.addTag')}
</Text>
<div className="flex items-center gap-2">
<Input
value={resourceProperties.tags.input.value}
onChange={(event) => resourceProperties.tags.input.set(event.target.value)}
/>
<Button
startIcon={<HiPlus />}
title={t('editor:layout.filebrowser.fileProperties.add')}
onClick={handleAddTag}
/>
</div>
<div className="flex h-24 flex-wrap gap-2 overflow-y-auto bg-theme-surfaceInput p-2">
{resourceProperties.tags.all.value.map((tag) => (
<span className="flex h-fit w-fit items-center rounded bg-[#2F3137] px-2 py-0.5">
{tag} <HiXMark className="ml-1 cursor-pointer" onClick={() => handleRemoveTag(tag)} />
</span>
))}
</div>
</div>
</div>
</Modal>
)
}
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import Button from '../../../../../primitives/tailwind/Button'
import { ContextMenu } from '../../../layout/ContextMenu'
import { FileIcon } from '../icon'
import DeleteFileModal from './DeleteFileModal'
import FilePropertiesModal from './FilePropertiesModal'
import RenameFileModal from './RenameFileModal'

export const canDropItemOverFolder = (folderName: string) =>
Expand Down Expand Up @@ -193,7 +194,6 @@ type FileBrowserItemType = {
disableDnD?: boolean
currentContent: MutableRefObject<{ item: FileDataType; isCopy: boolean }>
setFileProperties: any
setOpenPropertiesModal: any
setOpenCompress: any
setOpenConvert: any
isFilesLoading: boolean
Expand All @@ -209,7 +209,6 @@ export function FileBrowserItem({
item,
disableDnD,
currentContent,
setOpenPropertiesModal,
setFileProperties,
setOpenCompress,
setOpenConvert,
Expand Down Expand Up @@ -292,13 +291,6 @@ export function FileBrowserItem({
})
}

const viewAssetProperties = () => {
setFileProperties(item)

setOpenPropertiesModal(true)
handleClose()
}

const viewCompress = () => {
setFileProperties(item)
setOpenCompress(true)
Expand Down Expand Up @@ -412,7 +404,12 @@ export function FileBrowserItem({
>
{t('editor:layout.assetGrid.deleteAsset')}
</Button>
<Button variant="outline" size="small" fullWidth onClick={viewAssetProperties}>
<Button
variant="outline"
size="small"
fullWidth
onClick={() => PopoverState.showPopupover(<FilePropertiesModal file={item} />)}
>
{t('editor:layout.filebrowser.viewAssetProperties')}
</Button>
<Button variant="outline" size="small" fullWidth onClick={viewCompress}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ import {
availableTableColumns
} from '@etherealengine/editor/src/components/assets/FileBrowser/FileBrowserState'
import { FileDataType } from '@etherealengine/editor/src/components/assets/FileBrowser/FileDataType'
import { FilePropertiesPanel } from '@etherealengine/editor/src/components/assets/FileBrowser/FilePropertiesPanel'
import ImageCompressionPanel from '@etherealengine/editor/src/components/assets/ImageCompressionPanel'
import ModelCompressionPanel from '@etherealengine/editor/src/components/assets/ModelCompressionPanel'
import { DndWrapper } from '@etherealengine/editor/src/components/dnd/DndWrapper'
Expand Down Expand Up @@ -151,7 +150,6 @@ const FileBrowserContentPanel: React.FC<FileBrowserContentPanelProps> = (props)
const fileProperties = useHookstate<FileType | null>(null)
const anchorEl = useHookstate<HTMLButtonElement | null>(null)

const openProperties = useHookstate(false)
const openCompress = useHookstate(false)
const openConvert = useHookstate(false)

Expand Down Expand Up @@ -468,7 +466,6 @@ const FileBrowserContentPanel: React.FC<FileBrowserContentPanelProps> = (props)
onSelect(file)
}}
currentContent={currentContentRef}
setOpenPropertiesModal={openProperties.set}
setFileProperties={fileProperties.set}
setOpenCompress={openCompress.set}
setOpenConvert={openConvert.set}
Expand Down Expand Up @@ -684,9 +681,6 @@ const FileBrowserContentPanel: React.FC<FileBrowserContentPanelProps> = (props)
/>
)}

{openProperties.value && fileProperties.value && (
<FilePropertiesPanel openProperties={openProperties} fileProperties={fileProperties} />
)}
<ConfirmDialog
open={openConfirm.value}
description={t('editor:dialog.delete.confirm-content', {
Expand Down

0 comments on commit bd1f4a3

Please sign in to comment.