Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ describe('EngineLogic', () => {
isEngineSchemaEmpty: true,
isMetaEngine: false,
isSampleEngine: false,
canCrawl: true,
hasSchemaErrors: false,
hasSchemaConflicts: false,
hasUnconfirmedSchemaFields: false,
Expand Down Expand Up @@ -356,7 +357,7 @@ describe('EngineLogic', () => {
});
});

describe('isSampleEngine', () => {
describe('isSampleEngine & canCrawl', () => {
it('should be set based on engine.sample', () => {
const engine = { ...mockEngineData, sample: true };
mount({ engine });
Expand All @@ -365,11 +366,12 @@ describe('EngineLogic', () => {
...DEFAULT_VALUES_WITH_ENGINE,
engine,
isSampleEngine: true,
canCrawl: false,
});
});
});

describe('isMetaEngine', () => {
describe('isMetaEngine & canCrawl', () => {
it('should be set based on engine.type', () => {
const engine = { ...mockEngineData, type: EngineTypes.meta };
mount({ engine });
Expand All @@ -378,6 +380,7 @@ describe('EngineLogic', () => {
...DEFAULT_VALUES_WITH_ENGINE,
engine,
isMetaEngine: true,
canCrawl: false,
});
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ interface EngineValues {
isEngineSchemaEmpty: boolean;
isMetaEngine: boolean;
isSampleEngine: boolean;
canCrawl: boolean;
hasSchemaErrors: boolean;
hasSchemaConflicts: boolean;
hasUnconfirmedSchemaFields: boolean;
Expand Down Expand Up @@ -101,6 +102,10 @@ export const EngineLogic = kea<MakeLogicType<EngineValues, EngineActions>>({
],
isMetaEngine: [() => [selectors.engine], (engine) => engine?.type === EngineTypes.meta],
isSampleEngine: [() => [selectors.engine], (engine) => !!engine?.sample],
canCrawl: [
() => [selectors.isMetaEngine, selectors.isSampleEngine],
(isMetaEngine, isSampleEngine) => !isMetaEngine && !isSampleEngine,
],
// Indexed engines
hasSchemaErrors: [
() => [selectors.engine],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ describe('useEngineNav', () => {
const myRole = { canViewEngineCrawler: true };

it('returns a crawler nav item', () => {
setMockValues({ ...values, myRole });
setMockValues({ ...values, myRole, canCrawl: true });
expect(useEngineNav()).toEqual([
...BASE_NAV,
{
Expand All @@ -179,8 +179,8 @@ describe('useEngineNav', () => {
]);
});

it('does not return a crawler nav item for meta engines', () => {
setMockValues({ ...values, myRole, isMetaEngine: true });
it('does not return a crawler nav item for engines that cannot crawl (e.g. meta engines, sample engine)', () => {
setMockValues({ ...values, myRole, canCrawl: false });
expect(useEngineNav()).toEqual(BASE_NAV);
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ export const useEngineNav = () => {
dataLoading,
isSampleEngine,
isMetaEngine,
canCrawl,
hasSchemaErrors,
hasSchemaConflicts,
hasUnconfirmedSchemaFields,
Expand Down Expand Up @@ -185,7 +186,7 @@ export const useEngineNav = () => {
});
}

if (canViewEngineCrawler && !isMetaEngine) {
if (canViewEngineCrawler && canCrawl) {
navItems.push({
id: 'crawler',
name: CRAWLER_TITLE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ describe('EngineRouter', () => {
...mockEngineValues,
dataLoading: false,
engineNotFound: false,
isMetaEngine: false,
canCrawl: false,
myRole: {},
};
const actions = {
Expand Down Expand Up @@ -175,14 +177,18 @@ describe('EngineRouter', () => {
});

it('renders a source engines view', () => {
setMockValues({ ...values, myRole: { canViewMetaEngineSourceEngines: true } });
setMockValues({
...values,
myRole: { canViewMetaEngineSourceEngines: true },
isMetaEngine: true,
});
const wrapper = shallow(<EngineRouter />);

expect(wrapper.find(SourceEngines)).toHaveLength(1);
});

it('renders a crawler view', () => {
setMockValues({ ...values, myRole: { canViewEngineCrawler: true } });
setMockValues({ ...values, myRole: { canViewEngineCrawler: true }, canCrawl: true });
const wrapper = shallow(<EngineRouter />);

expect(wrapper.find(CrawlerRouter)).toHaveLength(1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ export const EngineRouter: React.FC = () => {
} = useValues(AppLogic);

const { engineName: engineNameFromUrl } = useParams() as { engineName: string };
const { engineName, dataLoading, engineNotFound } = useValues(EngineLogic);
const { engineName, dataLoading, engineNotFound, isMetaEngine, canCrawl } = useValues(
EngineLogic
);
const { setEngineName, initializeEngine, pollEmptyEngine, stopPolling, clearEngine } = useActions(
EngineLogic
);
Expand Down Expand Up @@ -120,12 +122,12 @@ export const EngineRouter: React.FC = () => {
<SchemaRouter />
</Route>
)}
{canViewMetaEngineSourceEngines && (
{canViewMetaEngineSourceEngines && isMetaEngine && (
<Route path={META_ENGINE_SOURCE_ENGINES_PATH}>
<SourceEngines />
</Route>
)}
{canViewEngineCrawler && (
{canViewEngineCrawler && canCrawl && (
<Route path={ENGINE_CRAWLER_PATH}>
<CrawlerRouter />
</Route>
Expand Down