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

[7.16] Fixed curations (#117297) #117341

Merged
merged 1 commit into from
Nov 3, 2021
Merged

[7.16] Fixed curations (#117297) #117341

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
4 changes: 2 additions & 2 deletions ...pplications/app_search/components/curations/curation/suggested_documents_callout.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const MOCK_VALUES = {
},
// EngineLogic
engine: {
search_relevance_suggestions_active: true,
adaptive_relevance_suggestions_active: true,
},
};

Expand All @@ -53,7 +53,7 @@ describe('SuggestedDocumentsCallout', () => {
});

it('is empty when suggestions are not active', () => {
const values = set('engine.search_relevance_suggestions_active', false, MOCK_VALUES);
const values = set('engine.adaptive_relevance_suggestions_active', false, MOCK_VALUES);
setMockValues(values);

const wrapper = shallow(<SuggestedDocumentsCallout />);
Expand Down
4 changes: 2 additions & 2 deletions ...lic/applications/app_search/components/curations/curation/suggested_documents_callout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ export const SuggestedDocumentsCallout: React.FC = () => {
curation: { suggestion, queries },
} = useValues(CurationLogic);
const {
engine: { search_relevance_suggestions_active: searchRelevanceSuggestionsActive },
engine: { adaptive_relevance_suggestions_active: adaptiveRelevanceSuggestionsActive },
} = useValues(EngineLogic);

if (
typeof suggestion === 'undefined' ||
suggestion.status !== 'pending' ||
searchRelevanceSuggestionsActive === false
adaptiveRelevanceSuggestionsActive === false
) {
return null;
}
Expand Down
8 changes: 4 additions & 4 deletions ...prise_search/public/applications/app_search/components/curations/views/curations.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe('Curations', () => {
},
// EngineLogic
engine: {
search_relevance_suggestions_active: true,
adaptive_relevance_suggestions_active: true,
},
};

Expand Down Expand Up @@ -89,7 +89,7 @@ describe('Curations', () => {
});

it('renders less tabs when suggestions are not active', () => {
setMockValues(set('engine.search_relevance_suggestions_active', false, values));
setMockValues(set('engine.adaptive_relevance_suggestions_active', false, values));
const wrapper = shallow(<Curations />);

expect(getPageTitle(wrapper)).toEqual('Curated results');
Expand All @@ -99,7 +99,7 @@ describe('Curations', () => {
});

it('renders a New! badge when suggestions are not active', () => {
setMockValues(set('engine.search_relevance_suggestions_active', false, values));
setMockValues(set('engine.adaptive_relevance_suggestions_active', false, values));
const wrapper = shallow(<Curations />);

expect(getPageTitle(wrapper)).toEqual('Curated results');
Expand All @@ -109,7 +109,7 @@ describe('Curations', () => {
});

it('hides the badge when suggestions are active', () => {
setMockValues(set('engine.search_relevance_suggestions_active', true, values));
setMockValues(set('engine.adaptive_relevance_suggestions_active', true, values));
const wrapper = shallow(<Curations />);

expect(getPageTitle(wrapper)).toEqual('Curated results');
Expand Down
6 changes: 3 additions & 3 deletions ...enterprise_search/public/applications/app_search/components/curations/views/curations.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ export const Curations: React.FC = () => {
const { dataLoading, meta, selectedPageTab } = useValues(CurationsLogic);
const { loadCurations, onSelectPageTab } = useActions(CurationsLogic);
const {
engine: { search_relevance_suggestions_active: searchRelevanceSuggestionsActive },
engine: { adaptive_relevance_suggestions_active: adaptiveRelevanceSuggestionsActive },
} = useValues(EngineLogic);

const suggestionsEnabled = searchRelevanceSuggestionsActive;
const suggestionsEnabled = adaptiveRelevanceSuggestionsActive;

const OVERVIEW_TAB = {
label: i18n.translate(
Expand Down Expand Up @@ -72,7 +72,7 @@ export const Curations: React.FC = () => {
),
};

const pageTabs = searchRelevanceSuggestionsActive
const pageTabs = adaptiveRelevanceSuggestionsActive
? [OVERVIEW_TAB, HISTORY_TAB, SETTINGS_TAB]
: [OVERVIEW_TAB, SETTINGS_TAB];

Expand Down
6 changes: 3 additions & 3 deletions ...rch/public/applications/app_search/components/curations/views/curations_overview.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const MOCK_VALUES = {
],
// EngineLogic
engine: {
search_relevance_suggestions_active: true,
adaptive_relevance_suggestions_active: true,
},
};

Expand Down Expand Up @@ -71,14 +71,14 @@ describe('CurationsOverview', () => {
});

it('renders a suggestions table when suggestions are active', () => {
setMockValues(set('engine.search_relevance_suggestions_active', true, MOCK_VALUES));
setMockValues(set('engine.adaptive_relevance_suggestions_active', true, MOCK_VALUES));
const wrapper = shallow(<CurationsOverview />);

expect(wrapper.find(SuggestionsTable).exists()).toBe(true);
});

it('doesn\t render a suggestions table when suggestions are not active', () => {
setMockValues(set('engine.search_relevance_suggestions_active', false, MOCK_VALUES));
setMockValues(set('engine.adaptive_relevance_suggestions_active', false, MOCK_VALUES));
const wrapper = shallow(<CurationsOverview />);

expect(wrapper.find(SuggestionsTable).exists()).toBe(false);
Expand Down
4 changes: 2 additions & 2 deletions ...e_search/public/applications/app_search/components/curations/views/curations_overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import { CurationsLogic } from '../curations_logic';
export const CurationsOverview: React.FC = () => {
const { curations } = useValues(CurationsLogic);
const {
engine: { search_relevance_suggestions_active: searchRelevanceSuggestionsActive },
engine: { adaptive_relevance_suggestions_active: adaptiveRelevanceSuggestionsActive },
} = useValues(EngineLogic);

const shouldShowSuggestions = searchRelevanceSuggestionsActive;
const shouldShowSuggestions = adaptiveRelevanceSuggestionsActive;

return (
<>
Expand Down
2 changes: 1 addition & 1 deletion ...s/enterprise_search/public/applications/app_search/components/engine/engine_logic.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe('EngineLogic', () => {
schema: { test: SchemaType.Text },
apiTokens: [],
apiKey: 'some-key',
search_relevance_suggestions_active: true,
adaptive_relevance_suggestions_active: true,
};

const DEFAULT_VALUES = {
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ export interface EngineDetails extends Engine {
isMeta: boolean;
engine_count?: number;
includedEngines?: EngineDetails[];
search_relevance_suggestions?: SearchRelevanceSuggestionDetails;
search_relevance_suggestions_active: boolean;
adaptive_relevance_suggestions?: SearchRelevanceSuggestionDetails;
adaptive_relevance_suggestions_active: boolean;
}

interface ResultField {
Expand Down
10 changes: 5 additions & 5 deletions ...ons/app_search/components/engine_overview/components/suggested_curations_callout.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import { SuggestedCurationsCallout } from './suggested_curations_callout';

const MOCK_VALUES = {
engine: {
search_relevance_suggestions: {
adaptive_relevance_suggestions: {
curation: {
pending: 1,
},
},
search_relevance_suggestions_active: true,
adaptive_relevance_suggestions_active: true,
},
};

Expand All @@ -44,7 +44,7 @@ describe('SuggestedCurationsCallout', () => {
setMockValues({
...MOCK_VALUES,
engine: {
search_relevance_suggestions_active: true,
adaptive_relevance_suggestions_active: true,
},
});

Expand All @@ -54,7 +54,7 @@ describe('SuggestedCurationsCallout', () => {
});

it('is empty when suggestions are not active', () => {
const values = set('engine.search_relevance_suggestions_active', false, MOCK_VALUES);
const values = set('engine.adaptive_relevance_suggestions_active', false, MOCK_VALUES);
setMockValues(values);

const wrapper = shallow(<SuggestedCurationsCallout />);
Expand All @@ -63,7 +63,7 @@ describe('SuggestedCurationsCallout', () => {
});

it('is empty when no pending curations', () => {
const values = set('engine.search_relevance_suggestions.curation.pending', 0, MOCK_VALUES);
const values = set('engine.adaptive_relevance_suggestions.curation.pending', 0, MOCK_VALUES);
setMockValues(values);

const wrapper = shallow(<SuggestedCurationsCallout />);
Expand Down
12 changes: 6 additions & 6 deletions ...ications/app_search/components/engine_overview/components/suggested_curations_callout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ import { EngineLogic, generateEnginePath } from '../../engine';
export const SuggestedCurationsCallout: React.FC = () => {
const {
engine: {
search_relevance_suggestions: searchRelevanceSuggestions,
search_relevance_suggestions_active: searchRelevanceSuggestionsActive,
adaptive_relevance_suggestions: adaptiveRelevanceSuggestions,
adaptive_relevance_suggestions_active: adaptiveRelevanceSuggestionsActive,
},
} = useValues(EngineLogic);

const pendingCount = searchRelevanceSuggestions?.curation.pending;
const pendingCount = adaptiveRelevanceSuggestions?.curation.pending;

if (
typeof searchRelevanceSuggestions === 'undefined' ||
typeof adaptiveRelevanceSuggestions === 'undefined' ||
pendingCount === 0 ||
searchRelevanceSuggestionsActive === false
adaptiveRelevanceSuggestionsActive === false
) {
return null;
}
Expand All @@ -46,7 +46,7 @@ export const SuggestedCurationsCallout: React.FC = () => {
}
)}
buttonTo={generateEnginePath(ENGINE_CURATIONS_PATH)}
lastUpdatedTimestamp={searchRelevanceSuggestions.curation.last_updated}
lastUpdatedTimestamp={adaptiveRelevanceSuggestions.curation.last_updated}
/>
);
};