这是indexloc提供的服务，不要输入任何密码
Skip to content

add tooltip for upsert option under custom permissions (fix #546) #566

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
Oct 2, 2018
Merged

add tooltip for upsert option under custom permissions (fix #546) #566

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
2 changes: 2 additions & 0 deletions console/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ npm-debug.log
*.swp
coverage
.idea/*
test
**/.tern-port
42 changes: 26 additions & 16 deletions console/src/components/Services/Data/TablePermissions/Permissions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,21 +208,21 @@ class Permissions extends Component {
const bulkSelect = permsState.bulkSelect;
const currentInputSelection = bulkSelect.filter(e => e === role)
.length ? (
<input
onChange={dispatchBulkSelect}
checked="checked"
data-role={role}
className={styles.bulkSelect}
type="checkbox"
/>
) : (
<input
onChange={dispatchBulkSelect}
data-role={role}
className={styles.bulkSelect}
type="checkbox"
/>
);
<input
onChange={dispatchBulkSelect}
checked="checked"
data-role={role}
className={styles.bulkSelect}
type="checkbox"
/>
) : (
<input
onChange={dispatchBulkSelect}
data-role={role}
className={styles.bulkSelect}
type="checkbox"
/>
);
_permissionsRowHtml.push(
<td key={-1}>
<div>
Expand Down Expand Up @@ -420,6 +420,13 @@ class Permissions extends Component {
? permsState.insert.allow_upsert
: false;

// Upsert Tooltip
const upsertToolTip = (
<Tooltip id="tooltip-upsert">
Upsert updates a row if it already exists, otherwise inserts it
</Tooltip>
);

// TODO: Fix the controlled component
_upsertSection = (
<div>
Expand All @@ -433,7 +440,10 @@ class Permissions extends Component {
onClick={e => dispatchToggleAllowUpsert(e.target.checked)}
/>
<span className={styles.mar_left}>
Allow role '{permsState.role}' to make upsert queries
Allow role '{permsState.role}' to make upsert queries &nbsp;
<OverlayTrigger placement="right" overlay={upsertToolTip}>
<i className="fa fa-question-circle" aria-hidden="true" />
</OverlayTrigger>
</span>
</label>
</div>
Expand Down