From 47360e7631041d0ae7645f2a7135c937c8dcf16b Mon Sep 17 00:00:00 2001
From: Alex Tideman <alex.tideman@gmail.com>
Date: Tue, 29 Aug 2023 09:03:47 -0500
Subject: [PATCH 1/9] WIP: testing things out

---
 .../schedule/schedule-frequency.svelte        | 20 ++++++++++++-------
 .../schedule/schedules-table-row.svelte       |  9 ++++-----
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/lib/components/schedule/schedule-frequency.svelte b/src/lib/components/schedule/schedule-frequency.svelte
index 7c0b07db6..0969cdd9c 100644
--- a/src/lib/components/schedule/schedule-frequency.svelte
+++ b/src/lib/components/schedule/schedule-frequency.svelte
@@ -1,8 +1,9 @@
 <script lang="ts">
+  import CodeBlock from '$lib/holocene/code-block.svelte';
   import type { StructuredCalendar } from '$lib/types/schedule';
   import { intervalToComment } from '$lib/utilities/schedule-comment-formatting';
   import { commentOrCalendarToFrequency } from '$lib/utilities/schedule-frequency-formatting';
-  
+
   import type { IntervalSpec } from '$types';
 
   export let calendar: StructuredCalendar | undefined = undefined;
@@ -13,16 +14,21 @@
 </script>
 
 <div class="flex flex-col {$$props.class}">
