-
Notifications
You must be signed in to change notification settings - Fork 358
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.
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
[WIP]Expression editor conversion from HAML to React #8944
Open
amalvijayan03
wants to merge
1
commit into
ManageIQ:master
Choose a base branch
from
amalvijayan03:expression-editor
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
48 changes: 48 additions & 0 deletions
48
app/javascript/components/visual-settings-form/expression-editor/expression-editor-style.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
.edit-expression-container { | ||
border: 1px solid #ccc; | ||
padding: 20px; | ||
margin: 10px; | ||
border-radius: 4px; | ||
background-color: #f5f5f5; | ||
} | ||
|
||
.edit-expression-title { | ||
font-size: 24px; | ||
font-weight: bold; | ||
margin-bottom: 10px; | ||
} | ||
|
||
.edit-expression-button { | ||
margin-right: 10px; | ||
padding: 10px 20px; | ||
background-color: #0073e6; | ||
color: #fff; | ||
border: none; | ||
border-radius: 4px; | ||
cursor: pointer; | ||
transition: background-color 0.3s ease; | ||
} | ||
|
||
.edit-expression-button:hover { | ||
background-color: #0057b3; | ||
} | ||
|
||
.edit-expression-textarea { | ||
padding: 10px; | ||
color: blue; | ||
} | ||
|
||
.edit-expression-button-secondary { | ||
margin-right: 10px; | ||
padding: 10px 20px; | ||
background-color: #eee; | ||
color: #333; | ||
border: none; | ||
border-radius: 4px; | ||
cursor: pointer; | ||
transition: background-color 0.3s ease; | ||
} | ||
|
||
.edit-expression-button-secondary:hover { | ||
background-color: #ddd; | ||
} |
96 changes: 96 additions & 0 deletions
96
app/javascript/components/visual-settings-form/expression-editor/helpers/constants.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,96 @@ | ||
export const ExprCondition = [ | ||
{ id: 'expr', label: 'Expression' }, | ||
]; | ||
|
||
export const FieldItems = [ | ||
{ id: 'field', label: 'field' }, | ||
]; | ||
|
||
export const EventItems = [ | ||
{ id: '1', label: 'EVM Audit Event:Date Created' }, | ||
{ id: '2', label: 'EVM Audit Event:Event' }, | ||
{ id: '3', label: 'EVM Audit Event:Href Slug' }, | ||
{ id: '4', label: 'EVM Audit Event:Id' }, | ||
{ id: '5', label: 'EVM Audit Event:Message' }, | ||
{ id: '6', label: 'EVM Audit Event:Region Description' }, | ||
{ id: '7', label: 'EVM Audit Event:Region Number' }, | ||
{ id: '8', label: 'EVM Audit Event:Severity' }, | ||
{ id: '9', label: 'EVM Audit Event:Source' }, | ||
]; | ||
|
||
export const ConstraintTexts = [ | ||
{ id: 'is', label: 'IS' }, | ||
{ id: 'before', label: 'BEFORE' }, | ||
{ id: 'after', label: 'AFTER' }, | ||
{ id: 'from', label: 'FROM' }, | ||
{ id: 'isempty', label: 'IS EMPTY' }, | ||
{ id: 'isnotempty', label: 'IS NOT EMPTY' }, | ||
]; | ||
|
||
export const DateParameters = [ | ||
{ id: 'choose', label: '<choose>' }, | ||
{ id: 'thishour', label: 'This Hour' }, | ||
{ id: 'lasthour', label: 'Last Hour' }, | ||
{ id: '2hoursago', label: '2 Hours Ago' }, | ||
{ id: '3hoursago', label: '3 Hours Ago' }, | ||
{ id: '4hoursago', label: '4 Hours Ago' }, | ||
{ id: '5hoursago', label: '5 Hours Ago' }, | ||
{ id: '6hoursago', label: '6 Hours Ago' }, | ||
{ id: '7hoursago', label: '7 Hours Ago' }, | ||
{ id: '8hoursago', label: '8 Hours Ago' }, | ||
{ id: '9hoursago', label: '9 Hours Ago' }, | ||
{ id: '10hoursago', label: '10 Hours Ago' }, | ||
{ id: '11hoursago', label: '11 Hours Ago' }, | ||
{ id: '12hoursago', label: '12 Hours Ago' }, | ||
{ id: '13hoursago', label: '13 Hours Ago' }, | ||
{ id: '14hoursago', label: '14 Hours Ago' }, | ||
{ id: '15hoursago', label: '15 Hours Ago' }, | ||
{ id: '16hoursago', label: '16 Hours Ago' }, | ||
{ id: '17hoursago', label: '17 Hours Ago' }, | ||
{ id: '18hoursago', label: '18 Hours Ago' }, | ||
{ id: '19hoursago', label: '19 Hours Ago' }, | ||
{ id: '20hoursago', label: '20 Hours Ago' }, | ||
{ id: '21hoursago', label: '21 Hours Ago' }, | ||
{ id: '22hoursago', label: '22 Hours Ago' }, | ||
{ id: '23hoursago', label: '23 Hours Ago' }, | ||
{ id: 'today', label: 'Today' }, | ||
{ id: 'yesterday', label: 'Yesterday' }, | ||
{ id: '2dayssgo', label: '2 Days Ago' }, | ||
{ id: '3dayssgo', label: '3 Days Ago' }, | ||
{ id: '5dayssgo', label: '4 Days Ago' }, | ||
{ id: '6dayssgo', label: '5 Days Ago' }, | ||
{ id: '7dayssgo', label: '6 Days Ago' }, | ||
{ id: '14dayssgo', label: '7 Days Ago' }, | ||
{ id: 'thisweek', label: 'This Week' }, | ||
{ id: 'lastweek', label: 'Last Week' }, | ||
{ id: '2weeksago', label: 'Two Weeks Ago' }, | ||
{ id: '3weeksago', label: 'Three Weeks Ago' }, | ||
{ id: '4weeksago', label: 'Four Weeks Ago' }, | ||
{ id: 'thismonth', label: 'This Month' }, | ||
{ id: 'lastmonth', label: 'Last Month' }, | ||
{ id: '2monthsago', label: '2 Months Ago' }, | ||
{ id: '3monthsago', label: '3 Months Ago' }, | ||
{ id: '4monthsago', label: '4 Months Ago' }, | ||
{ id: '6monthsago', label: '6 Months Ago' }, | ||
{ id: 'thisquarter', label: 'This Quarter' }, | ||
{ id: 'lastquarter', label: 'Last Quarter' }, | ||
{ id: 'thisyear', label: 'This Year' }, | ||
{ id: 'lastyear', label: 'Last Year' }, | ||
{ id: '2yearago', label: 'Two Year Ago' }, | ||
{ id: '3yearago', label: 'Three Year Ago' }, | ||
{ id: '4yearago', label: 'Four Year Ago' }, | ||
]; | ||
|
||
export const InputParameters = [ | ||
{ id: 'choose', label: '<choose>' }, | ||
{ id: 'equal', label: '=' }, | ||
{ id: 'startswith', label: 'STARTS WITH' }, | ||
{ id: 'endswith', label: 'ENDS WITH' }, | ||
{ id: 'include', label: 'INCLUDE' }, | ||
{ id: 'isnull', label: 'IS NULL' }, | ||
{ id: 'isnotnull', label: 'IS NOT NULL' }, | ||
{ id: 'isempty', label: 'IS EMPTY' }, | ||
{ id: 'isnotempty', label: 'IS NOT EMPTY' }, | ||
{ id: 'regexmatches', label: 'REGULAR EXPRESSION MATCHES' }, | ||
{ id: 'regexdoesnotmatches', label: 'REGULAR EXPRESSION DOES NOT MATCH' }, | ||
] |
253 changes: 253 additions & 0 deletions
253
app/javascript/components/visual-settings-form/expression-editor/index.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,253 @@ | ||
import React, { useState } from 'react'; | ||
import { | ||
Dropdown, | ||
Button, | ||
Checkbox, | ||
Form, | ||
} from 'carbon-components-react'; | ||
import { | ||
ExprCondition, | ||
FieldItems, | ||
EventItems, | ||
ConstraintTexts, | ||
DateParameters, | ||
InputParameters, | ||
} from './helpers/constants.js'; | ||
import './expression-editor-style.css'; | ||
|
||
const ExpressionLabels = { | ||
newElement: "<new element>", | ||
} | ||
|
||
const ExpressionEditor = () => { | ||
const [data, setData] = useState({ | ||
selectedCondition: undefined, | ||
isComponentVisible: false, | ||
isEditSelectedComponentVisible: true, | ||
isEventVisible: false, | ||
selectedField: undefined, | ||
selectedEvent: undefined, | ||
selectedConstraint: undefined, | ||
selectedDateParam: undefined, | ||
selectedInputParam: undefined, | ||
buttonsEnabled: false, | ||
textFieldButtonCount: 1, | ||
combinedString: ExpressionLabels.newElement, | ||
labelStack: [ExpressionLabels.newElement], | ||
labelStackIndex: 0, | ||
conditionalButtonsDisabled:true, | ||
}); | ||
|
||
const DropDownLabels = { | ||
expression: 'expression', | ||
field: 'field', | ||
event: 'event', | ||
constraint: 'constraint', | ||
date: 'date', | ||
input: 'input', | ||
} | ||
|
||
// Function to reset the form and clear state variables | ||
const resetForm = () => { | ||
setData({ | ||
...data, | ||
selectedCondition: undefined, | ||
isEventVisible: false, | ||
selectedField: undefined, | ||
selectedEvent: undefined, | ||
selectedDateParam: undefined, | ||
selectedConstraint: undefined, | ||
selectedInputParam: undefined, | ||
}) | ||
}; | ||
|
||
// Update labelStack and reset combinedString | ||
const updateLabelStack = (newLabelStack, enableConditionalButtons) => { | ||
setData({ | ||
...data, | ||
labelStack: newLabelStack, | ||
combinedString: ExpressionLabels.newElement, // Reset combinedString | ||
conditionalButtonsDisabled: false, // Enable conditional buttons | ||
}); | ||
}; | ||
|
||
/** Function to render the buttons in toolbar */ | ||
const renderToolBarButtons = () => (<> | ||
<Button className='undo' size='sm' >Undo</Button> | ||
<Button className='redo' size='sm' >Redo</Button> | ||
<Button className='cancel' kind='secondary' size='sm'>Cancel</Button> | ||
</>); | ||
|
||
/** Function to render the conditional buttons in the editor. */ | ||
const renderConditionalButtons = () => (<> | ||
<Button className='and' disabled={data.conditionalButtonsDisabled} >and</Button> | ||
<Button className='or' disabled={data.conditionalButtonsDisabled} >or</Button> | ||
<Button className='not' disabled={data.conditionalButtonsDisabled} >not</Button> | ||
</>); | ||
|
||
/** Function to handle the drop down button change events. */ | ||
const handleDropDownChange = (name, {selectedItem}) => { | ||
const value = selectedItem; | ||
console.log('value=', value); | ||
const {expression, field, event, constraint, date, input} = DropDownLabels; | ||
switch(name){ | ||
case expression: | ||
return { selectedCondition: value, isComponentVisible: true, }; | ||
case field: | ||
return { selectedField: value, isEventVisible: true }; | ||
case event: | ||
return { selectedEvent: value }; | ||
case constraint: | ||
return { selectedConstraint: value }; | ||
case date: | ||
return { selectedDateParam: value }; | ||
case input: | ||
return { selectedInputParam: value }; | ||
default: | ||
return {}; | ||
} | ||
} | ||
|
||
// Handle label click to display a new label | ||
const handleLabelClick = (index) => { | ||
const newLabelStack = data.labelStack.slice(0, index + 1); | ||
console.log('label clicked') | ||
console.log('newLabelStack=',newLabelStack) | ||
setData({ | ||
...data, | ||
labelStack: newLabelStack, | ||
conditionalButtonsDisabled:false, | ||
}); | ||
}; | ||
|
||
const dropDownOnChange = (name, value) => { | ||
const newData = handleDropDownChange(name, value); | ||
setData({ | ||
...data, | ||
...newData, | ||
}) | ||
} | ||
|
||
const renderDropDown = (name, items, selectedItem) => { | ||
return ( | ||
<Dropdown | ||
className={`${name}-dropdown`} | ||
id={`${name}-dropdown`} | ||
label='<Choose>' | ||
items={items} | ||
selectedItem={selectedItem ? selectedItem.label : undefined} | ||
onChange={(value) => dropDownOnChange(name, value)} | ||
/> | ||
); | ||
} | ||
|
||
const renderActionButtons = () => (<> | ||
<Button className='commit' size='md' onClick={handleCommitClick}>Commit</Button> | ||
<Button className='discard' kind='secondary' size='md' onClick={resetForm}>Discard</Button> | ||
</>) | ||
|
||
const isSelectedFieldValid = (data) => { | ||
return data.selectedField && data.selectedField.label === 'field'; | ||
} | ||
const isSelectedEventValid = (data) => { | ||
return data.isEventVisible && data.selectedEvent && data.selectedEvent.label === 'EVM Audit Event:Date Created' | ||
} | ||
|
||
// Handle commit button click | ||
const handleCommitClick = () => { | ||
const { | ||
selectedEvent, | ||
selectedConstraint, | ||
selectedDateParam, | ||
selectedInputParam, | ||
} = data; | ||
|
||
const combinedString = ` ${selectedEvent ? selectedEvent.label : ''} ${selectedConstraint ? selectedConstraint.label : ''} "${selectedDateParam ? selectedDateParam.label : ''}" ${selectedInputParam ? selectedInputParam.label : ''}`; | ||
console.log('Combined Selected Items=', combinedString); | ||
const newLabelStack = [...data.labelStack, combinedString]; | ||
console.log(newLabelStack,"newLabelStack") | ||
setData({ | ||
...data, | ||
combinedString, | ||
label:combinedString, | ||
labelStack:newLabelStack, | ||
}); | ||
}; | ||
|
||
// Render labels conditionally | ||
const renderLabels = () => { | ||
if (data.combinedString === ExpressionLabels.newElement) { | ||
return ( | ||
<label className='selected-item' key={0}> | ||
{data.combinedString} | ||
</label> | ||
); | ||
} else { | ||
return data.labelStack.map((label, index) => ( | ||
<label | ||
className='selected-item' | ||
key={index} | ||
onClick={() => handleLabelClick(index)} | ||
> | ||
{label} | ||
</label> | ||
)); | ||
} | ||
}; | ||
|
||
return ( | ||
<div> | ||
<div className='div-dummy-drop-down'> | ||
{ renderDropDown(DropDownLabels.expression, ExprCondition, data.selectedCondition) } | ||
</div> | ||
{data.isComponentVisible && ( | ||
<div> | ||
<div className='edit-expression-container'> | ||
<h1>Edit Expression</h1> | ||
<br /> | ||
<div className='edit-exp-opr-btn'> | ||
{ renderToolBarButtons() } | ||
</div> | ||
<br /> | ||
| ||
{renderLabels()} | ||
<br /> | ||
<div className='edit-exp-cond-btn'> | ||
<label>Add a condition:</label> | ||
<br /> | ||
</div> | ||
<br />{ renderConditionalButtons() } | ||
</div> | ||
<br /> | ||
{ data.isEditSelectedComponentVisible &&( | ||
<> | ||
<div className='edit-expression-container'> | ||
<h1>Edit Selected Element</h1> | ||
<Form> | ||
{ renderDropDown('field', FieldItems, data.selectedField) } | ||
<Checkbox labelText={`User will input the value`} id='user-input' /> | ||
<br /> | ||
{ isSelectedFieldValid(data) && (renderDropDown(DropDownLabels.event, EventItems, data.selectedEvent)) } | ||
{ isSelectedEventValid(data) && ( | ||
<> | ||
{renderDropDown(DropDownLabels.constraint, ConstraintTexts, data.selectedConstraint)} | ||
{renderDropDown(DropDownLabels.date, DateParameters, data.selectedDateParam)} | ||
</> | ||
)} | ||
{data.isEventVisible && data.selectedEvent && data.selectedEvent.label !== 'EVM Audit Event:Date Created' && ( | ||
renderDropDown(DropDownLabels.input, InputParameters, data.selectedInputParam) | ||
)} | ||
{ renderActionButtons() } | ||
</Form> | ||
</div> | ||
</> | ||
)} | ||
</div> | ||
)} | ||
<br /> | ||
<div className='input-param'>{/* TBD Input parameters section */}</div> | ||
</div> | ||
); | ||
}; | ||
|
||
export default ExpressionEditor; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
maybe we can reuse this -
app/helpers/view_helper.rb