From 9e45dc35d2682092f497e9099596d470b3c97a71 Mon Sep 17 00:00:00 2001
From: Ilya Kreymer <ikreymer@users.noreply.github.com>
Date: Tue, 15 Mar 2022 21:19:23 -0700
Subject: [PATCH] minor frontend-tweaks: (#196)

* frontend-tweaks:
- treat 'starting' state same as 'running'
- default to no schedule instead of weekly for default
- add 'Domain' scopeType

* backend: also allow 'domain' as a scopeType
---
 backend/crawlconfigs.py                              |  1 +
 frontend/src/pages/archive/crawl-detail.ts           | 11 +++++------
 frontend/src/pages/archive/crawl-templates-detail.ts |  1 +
 frontend/src/pages/archive/crawl-templates-new.ts    |  3 ++-
 frontend/src/pages/archive/crawls-list.ts            |  4 ++--
 frontend/src/pages/archive/types.ts                  |  1 +
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/backend/crawlconfigs.py b/backend/crawlconfigs.py
index 23e33e33..d08b1b93 100644
--- a/backend/crawlconfigs.py
+++ b/backend/crawlconfigs.py
@@ -27,6 +27,7 @@ class ScopeType(str, Enum):
     PAGE_SPA = "page-spa"
     PREFIX = "prefix"
     HOST = "host"
+    DOMAIN = "domain"
     ANY = "any"
 
 
diff --git a/frontend/src/pages/archive/crawl-detail.ts b/frontend/src/pages/archive/crawl-detail.ts
index 76f2bb48..2fce05ac 100644
--- a/frontend/src/pages/archive/crawl-detail.ts
+++ b/frontend/src/pages/archive/crawl-detail.ts
@@ -60,7 +60,7 @@ export class CrawlDetail extends LiteElement {
   private get isRunning(): boolean | null {
     if (!this.crawl) return null;
 
-    return this.crawl.state === "running";
+    return this.crawl.state === "running" || this.crawl.state === "starting";
   }
 
   async firstUpdated() {
@@ -87,7 +87,7 @@ export class CrawlDetail extends LiteElement {
     switch (this.sectionName) {
       case "watch": {
         if (this.crawl) {
-          if (this.crawl.state === "running") {
+          if (this.isRunning) {
             sectionContent = this.renderWatch();
           } else {
             sectionContent = this.renderReplay();
@@ -408,8 +408,7 @@ export class CrawlDetail extends LiteElement {
       </header>
 
       ${this.crawl
-        ? html`
-          <div id="screencast-crawl">
+        ? html` <div id="screencast-crawl">
             <btrix-screencast
               authToken=${authToken}
               archiveId=${this.archiveId!}
@@ -422,7 +421,7 @@ export class CrawlDetail extends LiteElement {
   }
 
   private renderReplay() {
-    const isRunning = this.crawl?.state === "running";
+    const isRunning = this.isRunning;
 
     const bearer = this.authState?.headers?.Authorization?.split(" ", 2)[1];
 
@@ -652,7 +651,7 @@ export class CrawlDetail extends LiteElement {
     try {
       this.crawl = await this.getCrawl();
 
-      if (this.crawl.state === "running") {
+      if (this.isRunning) {
         // Start timer for next poll
         this.timerId = window.setTimeout(() => {
           this.fetchCrawl();
diff --git a/frontend/src/pages/archive/crawl-templates-detail.ts b/frontend/src/pages/archive/crawl-templates-detail.ts
index 0ad8fd64..04137ad5 100644
--- a/frontend/src/pages/archive/crawl-templates-detail.ts
+++ b/frontend/src/pages/archive/crawl-templates-detail.ts
@@ -963,6 +963,7 @@ export class CrawlTemplatesDetail extends LiteElement {
         <sl-menu-item value="page-spa">Page SPA</sl-menu-item>
         <sl-menu-item value="prefix">Prefix</sl-menu-item>
         <sl-menu-item value="host">Host</sl-menu-item>
+        <sl-menu-item value="domain">Domain</sl-menu-item>
         <sl-menu-item value="any">Any</sl-menu-item>
       </sl-select>
       <sl-checkbox
diff --git a/frontend/src/pages/archive/crawl-templates-new.ts b/frontend/src/pages/archive/crawl-templates-new.ts
index 73c1adc2..81a72254 100644
--- a/frontend/src/pages/archive/crawl-templates-new.ts
+++ b/frontend/src/pages/archive/crawl-templates-new.ts
@@ -61,7 +61,7 @@ export class CrawlTemplatesNew extends LiteElement {
   private isRunNow: boolean = initialValues.runNow;
 
   @state()
-  private scheduleInterval: "" | "daily" | "weekly" | "monthly" = "weekly";
+  private scheduleInterval: "" | "daily" | "weekly" | "monthly" = "";
 
   /** Schedule local time */
   @state()
@@ -408,6 +408,7 @@ export class CrawlTemplatesNew extends LiteElement {
         <sl-menu-item value="page-spa">Page SPA</sl-menu-item>
         <sl-menu-item value="prefix">Prefix</sl-menu-item>
         <sl-menu-item value="host">Host</sl-menu-item>
+        <sl-menu-item value="domain">Domain</sl-menu-item>
         <sl-menu-item value="any">Any</sl-menu-item>
       </sl-select>
 
diff --git a/frontend/src/pages/archive/crawls-list.ts b/frontend/src/pages/archive/crawls-list.ts
index 99dbae38..253af271 100644
--- a/frontend/src/pages/archive/crawls-list.ts
+++ b/frontend/src/pages/archive/crawls-list.ts
@@ -31,7 +31,7 @@ const sortableFieldLabels = {
 };
 
 function isRunning(crawl: Crawl) {
-  return crawl.state === "running";
+  return crawl.state === "running" || crawl.state === "starting";
 }
 
 /**
@@ -284,7 +284,7 @@ export class CrawlsList extends LiteElement {
         </div>
         <div>
           <div
-            class="whitespace-nowrap mb-1 capitalize${crawl.state === "running"
+            class="whitespace-nowrap mb-1 capitalize${isRunning(crawl)
               ? " motion-safe:animate-pulse"
               : ""}"
           >
diff --git a/frontend/src/pages/archive/types.ts b/frontend/src/pages/archive/types.ts
index beb5ae1f..ef9aadf7 100644
--- a/frontend/src/pages/archive/types.ts
+++ b/frontend/src/pages/archive/types.ts
@@ -1,4 +1,5 @@
 type CrawlState =
+  | "starting"
   | "running"
   | "complete"
   | "failed"