Skip to content

Disable editing crawl config of running crawls #620

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

Merged
merged 4 commits into from
Feb 23, 2023
Merged

Disable editing crawl config of running crawls #620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2086a5e
hide edit option from dropdown
SuaYoo Feb 21, 2023
2fb7c96
hide edit button
SuaYoo Feb 22, 2023
1710a71
disable metadata edit
SuaYoo Feb 22, 2023
10a0f19
disable button
SuaYoo Feb 22, 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
53 changes: 34 additions & 19 deletions frontend/src/pages/org/crawl-configs-detail.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,27 @@ export class CrawlTemplatesDetail extends LiteElement {
${when(
this.crawlConfig && !this.crawlConfig.inactive,
() => html`
<sl-button
href=${`/orgs/${this.orgId}/crawl-configs/config/${
this.crawlConfig!.id
}?edit`}
variant="primary"
size="small"
class="mr-2"
@click=${this.navLink}
<sl-tooltip
content=${msg(
"Crawl config cannot be edited while crawl is running."
)}
?disabled=${!this.crawlConfig!.currCrawlId}
>
<sl-icon slot="prefix" name="gear"></sl-icon>
${msg("Edit Crawl Config")}
</sl-button>
<sl-button
href=${`/orgs/${this.orgId}/crawl-configs/config/${
this.crawlConfig!.id
}?edit`}
variant="primary"
size="small"
class="mr-2"
@click=${this.navLink}
?disabled=${this.crawlConfig!.currCrawlId}
>
<sl-icon slot="prefix" name="gear"></sl-icon>
${msg("Edit Crawl Config")}
</sl-button>
</sl-tooltip>

${this.renderMenu()}
`,
() =>
Expand All @@ -143,16 +152,16 @@ export class CrawlTemplatesDetail extends LiteElement {
</div>
</header>

${this.renderCurrentlyRunningNotice()}

<section class="col-span-1 border rounded-lg py-2">
${this.renderDetails()}
</section>

${this.renderLastCrawl()} ${this.renderCurrentlyRunningNotice()}
${this.renderLastCrawl()}

<div class="col-span-1">
<h3 class="text-lg font-semibold mb-2">
${msg("Crawl Settings")}
</h3>
<h3 class="text-lg font-semibold mb-2">${msg("Crawl Settings")}</h3>
<main class="border rounded-lg py-3 px-5">
<btrix-config-details
.crawlConfig=${this.crawlConfig}
Expand Down Expand Up @@ -237,7 +246,7 @@ export class CrawlTemplatesDetail extends LiteElement {
`,
];

if (!this.crawlConfig.inactive) {
if (!this.crawlConfig.inactive && !this.crawlConfig.currCrawlId) {
menuItems.unshift(html`
<li
class="p-2 hover:bg-purple-50 cursor-pointer text-purple-600"
Expand All @@ -257,7 +266,11 @@ export class CrawlTemplatesDetail extends LiteElement {
`);
}

if (this.crawlConfig.crawlCount && !this.crawlConfig.inactive) {
if (
this.crawlConfig.crawlCount &&
!this.crawlConfig.inactive &&
!this.crawlConfig.currCrawlId
) {
menuItems.push(html`
<li
class="p-2 text-danger hover:bg-danger hover:text-white cursor-pointer"
Expand All @@ -279,7 +292,7 @@ export class CrawlTemplatesDetail extends LiteElement {
`);
}

if (!this.crawlConfig.crawlCount) {
if (!this.crawlConfig.crawlCount && !this.crawlConfig.currCrawlId) {
menuItems.push(html`
<li
class="p-2 text-danger hover:bg-danger hover:text-white cursor-pointer"
Expand All @@ -299,7 +312,9 @@ export class CrawlTemplatesDetail extends LiteElement {

return html`
<sl-dropdown placement="bottom-end" distance="4">
<sl-button slot="trigger" size="small" caret>${msg("Actions")}</sl-button>
<sl-button slot="trigger" size="small" caret
>${msg("Actions")}</sl-button
>

<ul
class="text-left text-sm text-neutral-800 bg-white whitespace-nowrap"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/org/crawl-configs-list.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ export class CrawlTemplatesList extends LiteElement {
`,
];

if (!t.inactive) {
if (!t.inactive && !this.runningCrawlsMap[t.id]) {
menuItems.unshift(html`
<li
class="p-2 hover:bg-zinc-100 cursor-pointer"
Expand Down
87 changes: 51 additions & 36 deletions frontend/src/pages/org/crawl-detail.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,22 @@ export class CrawlDetail extends LiteElement {
html`
<div class="flex items-center justify-between">
${msg("Metadata")}
<sl-icon-button
class="text-base"
name="pencil"
@click=${this.openMetadataEditor}
aria-label=${msg("Edit Metadata")}
></sl-icon-button>
<sl-tooltip
content=${msg(
"Metadata cannot be edited while crawl is running."
)}
?disabled=${!this.isActive}
>
<sl-icon-button
class=${`text-base${
this.isActive ? " cursor-not-allowed" : ""
}`}
name="pencil"
@click=${this.openMetadataEditor}
aria-label=${msg("Edit Metadata")}
?disabled=${this.isActive}
></sl-icon-button>
</sl-tooltip>
</div>
`,
this.renderMetadata()
Expand Down Expand Up @@ -429,38 +439,43 @@ export class CrawlDetail extends LiteElement {
${msg("Re-run crawl")}
</span>
</li>
<li
class="p-2 hover:bg-zinc-100 cursor-pointer"
role="menuitem"
@click=${(e: any) => {
this.openMetadataEditor();
e.target.closest("sl-dropdown").hide();
}}
>
<sl-icon
class="inline-block align-middle mr-1"
name="pencil"
></sl-icon>
<span class="inline-block align-middle">
${msg("Edit Metadata")}
</span>
</li>
`
)}
${when(
!this.isActive,
() => html`
<hr />
<li
class="p-2 hover:bg-zinc-100 cursor-pointer"
role="menuitem"
@click=${() => {
this.navTo(
`/orgs/${this.crawl?.oid}/crawl-configs/config/${this.crawlTemplateId}?edit`
);
}}
>
<span class="inline-block align-middle">
${msg("Edit Crawl Config")}
</span>
</li>
`
)}
<li
class="p-2 hover:bg-zinc-100 cursor-pointer"
role="menuitem"
@click=${(e: any) => {
this.openMetadataEditor();
e.target.closest("sl-dropdown").hide();
}}
>
<sl-icon
class="inline-block align-middle mr-1"
name="pencil"
></sl-icon>
<span class="inline-block align-middle">
${msg("Edit Metadata")}
</span>
</li>
<hr />
<li
class="p-2 hover:bg-zinc-100 cursor-pointer"
role="menuitem"
@click=${() => {
this.navTo(
`/orgs/${this.crawl?.oid}/crawl-configs/config/${this.crawlTemplateId}?edit`
);
}}
>
<span class="inline-block align-middle">
${msg("Edit Crawl Config")}
</span>
</li>
`
)}
<li
Expand Down