Skip to content

Commit 68d3497

Browse files
authored
fix: removing prequery optimizely code (#413)
1 parent 1956b9a commit 68d3497

10 files changed

+5
-109
lines changed

packages/catalog-search/src/PrequerySearchSuggestionItem.jsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ import { Link } from 'react-router-dom';
44
import PropTypes from 'prop-types';
55

66
const PrequerySearchSuggestionItem = ({
7-
url, hit, optimizelySuggestionClickHandler,
7+
url, hit,
88
}) => (
99
<Link
1010
to={url}
1111
key={hit.title}
1212
className="prequery-item pr-4 d-flex flex-column"
13-
onClick={() => optimizelySuggestionClickHandler(hit.key)}
1413
>
1514
<div className="d-flex align-items-center justify-content-start">
1615
<Image className="prequery-image mr-2" src={hit.card_image_url} />
@@ -43,7 +42,6 @@ PrequerySearchSuggestionItem.propTypes = {
4342
),
4443
learning_type: PropTypes.string,
4544
}).isRequired,
46-
optimizelySuggestionClickHandler: PropTypes.func.isRequired,
4745
};
4846

4947
export default PrequerySearchSuggestionItem;

packages/catalog-search/src/SearchBox.jsx

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ export const SearchBoxBase = ({
5353
enterpriseSlug,
5454
suggestionSubmitOverride,
5555
disableSuggestionRedirect,
56-
isPreQueryEnabled,
57-
optimizelySuggestionClickHandler,
5856
}) => {
5957
const { dispatch, trackingName } = useContext(SearchContext);
6058

@@ -122,8 +120,8 @@ export const SearchBoxBase = ({
122120
// If there are no results of the suggested search, hide the empty suggestion component
123121
setShowSuggestions(false);
124122
}
125-
// If isPreQueryEnabled is true display the prequery results when user clicks on search box but has not began typing
126-
} else if (query === '' && isPreQueryEnabled) {
123+
// Display the prequery results when user clicks on search box but has not began typing
124+
} else if (query === '') {
127125
const { hits } = await index.search(query, {
128126
filters,
129127
attributesToHighlight: ['title'],
@@ -200,7 +198,6 @@ export const SearchBoxBase = ({
200198
handleSubmit={() => handleSubmit(searchQuery)}
201199
handleSuggestionClickSubmit={hit => handleSuggestionSubmit(hit)}
202200
disableSuggestionRedirect={disableSuggestionRedirect}
203-
optimizelySuggestionClickHandler={optimizelySuggestionClickHandler}
204201
/>
205202
)}
206203
</div>
@@ -218,8 +215,6 @@ SearchBoxBase.propTypes = {
218215
enterpriseSlug: PropTypes.string,
219216
suggestionSubmitOverride: PropTypes.func,
220217
disableSuggestionRedirect: PropTypes.bool,
221-
isPreQueryEnabled: PropTypes.bool,
222-
optimizelySuggestionClickHandler: PropTypes.func,
223218
};
224219

225220
SearchBoxBase.defaultProps = {
@@ -233,8 +228,6 @@ SearchBoxBase.defaultProps = {
233228
index: undefined,
234229
suggestionSubmitOverride: undefined,
235230
disableSuggestionRedirect: false,
236-
isPreQueryEnabled: false,
237-
optimizelySuggestionClickHandler: undefined,
238231
};
239232

240233
export default connectSearchBox(SearchBoxBase);

packages/catalog-search/src/SearchHeader.jsx

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ const SearchHeader = ({
2323
suggestionSubmitOverride,
2424
enterpriseConfig: { slug, enablePathways },
2525
disableSuggestionRedirect,
26-
optimizelySuggestionClickHandler,
27-
isPreQueryEnabled,
2826
hideSearchBox,
2927
}) => {
3028
const { refinements } = useContext(SearchContext);
@@ -61,8 +59,6 @@ const SearchHeader = ({
6159
enterpriseSlug={slug}
6260
suggestionSubmitOverride={suggestionSubmitOverride}
6361
disableSuggestionRedirect={disableSuggestionRedirect}
64-
isPreQueryEnabled={isPreQueryEnabled}
65-
optimizelySuggestionClickHandler={optimizelySuggestionClickHandler}
6662
/>
6763
)}
6864
</Col>
@@ -89,8 +85,6 @@ SearchHeader.defaultProps = {
8985
suggestionSubmitOverride: undefined,
9086
disableSuggestionRedirect: false,
9187
index: undefined,
92-
optimizelySuggestionClickHandler: undefined,
93-
isPreQueryEnabled: false,
9488
hideSearchBox: false,
9589
};
9690

@@ -105,15 +99,10 @@ SearchHeader.propTypes = {
10599
{
106100
slug: PropTypes.string,
107101
enablePathways: PropTypes.bool,
108-
enterpriseFeatures: PropTypes.shape({
109-
featurePrequerySearchSuggestions: PropTypes.bool,
110-
}),
111102
},
112103
),
113104
suggestionSubmitOverride: PropTypes.func,
114105
disableSuggestionRedirect: PropTypes.bool,
115-
optimizelySuggestionClickHandler: PropTypes.func,
116-
isPreQueryEnabled: PropTypes.bool,
117106
hideSearchBox: PropTypes.bool,
118107
};
119108

packages/catalog-search/src/SearchSuggestionItem.jsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
33
import PropTypes from 'prop-types';
44

55
const SearchSuggestionItem = ({
6-
url, suggestionItemHandler, hit, disableSuggestionRedirect, optimizelySuggestionClickHandler,
6+
url, suggestionItemHandler, hit, disableSuggestionRedirect,
77
}) => {
88
const authoringOrganization = hit.key && hit.key.split('+')[0];
99
// If the disable redirect bool is provided, prevent the redirect from happening and instead call the provided submit
@@ -13,7 +13,6 @@ const SearchSuggestionItem = ({
1313
e.preventDefault();
1414
suggestionItemHandler(hit);
1515
}
16-
optimizelySuggestionClickHandler(hit.key || hit.course_keys);
1716
};
1817
return (
1918
<Link to={url} key={hit.title} className="suggestion-item" onClick={handleLinkDisable}>
@@ -57,12 +56,10 @@ SearchSuggestionItem.propTypes = {
5756
learning_type: PropTypes.string,
5857
}).isRequired,
5958
disableSuggestionRedirect: PropTypes.bool.isRequired,
60-
optimizelySuggestionClickHandler: PropTypes.func,
6159
};
6260

6361
SearchSuggestionItem.defaultProps = {
6462
suggestionItemHandler: undefined,
65-
optimizelySuggestionClickHandler: undefined,
6663
};
6764

6865
export default SearchSuggestionItem;

packages/catalog-search/src/SearchSuggestions.jsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ const SearchSuggestions = ({
1717
handleSubmit,
1818
handleSuggestionClickSubmit,
1919
disableSuggestionRedirect,
20-
optimizelySuggestionClickHandler,
2120
}) => {
2221
const getLinkToCourse = (course) => {
2322
const { learning_type: learningType } = course;
@@ -71,7 +70,6 @@ const SearchSuggestions = ({
7170
key={hit.title}
7271
url={getUrl(hit)}
7372
hit={hit}
74-
optimizelySuggestionClickHandler={optimizelySuggestionClickHandler}
7573
/>
7674
);
7775
})
@@ -96,7 +94,6 @@ const SearchSuggestions = ({
9694
hit={hit}
9795
disableSuggestionRedirect={disableSuggestionRedirect}
9896
suggestionItemHandler={handleSuggestionClickSubmit}
99-
optimizelySuggestionClickHandler={optimizelySuggestionClickHandler}
10097
/>
10198
))
10299
}
@@ -120,7 +117,6 @@ const SearchSuggestions = ({
120117
hit={hit}
121118
disableSuggestionRedirect={disableSuggestionRedirect}
122119
suggestionItemHandler={handleSuggestionClickSubmit}
123-
optimizelySuggestionClickHandler={optimizelySuggestionClickHandler}
124120
/>
125121
))
126122
}
@@ -144,7 +140,6 @@ const SearchSuggestions = ({
144140
hit={hit}
145141
disableSuggestionRedirect={disableSuggestionRedirect}
146142
suggestionItemHandler={handleSuggestionClickSubmit}
147-
optimizelySuggestionClickHandler={optimizelySuggestionClickHandler}
148143
/>
149144
))
150145
}
@@ -172,7 +167,6 @@ SearchSuggestions.propTypes = {
172167
handleSuggestionClickSubmit: PropTypes.func,
173168
disableSuggestionRedirect: PropTypes.bool,
174169
preQueryHits: PropTypes.arrayOf(PropTypes.shape()),
175-
optimizelySuggestionClickHandler: PropTypes.func,
176170
};
177171

178172
SearchSuggestions.defaultProps = {
@@ -181,7 +175,6 @@ SearchSuggestions.defaultProps = {
181175
handleSuggestionClickSubmit: undefined,
182176
disableSuggestionRedirect: false,
183177
preQueryHits: undefined,
184-
optimizelySuggestionClickHandler: undefined,
185178
};
186179

187180
export default SearchSuggestions;

packages/catalog-search/src/tests/PrequerySearchSuggestionItem.test.jsx

Lines changed: 0 additions & 36 deletions
This file was deleted.

packages/catalog-search/src/tests/SearchBox.test.jsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ describe('<SearchBox />', () => {
131131
});
132132
test('search box renders search suggestion and can override redirect', async () => {
133133
const suggestionSubmitOverride = jest.fn();
134-
const optimizelySuggestionClickHandler = jest.fn();
135134
SearchBoxBase.handleSuggestionSubmit = jest.fn();
136135
const hits = [
137136
{ learning_type: 'course', _highlightResult: { title: { value: 'test-title' } } },
@@ -150,7 +149,6 @@ describe('<SearchBox />', () => {
150149
index={index}
151150
suggestionSubmitOverride={suggestionSubmitOverride}
152151
disableSuggestionRedirect
153-
optimizelySuggestionClickHandler={optimizelySuggestionClickHandler}
154152
/>,
155153
);
156154

@@ -163,7 +161,6 @@ describe('<SearchBox />', () => {
163161
await act(async () => {
164162
userEvent.click(screen.getByText('test-title'));
165163
});
166-
expect(optimizelySuggestionClickHandler).toHaveBeenCalled();
167164
expect(suggestionSubmitOverride).toHaveBeenCalledWith(
168165
{ learning_type: 'course', _highlightResult: { title: { value: 'test-title' } } },
169166
);

packages/catalog-search/src/tests/SearchHeader.test.jsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ jest.mock('../SearchFilters', () => ({
2121
}));
2222
const enterpriseConfig = {
2323
slug: 'test-enterprise',
24-
enterpriseFeatures: {
25-
featurePrequerySearchSuggestions: true,
26-
},
2724
};
2825
describe('SearchHeader', () => {
2926
test('displays a SearchBox', () => {

packages/catalog-search/src/tests/SearchSuggestionItem.test.jsx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ describe('<SeachSuggestionItem />', () => {
1717
title: 'test-course',
1818
_highlightResult: { title: { value: '<em>course</em> <em>catalog</em>' } },
1919
},
20-
optimizelySuggestionClickHandler: jest.fn(),
2120
},
2221
};
2322

@@ -26,7 +25,6 @@ describe('<SeachSuggestionItem />', () => {
2625
suggestionItemHandler={mockData.course.suggestionItemHandler}
2726
hit={mockData.course.hit}
2827
disableSuggestionRedirect={mockData.course.disableSuggestionRedirect}
29-
optimizelySuggestionClickHandler={mockData.optimizelySuggestionClickHandler}
3028
/>);
3129
expect(screen.getByRole('link', { name: 'course catalog edX' })).not.toBeNull();
3230
expect(screen.getByText('course')).not.toBeNull();
@@ -48,15 +46,13 @@ describe('<SeachSuggestionItem />', () => {
4846
_highlightResult: { title: { value: '<em>program</em> <em>catalog</em>' } },
4947
},
5048
},
51-
optimizelySuggestionClickHandler: jest.fn(),
5249
};
5350

5451
renderWithRouter(<SearchSuggestionItem
5552
url={mockData.program.url}
5653
suggestionItemHandler={mockData.program.suggestionItemHandler}
5754
hit={mockData.program.hit}
5855
disableSuggestionRedirect={mockData.program.disableSuggestionRedirect}
59-
optimizelySuggestionClickHandler={mockData.optimizelySuggestionClickHandler}
6056
/>);
6157
expect(screen.getByRole('link', { name: 'program catalog edX Professional Program' })).not.toBeNull();
6258
expect(screen.getByText('program')).not.toBeNull();
@@ -79,19 +75,16 @@ describe('<SeachSuggestionItem />', () => {
7975
_highlightResult: { title: { value: '<em>program</em> <em>catalog</em>' } },
8076
},
8177
},
82-
optimizelySuggestionClickHandler: jest.fn(),
8378
};
8479

8580
const { container } = renderWithRouter(<SearchSuggestionItem
8681
url={mockData.program.url}
8782
suggestionItemHandler={mockData.program.suggestionItemHandler}
8883
hit={mockData.program.hit}
8984
disableSuggestionRedirect={mockData.program.disableSuggestionRedirect}
90-
optimizelySuggestionClickHandler={mockData.optimizelySuggestionClickHandler}
9185
/>);
9286
userEvent.click(container.getElementsByClassName('suggestion-item')[0]);
9387
expect(window.location.pathname).toBe(mockData.program.url);
94-
expect(mockData.optimizelySuggestionClickHandler.mock.calls.length).toBe(1);
9588
});
9689

9790
test('fires callback on click if disableSuggestionRedirect is true', () => {
@@ -108,18 +101,15 @@ describe('<SeachSuggestionItem />', () => {
108101
_highlightResult: { title: { value: '<em>program</em> <em>catalog</em>' } },
109102
},
110103
},
111-
optimizelySuggestionClickHandler: jest.fn(),
112104
};
113105

114106
const { container } = renderWithRouter(<SearchSuggestionItem
115107
url={mockData.program.url}
116108
suggestionItemHandler={mockData.program.suggestionItemHandler}
117109
hit={mockData.program.hit}
118110
disableSuggestionRedirect={mockData.program.disableSuggestionRedirect}
119-
optimizelySuggestionClickHandler={mockData.optimizelySuggestionClickHandler}
120111
/>);
121112
userEvent.click(container.getElementsByClassName('suggestion-item')[0]);
122113
expect(mockData.program.suggestionItemHandler).toHaveBeenCalledWith(mockData.program.hit);
123-
expect(mockData.optimizelySuggestionClickHandler.mock.calls.length).toBe(1);
124114
});
125115
});

0 commit comments

Comments
 (0)