Skip to content

Commit 56901e2

Browse files
change readonly path UI (#7573)
1 parent 98e01ba commit 56901e2

File tree

4 files changed

+36
-14
lines changed

4 files changed

+36
-14
lines changed

frontend/src/components/cur-dir-path/dir-path.js

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,15 +128,19 @@ class DirPath extends React.Component {
128128
return (
129129
<>
130130
<span className="path-split">/</span>
131-
<span className="path-item">{gettext('Views')}</span>
131+
<span className="path-item path-item-read-only">{gettext('Views')}</span>
132132
<span className="path-split">/</span>
133-
<span className="path-item" role={children ? 'button' : null} onClick={children ? this.handleRefresh : () => {}}>
133+
<span
134+
className="path-item path-item-read-only"
135+
role={children ? 'button' : null}
136+
onClick={children ? this.handleRefresh : () => {}}
137+
>
134138
<MetadataViewName id={viewId} />
135139
</span>
136140
{children && (
137141
<>
138142
<span className="path-split">/</span>
139-
<span className="path-item">{children}</span>
143+
<span className="path-item path-item-read-only">{children}</span>
140144
</>
141145
)}
142146
<div className="path-item-refresh" id="sf-metadata-view-refresh" onClick={this.handleRefresh}>
@@ -156,13 +160,13 @@ class DirPath extends React.Component {
156160
return (
157161
<>
158162
<span className="path-split">/</span>
159-
<span className="path-item">{gettext('Tags')}</span>
163+
<span className="path-item path-item-read-only">{gettext('Tags')}</span>
160164
<span className="path-split">/</span>
161165
<TagViewName id={tagId} canSelectAllTags={canSelectAllTags} />
162166
{children && (
163167
<>
164168
<span className="path-split">/</span>
165-
<span className="path-item">{children}</span>
169+
<span className="path-item path-item-read-only">{children}</span>
166170
</>
167171
)}
168172
</>
@@ -172,8 +176,12 @@ class DirPath extends React.Component {
172176
turnPathToLink = (path) => {
173177
path = path[path.length - 1] === '/' ? path.slice(0, path.length - 1) : path;
174178
const pathList = path.split('/');
175-
if (pathList.includes(PRIVATE_FILE_TYPE.FILE_EXTENDED_PROPERTIES)) return this.turnViewPathToLink(pathList);
176-
if (pathList.includes(PRIVATE_FILE_TYPE.TAGS_PROPERTIES)) return this.turnTagPathToLink(pathList);
179+
if (pathList.includes(PRIVATE_FILE_TYPE.FILE_EXTENDED_PROPERTIES)) {
180+
return this.turnViewPathToLink(pathList);
181+
}
182+
if (pathList.includes(PRIVATE_FILE_TYPE.TAGS_PROPERTIES)) {
183+
return this.turnTagPathToLink(pathList);
184+
}
177185
let nodePath = '';
178186
let pathElem = pathList.map((item, index) => {
179187
if (item === '') return null;

frontend/src/css/lib-content-view.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,10 @@
299299
background: #efefef;
300300
}
301301

302+
.dir-view-path .path-item.path-item-read-only:hover {
303+
background: #fff;
304+
}
305+
302306
.dir-view-path .path-item-refresh {
303307
height: 24px;
304308
width: 24px;

frontend/src/tag/components/tag-view-name/all-tags-operation-toolbar/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { useTags } from '../../../hooks';
88

99
import './index.css';
1010

11-
const AllTagsOperationToolbar = ({ children }) => {
11+
const AllTagsOperationToolbar = () => {
1212
const [isMenuOpen, setMenuOpen] = useState(false);
1313
const [isShowEditTagDialog, setShowEditTagDialog] = useState(false);
1414

@@ -44,6 +44,7 @@ const AllTagsOperationToolbar = ({ children }) => {
4444
return (
4545
<>
4646
<div className="dir-operation">
47+
<span className="path-item path-item-read-only">{gettext('All tags')}</span>
4748
<Dropdown isOpen={isMenuOpen} toggle={toggleMenuOpen}>
4849
<DropdownToggle
4950
tag="span"
@@ -53,8 +54,7 @@ const AllTagsOperationToolbar = ({ children }) => {
5354
onKeyDown={onDropdownKeyDown}
5455
data-toggle="dropdown"
5556
>
56-
{children}
57-
<i className="ml-1 sf3-font-new sf3-font path-item-new-toggle"></i>
57+
<i className="sf3-font-new sf3-font path-item-new-toggle"></i>
5858
<i className="sf3-font-down sf3-font path-item-dropdown-toggle"></i>
5959
</DropdownToggle>
6060
<DropdownMenu className='position-fixed'>

frontend/src/tag/components/tag-view-name/index.js

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,27 @@ const TagViewName = ({ id, canSelectAllTags }) => {
1818
if (!id) return null;
1919
if (id === ALL_TAGS_ID) {
2020
if (canSelectAllTags) {
21-
return (<span className="path-item" role="button" onClick={selectAllTags}>{gettext('All tags')}</span>);
21+
return (
22+
<span className="path-item" role="button" onClick={selectAllTags}>{gettext('All tags')}</span>
23+
);
2224
}
2325

2426
const canModify = context.canModify();
2527
const canAddTag = context.canAddTag();
26-
if (!canModify || !canAddTag) return (<span className="path-item">{gettext('All tags')}</span>);
27-
return (<AllTagsOperationToolbar>{gettext('All tags')}</AllTagsOperationToolbar>);
28+
if (!canModify || !canAddTag) {
29+
return (
30+
<span className="path-item path-item-read-only">{gettext('All tags')}</span>
31+
);
32+
}
33+
return (
34+
<AllTagsOperationToolbar/>
35+
);
2836
}
2937
const tag = getRowById(tagsData, id);
3038
if (!tag) return null;
31-
return (<span className="path-item">{getTagName(tag)}</span>);
39+
return (
40+
<span className="path-item path-item-read-only">{getTagName(tag)}</span>
41+
);
3242
};
3343

3444
TagViewName.propTypes = {

0 commit comments

Comments
 (0)