tea/browsertrix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Show correct max depth in settings (#1858)

Browse Source 
Fixes https://github.com/webrecorder/browsertrix/issues/1626
This commit is contained in:
sua yoo 2024-06-12 15:05:01 -05:00 committed by GitHub
parent fa6627ce70
commit f8cde4bd76
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/components/ui/config-details.ts
View File

@ -13,6 +13,7 @@ import type { CrawlConfig, Seed, SeedConfig } from "@/pages/org/types";
import type { Collection } from "@/types/collection"; import type { Collection } from "@/types/collection";
import { isApiError } from "@/utils/api"; import { isApiError } from "@/utils/api";
import type { AuthState } from "@/utils/AuthService"; import type { AuthState } from "@/utils/AuthService";
import { DEPTH_SUPPORTED_SCOPES } from "@/utils/crawler";
import { humanizeSchedule } from "@/utils/cron"; import { humanizeSchedule } from "@/utils/cron";
import LiteElement, { html } from "@/utils/LiteElement"; import LiteElement, { html } from "@/utils/LiteElement";
@ -406,15 +407,15 @@ export class ConfigDetails extends LiteElement {
true, true,
)} )}
${when( ${when(
["host", "domain", "custom", "any"].includes( DEPTH_SUPPORTED_SCOPES.includes(
primarySeedConfig!.scopeType || seedsConfig.scopeType!, primarySeedConfig!.scopeType || seedsConfig.scopeType!,
), ),
() => () =>
this.renderSetting( this.renderSetting(
msg("Max Depth"), msg("Max Depth"),
primarySeedConfig?.depth primarySeedConfig && primarySeedConfig.depth !== null
? msg(str`${primarySeedConfig.depth} hop(s)`) ? msg(str`${primarySeedConfig.depth} hop(s)`)
: msg("None"), : msg("Unlimited (default)"),
), ),
)} )}
${this.renderSetting( ${this.renderSetting(

4
frontend/src/pages/org/workflow-editor.ts
View File

@ -57,7 +57,7 @@ import type {
} from "@/features/crawl-workflows/queue-exclusion-table"; } from "@/features/crawl-workflows/queue-exclusion-table";
import { isApiError, type Detail } from "@/utils/api"; import { isApiError, type Detail } from "@/utils/api";
import type { AuthState } from "@/utils/AuthService"; import type { AuthState } from "@/utils/AuthService";
import { DEFAULT_MAX_SCALE } from "@/utils/crawler"; import { DEFAULT_MAX_SCALE, DEPTH_SUPPORTED_SCOPES } from "@/utils/crawler";
import { import {
getNextDate, getNextDate,
getScheduleInterval, getScheduleInterval,
@ -135,8 +135,6 @@ type FormState = {
crawlerChannel: string; crawlerChannel: string;
}; };
const DEPTH_SUPPORTED_SCOPES = ["prefix", "host", "domain", "custom", "any"];
const getDefaultProgressState = (hasConfigId = false): ProgressState => { const getDefaultProgressState = (hasConfigId = false): ProgressState => {
let activeTab: StepName = "crawlSetup"; let activeTab: StepName = "crawlSetup";
if (window.location.hash) { if (window.location.hash) {

8
frontend/src/utils/crawler.ts
View File

@ -31,6 +31,14 @@ export const inactiveCrawlStates: CrawlState[] = [
export const DEFAULT_MAX_SCALE = 3; export const DEFAULT_MAX_SCALE = 3;
export const DEPTH_SUPPORTED_SCOPES = [
"prefix",
"host",
"domain",
"custom",
"any",
];
export function isActive(state: CrawlState | null) { export function isActive(state: CrawlState | null) {
return state && activeCrawlStates.includes(state); return state && activeCrawlStates.includes(state);
} }