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

ui improvements on event trigger update columns (close #1257) #1259

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 3 commits into from
Jan 3, 2019
Merged

ui improvements on event trigger update columns (close #1257) #1259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99c4dae
UI improvement on event trigger update columns, fix #1257
surendran82 Dec 21, 2018
48f859b
added column type in modify trigger tab
arvi3411301 Jan 2, 2019
86ce8ac
Merge branch 'master' into issue-1257
arvi3411301 Jan 2, 2019
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
12 changes: 6 additions & 6 deletions console/src/components/Services/EventTrigger/Add/AddTrigger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,9 @@ class AddTrigger extends Component {
return (
<div
key={i}
className={styles.display_inline + ' ' + styles.add_mar_right}
className={styles.noPadd + ' col-md-4'}
>
<div className="checkbox">
<div className={'checkbox '}>
<label>
{inputHtml}
{column}
Expand All @@ -295,7 +295,7 @@ class AddTrigger extends Component {
</OverlayTrigger>{' '}
</h4>
{selectedOperations.update ? (
<div>{getColumnList('update')}</div>
<div className={styles.clearBoth + ' ' + styles.listenColumnWrapper}> {getColumnList('update')} </div>
) : (
<div>
<div
Expand Down Expand Up @@ -671,12 +671,12 @@ class AddTrigger extends Component {
' ' +
styles.add_mar_bottom +
' ' +
styles.add_mar_top
styles.add_mar_top + ' ' + styles.wd100
}
>
{tableName ? advancedColumnSection : null}
<div
className={styles.add_mar_bottom + ' ' + styles.add_mar_top}
className={styles.add_mar_bottom + ' ' + styles.add_mar_top + ' ' + styles.wd100}
>
<h4 className={styles.subheading_text}>Retry Logic</h4>
<div
Expand Down Expand Up @@ -725,7 +725,7 @@ class AddTrigger extends Component {
</div>
</div>
<div
className={styles.add_mar_bottom + ' ' + styles.add_mar_top}
className={styles.add_mar_bottom + ' ' + styles.add_mar_top + ' ' + styles.wd100}
>
<h4 className={styles.subheading_text}>Headers</h4>
{heads}
Expand Down
10 changes: 7 additions & 3 deletions console/src/components/Services/EventTrigger/Modify/Modify.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ modifyHeadersCollapsedHeadings {
flex-direction: row;
align-items: center;
flex: 1;
margin: 5px 0;
margin: 10px 0;
input
{
margin-top: 0;
Expand Down Expand Up @@ -295,9 +295,13 @@ modifyHeadersCollapsedHeadings {
}

.tooltipIcon{
padding-left: 5px;
padding-left: 5px;
}

.cursorPointer {
cursor: pointer;
}
}

.addPaddSmall {
padding-left: 5px;
}
10 changes: 6 additions & 4 deletions console/src/components/Services/EventTrigger/Modify/OperationEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,12 @@ class OperationEditor extends React.Component {
type="checkbox"
className={styles.opsCheckboxDisabled}
checked={Boolean(
definition.update.columns.find(c => c === col)
definition.update.columns.find(c => c === col.name)
)}
disabled
/>
{col}
{col.name}
<small className={styles.addPaddSmall}> ({col.type})</small>
</div>
))
) : (
Expand Down Expand Up @@ -147,11 +148,12 @@ class OperationEditor extends React.Component {
}`}
checked={Boolean(
modifyTrigger.definition.update.columns.find(
c => c === col
c => c === col.name
)
)}
/>
{col}
{col.name}
<small className={styles.addPaddSmall}> ({col.type})</small>
</div>
))
) : (
Expand Down
20 changes: 19 additions & 1 deletion console/src/components/Services/EventTrigger/TableCommon/Table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,25 @@
width: 40%;
}
}

.clearBoth
{
clear: both;
}
.wd100
{
width: 100%;
float: left;
clear: both;
}
.noPadd
{
padding-left: 0;
padding-right: 0;
}
.listenColumnWrapper
{
max-width: 700px;
}
.aceBlock {
max-height: 300px;
position: relative;
Expand Down
9 changes: 6 additions & 3 deletions console/src/components/Services/EventTrigger/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,12 @@ const escapeRegExp = string => {
return string.replace(/([.*+?^${}()|[\]\\])/g, '\\$1');
};

const getTableColumns = (tableSchema) => {
const getTableColumns = tableSchema => {
if (tableSchema) {
return tableSchema.columns.map(colObj => colObj.column_name);
return tableSchema.columns.map(colObj => ({
name: colObj.column_name,
type: colObj.udt_name,
}));
}
return [];
};
Expand All @@ -136,5 +139,5 @@ export {
getEdForm,
getIngForm,
escapeRegExp,
getTableColumns
getTableColumns,
};