Skip to content
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

Jump to bottom

feat: migrate props for v4 #331

Open
wants to merge 2 commits into
base: arc
Choose a base branch
from
Open

feat: migrate props for v4 #331

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2704f17
feat: migrate props for v4
SavvyShah Mar 27, 2023
edb2235
Merge branch 'arc' into feat/upgrade-datasearch-to-searchbox
SavvyShah Mar 27, 2023
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
126 changes: 94 additions & 32 deletions components/SearchSandbox/containers/Editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ import multiListTypes from '../utils/multilist-types';
import RSWrapper from '../components/RSWrapper';
import DataFieldInput from '../components/DataFieldInput';
import { getAvailableDataField } from '../utils/dataField';
import { NumberInput, TextInput, DropdownInput, ToggleInput } from '../../shared/Input';
import {
NumberInput,
TextInput,
DropdownInput,
ToggleInput,
} from '../../shared/Input';
import { formWrapper, tagContainer, cardStyle } from '../styles';

const searchRef = React.createRef();
Expand Down Expand Up @@ -57,7 +62,11 @@ export default class Editor extends Component {
handleOk = () => {
// only set to store if dataField is valid
const { mappings } = this.props;
const fields = getAvailableDataField({ id: 'MultiList', component: 'MultiList', mappings });
const fields = getAvailableDataField({
id: 'MultiList',
component: 'MultiList',
mappings,
});
if (fields.length) {
const { filterCount, setFilterCount, onPropChange } = this.props;
const { listComponentProps } = this.state;
Expand Down Expand Up @@ -92,7 +101,7 @@ export default class Editor extends Component {
}));
};

setComponentProps = (newProps) => {
setComponentProps = newProps => {
const { listComponentProps } = this.state;
this.setState({
listComponentProps: {
Expand All @@ -102,7 +111,7 @@ export default class Editor extends Component {
});
};

setRenderKey = (newKey) => {
setRenderKey = newKey => {
this.setState({
renderKey: newKey,
});
Expand All @@ -113,12 +122,18 @@ export default class Editor extends Component {
// always set to default value
const { listComponentProps } = this.state;
const value =
listComponentProps[name] !== undefined ? listComponentProps[name] : item.default;
listComponentProps[name] !== undefined
? listComponentProps[name]
: item.default;

switch (item.input) {
case 'bool': {
FormInput = (
<ToggleInput name={name} value={value} handleChange={this.setComponentProps} />
<ToggleInput
name={name}
value={value}
handleChange={this.setComponentProps}
/>
);
break;
}
Expand Down Expand Up @@ -146,7 +161,11 @@ export default class Editor extends Component {
}
default: {
FormInput = (
<TextInput name={name} value={value} handleChange={this.setComponentProps} />
<TextInput
name={name}
value={value}
handleChange={this.setComponentProps}
/>
);
break;
}
Expand All @@ -164,9 +183,13 @@ export default class Editor extends Component {

renderPropsForm = () => {
const { mappingsURL, mappings } = this.props;
const fields = getAvailableDataField({ id: 'MultiList', component: 'MultiList', mappings });
const fields = getAvailableDataField({
id: 'MultiList',
component: 'MultiList',
mappings,
});
const fieldsOptions = [];
fields.map((field) =>
fields.map(field =>
fieldsOptions.push({
key: field,
label: field,
Expand All @@ -175,9 +198,10 @@ export default class Editor extends Component {
if (!fields.length) {
return (
<p>
There are no compatible fields present in your data mappings.{' '}
<a href={mappingsURL}>You can edit your mappings</a> to add filters
(agggregation components).
There are no compatible fields present in your data
mappings.{' '}
<a href={mappingsURL}>You can edit your mappings</a> to add
filters (agggregation components).
</p>
);
}
Expand All @@ -191,12 +215,18 @@ export default class Editor extends Component {
setComponentProps={this.setComponentProps}
componentProps={listComponentProps}
getAvailableDataField={() =>
getAvailableDataField({ id: 'MultiList', component: 'MultiList', mappings })
getAvailableDataField({
id: 'MultiList',
component: 'MultiList',
mappings,
})
}
/>
{Object.keys(multiListTypes)
.filter((item) => item !== 'dataField')
.map((item) => this.renderFormItem(multiListTypes[item], item))}
.filter(item => item !== 'dataField')
.map(item =>
this.renderFormItem(multiListTypes[item], item),
)}
</Form>
);
};
Expand All @@ -217,7 +247,11 @@ export default class Editor extends Component {
<span>
Search Preview{' '}
{window.innerWidth > 1280 ? (
<Button style={{ float: 'right' }} onClick={this.handleVideoModal} size="small">
<Button
style={{ float: 'right' }}
onClick={this.handleVideoModal}
size="small"
>
Watch Video
</Button>
) : null}
Expand All @@ -228,7 +262,7 @@ export default class Editor extends Component {
app={appName}
credentials={credentials}
url={url}
analytics={analytics}
reactivesearchAPIConfig={{ recordAnalytics: analytics }}
searchStateHeader
>
<Row gutter={16} style={{ padding: 20 }}>
Expand All @@ -245,13 +279,21 @@ export default class Editor extends Component {
</Button>
</Card>
{Object.keys(componentProps)
.filter((item) => item !== 'search' && item !== 'result')
.map((config) => (
<Card className={cardStyle} key={config} style={{ marginTop: 20 }}>
.filter(
item => item !== 'search' && item !== 'result',
)
.map(config => (
<Card
className={cardStyle}
key={config}
style={{ marginTop: 20 }}
>
<RSWrapper
id={config}
component="MultiList"
componentProps={componentProps[config] || {}}
componentProps={
componentProps[config] || {}
}
onDelete={deleteComponent}
full
/>
Expand All @@ -262,40 +304,57 @@ export default class Editor extends Component {
<Card className={cardStyle}>
<RSWrapper
id="search"
component={useCategorySearch ? 'CategorySearch' : 'DataSearch'}
component={
useCategorySearch
? 'CategorySearch'
: 'DataSearch'
}
searchRef={searchRef}
componentProps={componentProps.search || {}}
/>
</Card>

<Card className={cardStyle}>
<SelectedFilters
render={(props) => {
const { selectedValues, setValue, clearValues, components } =
props;
const clearFilter = (component) => {
render={props => {
const {
selectedValues,
setValue,
clearValues,
components,
} = props;
const clearFilter = component => {
setValue(component, null);
};

const filters = Object.keys(selectedValues).map((component) => {
const filters = Object.keys(
selectedValues,
).map(component => {
if (!components.includes(component)) {
return null;
}

if (
!selectedValues[component].value ||
selectedValues[component].value.length === 0
selectedValues[component].value
.length === 0
)
return null;
const value = `${component} : ${selectedValues[component].value}`;

return (
<SelectedTag
className="tag"
onClick={() => clearFilter(component, null)}
onClick={() =>
clearFilter(component, null)
}
key={component}
>
<span dangerouslySetInnerHTML={{ __html: value }} />
<span
dangerouslySetInnerHTML={{
__html: value,
}}
/>
<span>&nbsp; &#x2715;</span>
</SelectedTag>
);
Expand Down Expand Up @@ -328,8 +387,11 @@ export default class Editor extends Component {
? {
...componentProps.result,
react: {
and: Object.keys(componentProps).filter(
(item) => item !== 'result',
and: Object.keys(
componentProps,
).filter(
item =>
item !== 'result',
),
},
}
Expand Down