Skip to content

Commit 50846f2

Browse files
committed
showing required for new row
1 parent 7ad17ed commit 50846f2

File tree

5 files changed

+10
-14
lines changed

5 files changed

+10
-14
lines changed

src/components/BrowserCell/BrowserCell.react.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,12 +214,12 @@ export default class BrowserCell extends Component {
214214
//#endregion
215215

216216
render() {
217-
let { type, value, hidden, width, current, onSelect, onEditChange, setCopyableValue, setRelation, onPointerClick, row, col, field, onEditSelectedRow, readonly } = this.props;
217+
let { type, value, hidden, width, current, onSelect, onEditChange, setCopyableValue, setRelation, onPointerClick, row, col, field, onEditSelectedRow, readonly, isRequired } = this.props;
218218
let content = value;
219219
this.copyableValue = content;
220220
let classes = [styles.cell, unselectable];
221221
if (hidden) {
222-
content = '(hidden)';
222+
content = row < 0 && isRequired ? '(required)' : '(hidden)';
223223
classes.push(styles.empty);
224224
} else if (value === undefined) {
225225
if (type === 'ACL') {
@@ -228,6 +228,8 @@ export default class BrowserCell extends Component {
228228
this.copyableValue = content = '(undefined)';
229229
classes.push(styles.empty);
230230
}
231+
content = row < 0 && isRequired ? '(required)' : content;
232+
row < 0 && classes.push(styles.empty);
231233
} else if (value === null) {
232234
this.copyableValue = content = '(null)';
233235
classes.push(styles.empty);

src/components/BrowserRow/BrowserRow.react.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ export default class BrowserRow extends Component {
5858
hidden = true;
5959
}
6060
}
61+
let isRequired = columns[name].required;
6162
return (
6263
<BrowserCell
6364
key={name}
@@ -80,6 +81,7 @@ export default class BrowserRow extends Component {
8081
objectId={obj.id}
8182
value={attr}
8283
hidden={hidden}
84+
isRequired={isRequired}
8385
setCopyableValue={setCopyableValue}
8486
setContextMenu={setContextMenu}
8587
onEditSelectedRow={onEditSelectedRow} />

src/components/DataBrowserHeader/DataBrowserHeader.react.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const dataBrowserHeaderSource = {
5454
}))
5555
class DataBrowserHeader extends React.Component {
5656
render() {
57-
let { connectDragSource, connectDropTarget, name, type, targetClass, order, style, isDragging, isOver, required } = this.props;
57+
let { connectDragSource, connectDropTarget, name, type, targetClass, order, style, isDragging, isOver } = this.props;
5858
let classes = [styles.header, unselectable];
5959
if (order) {
6060
classes.push(styles[order]);
@@ -67,7 +67,7 @@ class DataBrowserHeader extends React.Component {
6767
}
6868
return connectDragSource(connectDropTarget(
6969
<div className={classes.join(' ')} style={style}>
70-
<div className={styles.name}>{name} {required && <span>*</span>}</div>
70+
<div className={styles.name}>{name}</div>
7171
<div className={styles.type}>{targetClass ? `${type} <${targetClass}>` : type}</div>
7272
</div>
7373
));

src/components/DataBrowserHeader/DataBrowserHeader.scss

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,15 @@
2020
}
2121

2222
.name {
23-
position: relative;
2423
color: white;
2524
font-size: 12px;
2625
height: 22px;
2726
line-height: 22px;
28-
padding-right: 8px;
27+
margin-right: 8px;
2928
float: left;
3029
max-width: 100%;
3130
overflow: hidden;
3231
text-overflow: ellipsis;
33-
& span {
34-
position: absolute;
35-
top: -6px;
36-
right: 0;
37-
}
3832
}
3933

4034
.type {
@@ -44,7 +38,6 @@
4438
line-height: 22px;
4539
overflow: hidden;
4640
text-overflow: ellipsis;
47-
margin-left: 8px;
4841
}
4942

5043
.ascending {

src/components/DataBrowserHeaderBar/DataBrowserHeaderBar.react.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default class DataBrowserHeaderBar extends React.Component {
2727
</div>
2828
];
2929

30-
headers.forEach(({ width, name, type, targetClass, order, visible, preventSort, required }, i) => {
30+
headers.forEach(({ width, name, type, targetClass, order, visible, preventSort }, i) => {
3131
if (!visible) return;
3232
let wrapStyle = { width };
3333
if (i % 2) {
@@ -57,7 +57,6 @@ export default class DataBrowserHeaderBar extends React.Component {
5757
targetClass={targetClass}
5858
order={order}
5959
index={i}
60-
required={required}
6160
moveDataBrowserHeader={this.props.handleDragDrop}/>
6261
</div>
6362
);

0 commit comments

Comments
 (0)