-  {#if calendar}
-    <p data-testid="schedule-calendar-frequency">
-      {commentOrCalendarToFrequency(calendar)}
-    </p>
-  {:else}
+  <!-- {#if calendar} -->
+  <CodeBlock
+    copyable
+    inline
+    testId="schedule-calendar"
+    class="mb-2"
+    language="json"
+    content={JSON.stringify(calendar || interval, null, 2)}
+  />
+  <!-- {:else}
     <p data-testid="schedule-interval-frequency">
       {intervalToComment(intervalSecs)}
     </p>
     <p data-testid="schedule-phase-frequency">
       {intervalToComment(phaseSecs, true)}
     </p>
-  {/if}
+  {/if} -->
 </div>
diff --git a/src/lib/components/schedule/schedules-table-row.svelte b/src/lib/components/schedule/schedules-table-row.svelte
index 1a88a5829..b0c1fff10 100644
--- a/src/lib/components/schedule/schedules-table-row.svelte
+++ b/src/lib/components/schedule/schedules-table-row.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { page } from '$app/stores';
-  
+
   import WorkflowStatus from '$lib/components/workflow-status.svelte';
   import Link from '$lib/holocene/link.svelte';
   import TableRow from '$lib/holocene/table/table-row.svelte';
@@ -15,10 +15,9 @@
     routeForEventHistory,
     routeForSchedule,
   } from '$lib/utilities/route-for';
-  
+
   import ScheduleFrequency from './schedule-frequency.svelte';
-  
-  
+
   import type { ScheduleActionResult, ScheduleListEntry } from '$types';
 
   let { namespace } = $page.params;
@@ -51,7 +50,7 @@
   <td class="cell">
     <WorkflowStatus status={schedule?.info?.paused ? 'Paused' : 'Running'} />
   </td>
-  <td class="cell whitespace-pre-line break-words">
+  <td class="cell whitespace-pre-line break-words max-w-[600px] w-auto">
     <p class="text-base">{schedule.scheduleId}</p>
     <p>
       <ScheduleFrequency {calendar} {interval} class="text-sm" />

From f756cd10a9f537e78352b613f5c7b94fd03948b8 Mon Sep 17 00:00:00 2001
From: Alex Tideman <alex.tideman@gmail.com>
Date: Tue, 29 Aug 2023 11:58:08 -0500
Subject: [PATCH 2/9] WIP

---
 .../components/schedule/schedule-frequency.svelte | 15 +++++++++++++++
 src/lib/pages/schedule-view.svelte                | 11 +++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/lib/components/schedule/schedule-frequency.svelte b/src/lib/components/schedule/schedule-frequency.svelte
index 0969cdd9c..f57286f46 100644
--- a/src/lib/components/schedule/schedule-frequency.svelte
+++ b/src/lib/components/schedule/schedule-frequency.svelte
@@ -13,6 +13,21 @@
   const phaseSecs = interval?.phase as string;
 </script>
 
+<div class="flex flex-col {$$props.class}">
+  {#if calendar}
+    <p data-testid="schedule-calendar-frequency">
+      {commentOrCalendarToFrequency(calendar)}
+    </p>
+  {:else}
+    <p data-testid="schedule-interval-frequency">
+      {intervalToComment(intervalSecs)}
+    </p>
+    <p data-testid="schedule-phase-frequency">
+      {intervalToComment(phaseSecs, true)}
+    </p>
+  {/if}
+</div>
+
 <div class="flex flex-col {$$props.class}">
   <!-- {#if calendar} -->
   <CodeBlock
diff --git a/src/lib/pages/schedule-view.svelte b/src/lib/pages/schedule-view.svelte
index 6625617bd..b46ee4866 100644
--- a/src/lib/pages/schedule-view.svelte
+++ b/src/lib/pages/schedule-view.svelte
@@ -202,18 +202,17 @@
           <ScheduleError error={schedule?.info?.invalidScheduleError} />
         </div>
       {/if}
-      <div class="w-full xl:w-1/2">
-        <ScheduleFrequencyPanel
-          calendar={schedule?.schedule?.spec?.structuredCalendar?.[0]}
-          interval={schedule?.schedule?.spec?.interval?.[0]}
-        />
-      </div>
+      <div class="w-full xl:w-1/2" />
       <div class="flex flex-col xl:flex-row gap-4">
         <div class="w-full xl:w-3/4">
           <ScheduleRecentRuns
             {namespace}
             recentRuns={schedule?.info?.recentActions}
           />
+          <ScheduleFrequencyPanel
+            calendar={schedule?.schedule?.spec?.structuredCalendar?.[0]}
+            interval={schedule?.schedule?.spec?.interval?.[0]}
+          />
         </div>
         <div class="w-full xl:w-1/4 xl:min-w-[320px]">
           <ScheduleUpcomingRuns

From 920b9341ce9e85a748654cb4b5b6fc9e1116a6f0 Mon Sep 17 00:00:00 2001
From: Alex Tideman <alex.tideman@gmail.com>
Date: Tue, 29 Aug 2023 14:24:40 -0500
Subject: [PATCH 3/9] Use CodeBlock for frequency in all cases, change layout
 of schedule view

---
 .../schedule-advanced-settings.svelte         | 55 ++++++++++---------
 .../schedule/schedule-frequency.svelte        | 33 +----------
 ...dule-memo.svelte => schedule-notes.svelte} |  6 +-
 .../schedule/schedule-recent-runs.svelte      |  6 +-
 .../schedule/schedules-table-row.svelte       | 14 ++++-
 .../schedule/schedules-table.svelte           |  2 +-
 src/lib/holocene/code-block.svelte            |  4 +-
 src/lib/i18n/locales/en/common.ts             |  1 +
 src/lib/pages/schedule-view.svelte            | 30 ++++------
 9 files changed, 66 insertions(+), 85 deletions(-)
 rename src/lib/components/schedule/{schedule-memo.svelte => schedule-notes.svelte} (56%)

diff --git a/src/lib/components/schedule/schedule-advanced-settings.svelte b/src/lib/components/schedule/schedule-advanced-settings.svelte
index 532460b0f..8a69ff081 100644
--- a/src/lib/components/schedule/schedule-advanced-settings.svelte
+++ b/src/lib/components/schedule/schedule-advanced-settings.svelte
@@ -1,44 +1,49 @@
 <script lang="ts">
   import Icon from '$lib/holocene/icon/icon.svelte';
   import { translate } from '$lib/i18n/translate';
-  
+
   import type { SchedulePolicies, ScheduleSpec, ScheduleState } from '$types';
+  import ScheduleNotes from './schedule-notes.svelte';
 
   export let spec: ScheduleSpec;
   export let state: ScheduleState;
   export let policies: SchedulePolicies;
+  export let notes = '';
 
   let show = false;
 </script>
 
-<button on:click={() => (show = !show)} class="settings">
-  {translate('schedules', 'advanced-settings')}
-  <Icon class="inline" name={show ? 'chevron-up' : 'chevron-down'} />
-</button>
-{#if show}
-  <p>
-    {translate('schedules', 'start-time')}
-    {spec?.startTime ?? translate('none')}
-  </p>
-  <p>
-    {translate('schedules', 'end-time')}{spec?.endTime ?? translate('none')}
-  </p>
-  <p>{translate('schedules', 'jitter')}{spec?.jitter ?? translate('none')}</p>
-  <p>
-    {translate('schedules', 'exclusion-calendar')}{spec?.excludeCalendar?.[0] ??
-      translate('none')}
-  </p>
-  {#if state?.limitedActions}
+<ScheduleNotes {notes} />
+<div>
+  <button on:click={() => (show = !show)} class="settings">
+    {translate('schedules', 'advanced-settings')}
+    <Icon class="inline" name={show ? 'chevron-up' : 'chevron-down'} />
+  </button>
+  {#if show}
+    <p>
+      {translate('schedules', 'start-time')}
+      {spec?.startTime ?? translate('none')}
+    </p>
+    <p>
+      {translate('schedules', 'end-time')}{spec?.endTime ?? translate('none')}
+    </p>
+    <p>{translate('schedules', 'jitter')}{spec?.jitter ?? translate('none')}</p>
+    <p>
+      {translate('schedules', 'exclusion-calendar')}{spec
+        ?.excludeCalendar?.[0] ?? translate('none')}
+    </p>
+    {#if state?.limitedActions}
+      <p>
+        {translate('schedules', 'remaining-actions')}{state?.remainingActions ??
+          translate('none')}
+      </p>
+    {/if}
     <p>
-      {translate('schedules', 'remaining-actions')}{state?.remainingActions ??
+      {translate('schedules', 'overlap-policy')}{policies?.overlapPolicy ??
         translate('none')}
     </p>
   {/if}
-  <p>
-    {translate('schedules', 'overlap-policy')}{policies?.overlapPolicy ??
-      translate('none')}
-  </p>
-{/if}
+</div>
 
 <style lang="postcss">
   .settings {
diff --git a/src/lib/components/schedule/schedule-frequency.svelte b/src/lib/components/schedule/schedule-frequency.svelte
index f57286f46..d3d56aeeb 100644
--- a/src/lib/components/schedule/schedule-frequency.svelte
+++ b/src/lib/components/schedule/schedule-frequency.svelte
@@ -1,49 +1,20 @@
 <script lang="ts">
   import CodeBlock from '$lib/holocene/code-block.svelte';
   import type { StructuredCalendar } from '$lib/types/schedule';
-  import { intervalToComment } from '$lib/utilities/schedule-comment-formatting';
-  import { commentOrCalendarToFrequency } from '$lib/utilities/schedule-frequency-formatting';
 
   import type { IntervalSpec } from '$types';
 
   export let calendar: StructuredCalendar | undefined = undefined;
   export let interval: IntervalSpec | undefined = undefined;
-
-  const intervalSecs = interval?.interval as string;
-  const phaseSecs = interval?.phase as string;
+  export let inline = false;
 </script>
 
 <div class="flex flex-col {$$props.class}">
-  {#if calendar}
-    <p data-testid="schedule-calendar-frequency">
-      {commentOrCalendarToFrequency(calendar)}
-    </p>
-  {:else}
-    <p data-testid="schedule-interval-frequency">
-      {intervalToComment(intervalSecs)}
-    </p>
-    <p data-testid="schedule-phase-frequency">
-      {intervalToComment(phaseSecs, true)}
-    </p>
-  {/if}
-</div>
-
-<div class="flex flex-col {$$props.class}">
-  <!-- {#if calendar} -->
   <CodeBlock
     copyable
-    inline
+    {inline}
     testId="schedule-calendar"
-    class="mb-2"
     language="json"
     content={JSON.stringify(calendar || interval, null, 2)}
   />
-  <!-- {:else}
-    <p data-testid="schedule-interval-frequency">
-      {intervalToComment(intervalSecs)}
-    </p>
-    <p data-testid="schedule-phase-frequency">
-      {intervalToComment(phaseSecs, true)}
-    </p>
-  {/if} -->
 </div>
diff --git a/src/lib/components/schedule/schedule-memo.svelte b/src/lib/components/schedule/schedule-notes.svelte
similarity index 56%
rename from src/lib/components/schedule/schedule-memo.svelte
rename to src/lib/components/schedule/schedule-notes.svelte
index 24e5c22a9..f7f687342 100644
--- a/src/lib/components/schedule/schedule-memo.svelte
+++ b/src/lib/components/schedule/schedule-notes.svelte
@@ -4,5 +4,7 @@
   export let notes = '';
 </script>
 
-<h2 class="mb-4 text-2xl">{translate('memo')}</h2>
-<p>{notes}</p>
+<div>
+  <h2 class="mb-4 text-2xl">{translate('notes')}</h2>
+  <p>{notes}</p>
+</div>
diff --git a/src/lib/components/schedule/schedule-recent-runs.svelte b/src/lib/components/schedule/schedule-recent-runs.svelte
index 0f43e2ff1..e934cd622 100644
--- a/src/lib/components/schedule/schedule-recent-runs.svelte
+++ b/src/lib/components/schedule/schedule-recent-runs.svelte
@@ -8,9 +8,9 @@
   import { decodeURIForSvelte } from '$lib/utilities/encode-uri';
   import { formatDate } from '$lib/utilities/format-date';
   import { routeForEventHistory } from '$lib/utilities/route-for';
-  
+
   import WorkflowStatus from '../workflow-status.svelte';
-  
+
   import type { ScheduleActionResult } from '$types';
 
   export let recentRuns: ScheduleActionResult[] = [];
@@ -29,7 +29,7 @@
   };
 </script>
 
-<Panel>
+<Panel class="w-full">
   <h2 class="mb-4 text-2xl">{translate('schedules', 'recent-runs')}</h2>
   {#each sortRecentRuns(recentRuns) as run (run?.startWorkflowResult?.workflowId)}
     {#await fetchWorkflowForSchedule({ namespace, workflowId: decodeURIForSvelte(run.startWorkflowResult.workflowId), runId: run.startWorkflowResult.runId }, fetch) then workflow}
diff --git a/src/lib/components/schedule/schedules-table-row.svelte b/src/lib/components/schedule/schedules-table-row.svelte
index b0c1fff10..eadbda324 100644
--- a/src/lib/components/schedule/schedules-table-row.svelte
+++ b/src/lib/components/schedule/schedules-table-row.svelte
@@ -52,9 +52,6 @@
   </td>
   <td class="cell whitespace-pre-line break-words max-w-[600px] w-auto">
     <p class="text-base">{schedule.scheduleId}</p>
-    <p>
-      <ScheduleFrequency {calendar} {interval} class="text-sm" />
-    </p>
   </td>
   <td class="cell whitespace-pre-line break-words max-md:hidden">
     {schedule?.info?.workflowType?.name ?? ''}
@@ -86,6 +83,17 @@
     {/each}
   </td>
 </TableRow>
+<TableRow>
+  <td colspan="5" class="hidden xl:table-cell !p-0">
+    <ScheduleFrequency {calendar} {interval} inline class="text-sm w-auto" />
+  </td>
+  <td colspan="3" class="hidden md:table-cell xl:hidden">
+    <ScheduleFrequency {calendar} {interval} inline class="text-sm w-auto" />
+  </td>
+  <td colspan="2" class="md:hidden">
+    <ScheduleFrequency {calendar} {interval} inline class="text-sm w-auto" />
+  </td>
+</TableRow>
 
 <style lang="postcss">
   .cell {
diff --git a/src/lib/components/schedule/schedules-table.svelte b/src/lib/components/schedule/schedules-table.svelte
index 7589c53f5..7b7fc59a3 100644
--- a/src/lib/components/schedule/schedules-table.svelte
+++ b/src/lib/components/schedule/schedules-table.svelte
@@ -4,7 +4,7 @@
   import { translate } from '$lib/i18n/translate';
 </script>
 
-<Table class="table-fixed">
+<Table class="table-fixed w-full">
   <caption class="sr-only" slot="caption">{translate('schedules')}</caption>
   <TableHeaderRow slot="headers">
     <th class="w-28">{translate('status')}</th>
diff --git a/src/lib/holocene/code-block.svelte b/src/lib/holocene/code-block.svelte
index 1e0e1b01f..27d8dba92 100644
--- a/src/lib/holocene/code-block.svelte
+++ b/src/lib/holocene/code-block.svelte
@@ -15,8 +15,8 @@
     async?: boolean;
     testId?: string;
     copyable?: boolean;
-    copyIconTitle: string;
-    copySuccessIconTitle: string;
+    copyIconTitle?: string;
+    copySuccessIconTitle?: string;
   };
 
   type CopyableProps = Omit<
diff --git a/src/lib/i18n/locales/en/common.ts b/src/lib/i18n/locales/en/common.ts
index 2a8f6f0fe..3e19c11d7 100644
--- a/src/lib/i18n/locales/en/common.ts
+++ b/src/lib/i18n/locales/en/common.ts
@@ -65,6 +65,7 @@ export const Strings = {
   edit: 'Edit',
   delete: 'Delete',
   memo: 'Memo',
+  notes: 'Notes',
   add: 'Add',
   'from-now': 'from now',
   'hours-abbreviated': 'hrs.',
diff --git a/src/lib/pages/schedule-view.svelte b/src/lib/pages/schedule-view.svelte
index b46ee4866..004fffd51 100644
--- a/src/lib/pages/schedule-view.svelte
+++ b/src/lib/pages/schedule-view.svelte
@@ -5,7 +5,6 @@
   import ScheduleAdvancedSettings from '$lib/components/schedule/schedule-advanced-settings.svelte';
   import ScheduleError from '$lib/components/schedule/schedule-error.svelte';
   import ScheduleFrequencyPanel from '$lib/components/schedule/schedule-frequency-panel.svelte';
-  import ScheduleMemo from '$lib/components/schedule/schedule-memo.svelte';
   import ScheduleRecentRuns from '$lib/components/schedule/schedule-recent-runs.svelte';
   import ScheduleUpcomingRuns from '$lib/components/schedule/schedule-upcoming-runs.svelte';
   import WorkflowStatus from '$lib/components/workflow-status.svelte';
@@ -202,33 +201,28 @@
           <ScheduleError error={schedule?.info?.invalidScheduleError} />
         </div>
       {/if}
-      <div class="w-full xl:w-1/2" />
       <div class="flex flex-col xl:flex-row gap-4">
-        <div class="w-full xl:w-3/4">
+        <div class="w-full flex flex-col items-start gap-4 xl:w-2/3">
           <ScheduleRecentRuns
             {namespace}
             recentRuns={schedule?.info?.recentActions}
           />
+          <ScheduleUpcomingRuns
+            futureRuns={schedule?.info?.futureActionTimes}
+          />
+          <ScheduleAdvancedSettings
+            spec={schedule?.schedule?.spec}
+            state={schedule?.schedule?.state}
+            policies={schedule?.schedule?.policies}
+            notes={schedule?.schedule?.state?.notes}
+          />
+        </div>
+        <div class="w-full xl:w-1/3">
           <ScheduleFrequencyPanel
             calendar={schedule?.schedule?.spec?.structuredCalendar?.[0]}
             interval={schedule?.schedule?.spec?.interval?.[0]}
           />
         </div>
-        <div class="w-full xl:w-1/4 xl:min-w-[320px]">
-          <ScheduleUpcomingRuns
-            futureRuns={schedule?.info?.futureActionTimes}
-          />
-        </div>
-      </div>
-      <div class="w-full xl:w-1/2">
-        <ScheduleAdvancedSettings
-          spec={schedule?.schedule?.spec}
-          state={schedule?.schedule?.state}
-          policies={schedule?.schedule?.policies}
-        />
-      </div>
-      <div class="w-full xl:w-1/2">
-        <ScheduleMemo notes={schedule?.schedule?.state?.notes} />
       </div>
     </div>
     <Modal

From 7c2efbbd846a8bc0b912bb12c7e0588d3532370c Mon Sep 17 00:00:00 2001
From: Alex Tideman <alex.tideman@gmail.com>
Date: Tue, 29 Aug 2023 14:32:23 -0500
Subject: [PATCH 4/9] Consistent classes, remove w classes

---
 src/lib/components/schedule/schedules-table-row.svelte | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/components/schedule/schedules-table-row.svelte b/src/lib/components/schedule/schedules-table-row.svelte
index eadbda324..150139dee 100644
--- a/src/lib/components/schedule/schedules-table-row.svelte
+++ b/src/lib/components/schedule/schedules-table-row.svelte
@@ -50,7 +50,7 @@
   <td class="cell">
     <WorkflowStatus status={schedule?.info?.paused ? 'Paused' : 'Running'} />
   </td>
-  <td class="cell whitespace-pre-line break-words max-w-[600px] w-auto">
+  <td class="cell whitespace-pre-line break-words">
     <p class="text-base">{schedule.scheduleId}</p>
   </td>
   <td class="cell whitespace-pre-line break-words max-md:hidden">
@@ -87,10 +87,10 @@
   <td colspan="5" class="hidden xl:table-cell !p-0">
     <ScheduleFrequency {calendar} {interval} inline class="text-sm w-auto" />
   </td>
-  <td colspan="3" class="hidden md:table-cell xl:hidden">
+  <td colspan="3" class="hidden md:table-cell xl:hidden !p-0">
     <ScheduleFrequency {calendar} {interval} inline class="text-sm w-auto" />
   </td>
-  <td colspan="2" class="md:hidden">
+  <td colspan="2" class="md:hidden !p-0">
     <ScheduleFrequency {calendar} {interval} inline class="text-sm w-auto" />
   </td>
 </TableRow>

From 3abb1226dbc599e4e0f6505c0036995dbcc87737 Mon Sep 17 00:00:00 2001
From: Alex Tideman <alex.tideman@gmail.com>
Date: Tue, 29 Aug 2023 14:42:25 -0500
Subject: [PATCH 5/9] Reorder imports

---
 src/lib/components/schedule/schedule-advanced-settings.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/components/schedule/schedule-advanced-settings.svelte b/src/lib/components/schedule/schedule-advanced-settings.svelte
index 8a69ff081..cbf8a428c 100644
--- a/src/lib/components/schedule/schedule-advanced-settings.svelte
+++ b/src/lib/components/schedule/schedule-advanced-settings.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import Icon from '$lib/holocene/icon/icon.svelte';
   import { translate } from '$lib/i18n/translate';
+  import ScheduleNotes from './schedule-notes.svelte';
 
   import type { SchedulePolicies, ScheduleSpec, ScheduleState } from '$types';
-  import ScheduleNotes from './schedule-notes.svelte';
 
   export let spec: ScheduleSpec;
   export let state: ScheduleState;

From 235af3746e0cc7f05200e8ae41ad4d32f9d2e344 Mon Sep 17 00:00:00 2001
From: Alex Tideman <alex.tideman@gmail.com>
Date: Tue, 29 Aug 2023 14:53:29 -0500
Subject: [PATCH 6/9] Remove frequency from tests

---
 cypress/integration/schedules.spec.js                     | 8 --------
 .../components/schedule/schedules-calendar-view.svelte    | 7 +++----
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/cypress/integration/schedules.spec.js b/cypress/integration/schedules.spec.js
index 1495698a4..44a7d7f27 100644
--- a/cypress/integration/schedules.spec.js
+++ b/cypress/integration/schedules.spec.js
@@ -46,10 +46,6 @@ describe('Schedules View', () => {
 
     cy.get('[data-testid="schedule-name"]').should('exist');
     cy.get('[data-testid="schedule-name"]').contains(scheduleId);
-
-    cy.get('[data-testid="schedule-interval-frequency"]').contains(
-      'Every 30sec',
-    );
   });
 });
 
@@ -74,10 +70,6 @@ describe('Schedules Edit', () => {
     cy.get('[data-testid="schedule-name"]').should('exist');
     cy.get('[data-testid="schedule-name"]').contains(scheduleId);
 
-    cy.get('[data-testid="schedule-interval-frequency"]').contains(
-      'Every 30sec',
-    );
-
     cy.get('#schedule-actions-menu-button').click();
     cy.get('#schedule-actions-menu > [data-testid="edit-schedule"]').click();
     cy.url().should('contain', `/schedules/${scheduleId}/edit`);
diff --git a/src/lib/components/schedule/schedules-calendar-view.svelte b/src/lib/components/schedule/schedules-calendar-view.svelte
index f339450ae..298d72f4f 100644
--- a/src/lib/components/schedule/schedules-calendar-view.svelte
+++ b/src/lib/components/schedule/schedules-calendar-view.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { page } from '$app/stores';
-  
+
   import Input from '$lib/holocene/input/input.svelte';
   import TabList from '$lib/holocene/tab/tab-list.svelte';
   import TabPanel from '$lib/holocene/tab/tab-panel.svelte';
@@ -8,7 +8,7 @@
   import Tabs from '$lib/holocene/tab/tabs.svelte';
   import { translate } from '$lib/i18n/translate';
   import type { FullSchedule, SchedulePreset } from '$lib/types/schedule';
-  
+
   import ScheduleDayOfMonthView from './schedule-day-of-month-view.svelte';
   import ScheduleDayOfWeekView from './schedule-day-of-week-view.svelte';
   import ScheduleFrequency from './schedule-frequency.svelte';
@@ -82,11 +82,10 @@
   </TabList>
   <div class="mt-4 flex w-full flex-wrap gap-6">
     {#if schedule}
-      <TabPanel id="existing-panel" tabId="existing-tab">
+      <TabPanel id="existing-panel" tabId="existing-tab" class="w-full">
         <ScheduleFrequency
           calendar={schedule?.spec?.structuredCalendar?.[0]}
           interval={schedule?.spec?.interval?.[0]}
-          class="text-base"
         />
       </TabPanel>
     {/if}

From 188052ef453cb3b00fa5061cce680ce048736a6a Mon Sep 17 00:00:00 2001
From: Alex Tideman <alex.tideman@gmail.com>
Date: Tue, 29 Aug 2023 14:58:38 -0500
Subject: [PATCH 7/9] Add empty line

---
 src/lib/components/schedule/schedule-advanced-settings.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib/components/schedule/schedule-advanced-settings.svelte b/src/lib/components/schedule/schedule-advanced-settings.svelte
index cbf8a428c..5a0b06028 100644
--- a/src/lib/components/schedule/schedule-advanced-settings.svelte
+++ b/src/lib/components/schedule/schedule-advanced-settings.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import Icon from '$lib/holocene/icon/icon.svelte';
   import { translate } from '$lib/i18n/translate';
+
   import ScheduleNotes from './schedule-notes.svelte';
 
   import type { SchedulePolicies, ScheduleSpec, ScheduleState } from '$types';

From fabe5339dbb754875d60d5b67fbe32e13901d41e Mon Sep 17 00:00:00 2001
From: Alex Tideman <alex.tideman@gmail.com>
Date: Wed, 30 Aug 2023 09:59:46 -0500
Subject: [PATCH 8/9] Use Schedule Spec for title, change to just Delete

---
 .../components/schedule/schedule-frequency-panel.svelte    | 7 +++----
 src/lib/components/schedule/schedules-calendar-view.svelte | 2 +-
 src/lib/holocene/menu/menu.svelte                          | 4 ++--
 src/lib/i18n/locales/en/schedules.ts                       | 2 +-
 src/lib/pages/schedule-view.svelte                         | 2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/lib/components/schedule/schedule-frequency-panel.svelte b/src/lib/components/schedule/schedule-frequency-panel.svelte
index ebcd7f2d5..5cdb16a80 100644
--- a/src/lib/components/schedule/schedule-frequency-panel.svelte
+++ b/src/lib/components/schedule/schedule-frequency-panel.svelte
@@ -2,10 +2,9 @@
   import Panel from '$lib/components/panel.svelte';
   import { translate } from '$lib/i18n/translate';
   import type { StructuredCalendar } from '$lib/types/schedule';
-  
+
   import ScheduleFrequency from './schedule-frequency.svelte';
-  
-  
+
   import type { IntervalSpec } from '$types';
 
   export let calendar: StructuredCalendar | undefined = undefined;
@@ -13,7 +12,7 @@
 </script>
 
 <Panel>
-  <h2 class="mb-4 text-2xl">{translate('schedules', 'frequency')}</h2>
+  <h2 class="mb-4 text-2xl">{translate('schedules', 'schedule-spec')}</h2>
   <div class="pr-2">
     <ScheduleFrequency {calendar} {interval} class="text-base" />
   </div>
diff --git a/src/lib/components/schedule/schedules-calendar-view.svelte b/src/lib/components/schedule/schedules-calendar-view.svelte
index 298d72f4f..9c892d501 100644
--- a/src/lib/components/schedule/schedules-calendar-view.svelte
+++ b/src/lib/components/schedule/schedules-calendar-view.svelte
@@ -45,7 +45,7 @@
 </script>
 
 <Tabs class="mt-8 w-full">
-  <h2 class="mb-4 text-2xl">{translate('schedules', 'frequency')}</h2>
+  <h2 class="mb-4 text-2xl">{translate('schedules', 'schedule-spec')}</h2>
   <TabList label="Schedule Tabs" class="flex flex-wrap gap-6">
     {#if schedule}
       <Tab
diff --git a/src/lib/holocene/menu/menu.svelte b/src/lib/holocene/menu/menu.svelte
index f618aa8b4..fb1bb74ac 100644
--- a/src/lib/holocene/menu/menu.svelte
+++ b/src/lib/holocene/menu/menu.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import type { HTMLAttributes } from 'svelte/elements';
   import { fly } from 'svelte/transition';
-  
+
   import { getContext } from 'svelte';
-  
+
   import { MENU_CONTEXT, type MenuContext } from './menu-container.svelte';
 
   interface $$Props extends HTMLAttributes<HTMLUListElement> {
diff --git a/src/lib/i18n/locales/en/schedules.ts b/src/lib/i18n/locales/en/schedules.ts
index 8be04400a..5a03a1996 100644
--- a/src/lib/i18n/locales/en/schedules.ts
+++ b/src/lib/i18n/locales/en/schedules.ts
@@ -10,6 +10,7 @@ export const Strings = {
   name: 'Schedule Name',
   schedule: 'Schedule',
   frequency: 'Frequency',
+  'schedule-spec': 'Schedule Spec',
   'empty-state-title': 'No Schedules Found',
   'empty-state-description': 'Try a different search',
   'recent-runs': 'Recent Runs',
@@ -17,7 +18,6 @@ export const Strings = {
   'upcoming-runs': 'Upcoming Runs',
   loading: 'Loading Schedule...',
   deleting: 'Deleting Schedule...',
-  delete: 'Delete Schedule',
   'delete-schedule-error': 'Cannot delete schedule. {{error}}',
   pause: 'Pause',
   unpause: 'Unpause',
diff --git a/src/lib/pages/schedule-view.svelte b/src/lib/pages/schedule-view.svelte
index 004fffd51..88fee0037 100644
--- a/src/lib/pages/schedule-view.svelte
+++ b/src/lib/pages/schedule-view.svelte
@@ -191,7 +191,7 @@
           destructive
           on:click={() => (deleteConfirmationModalOpen = true)}
         >
-          {translate('schedules', 'delete')}
+          {translate('delete')}
         </MenuItem>
       </SplitButton>
     </header>

From eb60cb7beb8e7f276363bb47c9c06e95af94bf5a Mon Sep 17 00:00:00 2001
From: Alex Tideman <alex.tideman@gmail.com>
Date: Wed, 30 Aug 2023 14:35:43 -0500
Subject: [PATCH 9/9] Remove top border of frequency table row

---
 src/lib/components/schedule/schedules-table-row.svelte | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/lib/components/schedule/schedules-table-row.svelte b/src/lib/components/schedule/schedules-table-row.svelte
index 150139dee..d8f6f2683 100644
--- a/src/lib/components/schedule/schedules-table-row.svelte
+++ b/src/lib/components/schedule/schedules-table-row.svelte
@@ -83,7 +83,7 @@
     {/each}
   </td>
 </TableRow>
-<TableRow>
+<TableRow class="row">
   <td colspan="5" class="hidden xl:table-cell !p-0">
     <ScheduleFrequency {calendar} {interval} inline class="text-sm w-auto" />
   </td>
@@ -99,4 +99,8 @@
   .cell {
     @apply p-2 text-left;
   }
+
+  :global(.row td) {
+    @apply !border-t-0;
+  }
 </style>