Skip to content

change readonly path UI #7573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 7, 2025
Merged

change readonly path UI #7573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 15 additions & 7 deletions frontend/src/components/cur-dir-path/dir-path.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,15 +128,19 @@ class DirPath extends React.Component {
return (
<>
<span className="path-split">/</span>
<span className="path-item">{gettext('Views')}</span>
<span className="path-item path-item-read-only">{gettext('Views')}</span>
<span className="path-split">/</span>
<span className="path-item" role={children ? 'button' : null} onClick={children ? this.handleRefresh : () => {}}>
<span
className="path-item path-item-read-only"
role={children ? 'button' : null}
onClick={children ? this.handleRefresh : () => {}}
>
<MetadataViewName id={viewId} />
</span>
{children && (
<>
<span className="path-split">/</span>
<span className="path-item">{children}</span>
<span className="path-item path-item-read-only">{children}</span>
</>
)}
<div className="path-item-refresh" id="sf-metadata-view-refresh" onClick={this.handleRefresh}>
Expand All @@ -156,13 +160,13 @@ class DirPath extends React.Component {
return (
<>
<span className="path-split">/</span>
<span className="path-item">{gettext('Tags')}</span>
<span className="path-item path-item-read-only">{gettext('Tags')}</span>
<span className="path-split">/</span>
<TagViewName id={tagId} canSelectAllTags={canSelectAllTags} />
{children && (
<>
<span className="path-split">/</span>
<span className="path-item">{children}</span>
<span className="path-item path-item-read-only">{children}</span>
</>
)}
</>
Expand All @@ -172,8 +176,12 @@ class DirPath extends React.Component {
turnPathToLink = (path) => {
path = path[path.length - 1] === '/' ? path.slice(0, path.length - 1) : path;
const pathList = path.split('/');
if (pathList.includes(PRIVATE_FILE_TYPE.FILE_EXTENDED_PROPERTIES)) return this.turnViewPathToLink(pathList);
if (pathList.includes(PRIVATE_FILE_TYPE.TAGS_PROPERTIES)) return this.turnTagPathToLink(pathList);
if (pathList.includes(PRIVATE_FILE_TYPE.FILE_EXTENDED_PROPERTIES)) {
return this.turnViewPathToLink(pathList);
}
if (pathList.includes(PRIVATE_FILE_TYPE.TAGS_PROPERTIES)) {
return this.turnTagPathToLink(pathList);
}
let nodePath = '';
let pathElem = pathList.map((item, index) => {
if (item === '') return null;
Expand Down
4 changes: 4 additions & 0 deletions frontend/src/css/lib-content-view.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,10 @@
background: #efefef;
}

.dir-view-path .path-item.path-item-read-only:hover {
background: #fff;
}

.dir-view-path .path-item-refresh {
height: 24px;
width: 24px;
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/tag/components/tag-view-name/all-tags-operation-toolbar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { useTags } from '../../../hooks';

import './index.css';

const AllTagsOperationToolbar = ({ children }) => {
const AllTagsOperationToolbar = () => {
const [isMenuOpen, setMenuOpen] = useState(false);
const [isShowEditTagDialog, setShowEditTagDialog] = useState(false);

Expand Down Expand Up @@ -44,6 +44,7 @@ const AllTagsOperationToolbar = ({ children }) => {
return (
<>
<div className="dir-operation">
<span className="path-item path-item-read-only">{gettext('All tags')}</span>
<Dropdown isOpen={isMenuOpen} toggle={toggleMenuOpen}>
<DropdownToggle
tag="span"
Expand All @@ -53,8 +54,7 @@ const AllTagsOperationToolbar = ({ children }) => {
onKeyDown={onDropdownKeyDown}
data-toggle="dropdown"
>
{children}
<i className="ml-1 sf3-font-new sf3-font path-item-new-toggle"></i>
<i className="sf3-font-new sf3-font path-item-new-toggle"></i>
<i className="sf3-font-down sf3-font path-item-dropdown-toggle"></i>
</DropdownToggle>
<DropdownMenu className='position-fixed'>
Expand Down
18 changes: 14 additions & 4 deletions frontend/src/tag/components/tag-view-name/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,27 @@ const TagViewName = ({ id, canSelectAllTags }) => {
if (!id) return null;
if (id === ALL_TAGS_ID) {
if (canSelectAllTags) {
return (<span className="path-item" role="button" onClick={selectAllTags}>{gettext('All tags')}</span>);
return (
<span className="path-item" role="button" onClick={selectAllTags}>{gettext('All tags')}</span>
);
}

const canModify = context.canModify();
const canAddTag = context.canAddTag();
if (!canModify || !canAddTag) return (<span className="path-item">{gettext('All tags')}</span>);
return (<AllTagsOperationToolbar>{gettext('All tags')}</AllTagsOperationToolbar>);
if (!canModify || !canAddTag) {
return (
<span className="path-item path-item-read-only">{gettext('All tags')}</span>
);
}
return (
<AllTagsOperationToolbar/>
);
}
const tag = getRowById(tagsData, id);
if (!tag) return null;
return (<span className="path-item">{getTagName(tag)}</span>);
return (
<span className="path-item path-item-read-only">{getTagName(tag)}</span>
);
};

TagViewName.propTypes = {
Expand Down