diff --git a/frontend/src/routes/audit_logs.svelte b/frontend/src/routes/audit_logs.svelte
index 0526f17095..05de498b22 100644
--- a/frontend/src/routes/audit_logs.svelte
+++ b/frontend/src/routes/audit_logs.svelte
@@ -141,7 +141,7 @@
{#if logs}
{#each logs as { id, timestamp, username, operation, action_kind, resource, parameters }}
- | {id} |
+ {id} |
+ |
{operation} |
{resource} |
diff --git a/frontend/src/routes/flows/get/[...path].svelte b/frontend/src/routes/flows/get/[...path].svelte
index 478834d59c..72349832eb 100644
--- a/frontend/src/routes/flows/get/[...path].svelte
+++ b/frontend/src/routes/flows/get/[...path].svelte
@@ -34,9 +34,7 @@
import ShareModal from '$lib/components/ShareModal.svelte'
import Toggle from '$lib/components/Toggle.svelte'
import { userStore, workspaceStore } from '$lib/stores'
- import SharedBadge from '$lib/components/SharedBadge.svelte'
import SvelteMarkdown from 'svelte-markdown'
- import Dropdown from '$lib/components/Dropdown.svelte'
import CenteredPage from '$lib/components/CenteredPage.svelte'
import FlowViewer from '$lib/components/FlowViewer.svelte'
import { Button, ActionRow, Skeleton, Badge } from '$lib/components/common'
diff --git a/frontend/src/routes/index.svelte b/frontend/src/routes/index.svelte
index 0be0e11a15..294c1b9a60 100644
--- a/frontend/src/routes/index.svelte
+++ b/frontend/src/routes/index.svelte
@@ -2,15 +2,18 @@
import CenteredPage from '$lib/components/CenteredPage.svelte'
import JobDetail from '$lib/components/jobs/JobDetail.svelte'
import {
+ AppService,
FlowService,
Job,
JobService,
+ ListableApp,
Script,
ScriptService,
type Flow,
type OpenFlow
} from '$lib/gen'
import { superadmin, userStore, workspaceStore } from '$lib/stores'
+ import VirtualList from '@sveltejs/svelte-virtual-list'
import {
Alert,
Button,
@@ -25,16 +28,15 @@
import PageHeader from '$lib/components/PageHeader.svelte'
import CreateActionsFlow from '$lib/components/flows/CreateActionsFlow.svelte'
import CreateActionsScript from '$lib/components/scripts/CreateActionsScript.svelte'
- import { canWrite, getScriptByPath, sendUserToast } from '$lib/utils'
+ import { canWrite, classNames, getScriptByPath, pluralize } from '$lib/utils'
import type { HubItem } from '$lib/components/flows/pickers/model'
import ShareModal from '$lib/components/ShareModal.svelte'
- import Icon from 'svelte-awesome'
import {
- faBuilding,
faCodeFork,
+ faDashboard,
faGlobe,
- faScroll,
- faWind
+ faLayerGroup,
+ faPlus
} from '@fortawesome/free-solid-svg-icons'
import PickHubScript from '$lib/components/flows/pickers/PickHubScript.svelte'
import PickHubFlow from './PickHubFlow.svelte'
@@ -42,20 +44,40 @@
import HighlightCode from '$lib/components/HighlightCode.svelte'
import SearchItems from '$lib/components/SearchItems.svelte'
import Badge from '$lib/components/common/badge/Badge.svelte'
- import ScriptBox from '$lib/components/ScriptBox.svelte'
- import FlowBox from '$lib/components/FlowBox.svelte'
import type uFuzzy from '@leeoniya/ufuzzy'
+ import { Building, Code2, Globe2, LayoutDashboard, Wind } from 'svelte-lucide'
+ import Table from '$lib/components/common/table/Table.svelte'
+ import ScriptRow from '$lib/components/common/table/ScriptRow.svelte'
+ import FlowRow from '$lib/components/common/table/FlowRow.svelte'
+ import AppRow from '$lib/components/common/table/AppRow.svelte'
+
+ import { fade } from 'svelte/transition'
+ import { flip } from 'svelte/animate'
+ import CreateApp from '$lib/components/apps/CreateApp.svelte'
let jobs: Job[] = []
type Tab = 'hubscripts' | 'hubflows' | 'workspace'
- type ScriptW = Script & { canWrite: boolean; marked?: string }
- type FlowW = Flow & { canWrite: boolean; marked?: string }
- let scripts: ScriptW[] = []
- let flows: FlowW[] = []
- let filteredItems: ((ScriptW & { type: 'script' }) | (FlowW & { type: 'flow' }))[] = []
- let itemKind: 'script' | 'flow' | 'all' = 'all'
+ type TableItem = T & {
+ canWrite: boolean
+ marked?: string
+ type?: U
+ time?: number
+ starred?: boolean
+ }
+
+ type TableScript = TableItem
+ type TableFlow = TableItem
+ type TableApp = TableItem
+
+ let scripts: TableScript[] = []
+ let flows: TableFlow[] = []
+ let apps: TableApp[] = []
+
+ let filteredItems: (TableScript | TableFlow | TableApp)[] = []
+
+ let itemKind: 'script' | 'flow' | 'app' | 'all' = 'all'
let tab: Tab = 'workspace'
let filter: string = ''
@@ -72,15 +94,20 @@
let codeViewerObj: HubItem | undefined = undefined
async function loadScripts(): Promise {
- scripts = (await ScriptService.listScripts({ workspace: $workspaceStore!, perPage: 300 })).map(
- (x: Script) => {
- return {
- canWrite:
- canWrite(x.path, x.extra_perms, $userStore) && x.workspace_id == $workspaceStore,
- ...x
- }
+ const loadedScripts = await ScriptService.listScripts({
+ workspace: $workspaceStore!,
+ perPage: 300
+ })
+
+ scripts = loadedScripts.map((script: Script) => {
+ return {
+ canWrite:
+ canWrite(script.path, script.extra_perms, $userStore) &&
+ script.workspace_id == $workspaceStore,
+ ...script
}
- )
+ })
+
loading = false
}
@@ -102,14 +129,16 @@
loading = false
}
- async function archiveFlow(path: string): Promise {
- try {
- await FlowService.archiveFlowByPath({ workspace: $workspaceStore!, path })
- loadFlows()
- sendUserToast(`Successfully archived flow ${path}`)
- } catch (err) {
- sendUserToast(`Could not archive this flow ${err.body}`, true)
- }
+ async function loadApps(): Promise {
+ apps = (await AppService.listApps({ workspace: $workspaceStore! })).map((app: ListableApp) => {
+ return {
+ canWrite:
+ canWrite(app.path!, app.extra_perms!, $userStore) && app.workspace_id == $workspaceStore,
+ ...app
+ }
+ })
+
+ loading = false
}
async function viewFlow(obj: { flow_id: number }): Promise {
@@ -122,10 +151,7 @@
new Set(filteredItems?.map((x) => x.path.split('/').slice(0, 2).join('/')) ?? [])
).sort()
- let combinedItems: (
- | (ScriptW & { type: 'script'; time: number })
- | (FlowW & { type: 'flow'; time: number })
- )[] = []
+ let combinedItems: (TableScript | TableFlow | TableApp)[] = []
$: combinedItems = [
...flows.map((x) => ({ ...x, type: 'flow' as 'flow', time: new Date(x.edited_at).getTime() })),
@@ -133,7 +159,8 @@
...x,
type: 'script' as 'script',
time: new Date(x.created_at).getTime()
- }))
+ })),
+ ...apps.map((x) => ({ ...x, type: 'app' as 'app', time: new Date(x.edited_at).getTime() }))
].sort((a, b) => (a.starred != b.starred ? (a.starred ? -1 : 1) : a.time - b.time > 0 ? -1 : 1))
$: preFilteredItems =
@@ -159,6 +186,7 @@
if (($userStore || $superadmin) && $workspaceStore) {
loadScripts()
loadFlows()
+ loadApps()
loadJobs()
}
}
@@ -178,7 +206,7 @@
interIns
} = info
- return idx
+ const sortResult = idx
.map((v, i) => i)
.sort(
(ia, ib) =>
@@ -202,8 +230,13 @@
(preFilteredItems[idx[ib]].starred ? 100 : 0) -
(preFilteredItems[idx[ia]].starred ? 100 : 0)
)
+ return sortResult
}
}
+
+ $: items = filter !== '' ? filteredItems : preFilteredItems
+
+ $: containerHeight = items.length < 5 ? items.length * 80 : 800
-
+ startIcon={{ icon: faCodeFork }}
+ >
+ Fork
+
+
@@ -250,15 +288,18 @@
-
+ variant="border"
+ >
+ View on the Hub
+
+
+
{#if flowViewerFlow?.flow}
@@ -273,14 +314,15 @@
{:else if $workspaceStore == 'starter'}
- The starter workspace has all its elements (variables, resources, scripts, flows) shared
+
+ The starter workspace has all its elements (variables, resources, scripts, flows) shared
across all other workspaces. Useful to seed workspace with common elements within your
- organization.
+ organization.
+
{/if}
-
+
+
@@ -288,75 +330,141 @@
- Workspace
- Hub Scripts
- Hub Flows
+
+
+
+ Workspace
+
+
+
+
+
+ Hub Scripts
+
+
+
+
+
+ Hub Flows
+
+
-
+
{#if tab == 'workspace'}
-
-
-
+
+
+
+ All
+
+
+
+ Scripts
+
+
+
+
+
+ Flows
+
+
+
+
+
+ Apps
+
+
+
+
-
-
- All
- Scripts
- Flows
-
-
-
- {#each owners as owner}
- {
- ownerFilter = ownerFilter == owner ? undefined : owner
- }}
- color={owner === ownerFilter ? 'blue' : 'gray'}
- >
- {owner}
- {#if owner === ownerFilter}✗{/if}
-
- {/each}
-
-
-
+
+ {#if owners.length > 0}
+
+ {#each owners as owner (owner)}
+
+ {
+ ownerFilter = ownerFilter == owner ? undefined : owner
+ }}
+ color={owner === ownerFilter ? 'blue' : 'gray'}
+ baseClass={owner === ownerFilter ? 'border border-blue-500' : 'border'}
+ >
+ {owner}
+ {#if owner === ownerFilter}✗{/if}
+
+
{/each}
+
+ {/if}
+
+ {#if filteredItems.length === 0}
+
+
+ No items found
+ Try changing your search or filters
+
+
{:else}
- {#each Array(10).fill(0) as sk}
-
- {/each}
+
+
+ {#if item.type == 'script'}
+
+ {:else if item.type == 'flow'}
+
+ {:else if item.type == 'app'}
+
+ {/if}
+
+
+ {pluralize(items.length, 'item')}
{/if}
{:else if tab == 'hubscripts'}
@@ -365,36 +473,5 @@
viewFlow(e.detail)} />
{/if}
-
-
- Runs
-
-
-
-
- {#each jobs.splice(0, 3) as job}
-
- {/each}
-
-
-
diff --git a/frontend/src/routes/run/[...run].svelte b/frontend/src/routes/run/[...run].svelte
index bfa4b4f63a..ca67335f0f 100644
--- a/frontend/src/routes/run/[...run].svelte
+++ b/frontend/src/routes/run/[...run].svelte
@@ -106,11 +106,11 @@
Are you in the right workspace?
{#each $usersWorkspaceStore?.workspaces ?? [] as workspace}
-
+
+
+
{/each}
@@ -307,7 +307,7 @@
{#if job}
-
+
{#if viewTab == 'logs'}
diff --git a/frontend/src/routes/runs/[...path].svelte b/frontend/src/routes/runs/[...path].svelte
index 5be75c0c3d..6d8bbf23ab 100644
--- a/frontend/src/routes/runs/[...path].svelte
+++ b/frontend/src/routes/runs/[...path].svelte
@@ -176,15 +176,19 @@
on:click={() => {
goto('/runs?' + $page.url.searchParams.toString())
}}
- size="xs">
+
+
+
+
@@ -248,8 +252,10 @@
maxTs = undefined
jobs = await fetchJobs(maxTs, minTs)
}}
- size="xs">
+
+
{#if jobs}
diff --git a/frontend/src/routes/scripts/get/[...hash].svelte b/frontend/src/routes/scripts/get/[...hash].svelte
index fb0598fb90..c8ac3199d0 100644
--- a/frontend/src/routes/scripts/get/[...hash].svelte
+++ b/frontend/src/routes/scripts/get/[...hash].svelte
@@ -16,8 +16,7 @@
canWrite,
defaultIfEmptyString,
scriptToHubUrl,
- copyToClipboard,
- emptyString
+ copyToClipboard
} from '$lib/utils'
import {
faPlay,
@@ -269,9 +268,9 @@
startIcon={{ icon: faArrowLeft }}
href="/scripts/get/{script.parent_hashes[0]}"
>
- Previous version ({script.parent_hashes.length})
+
+ Previous version ({script.parent_hashes.length})
+
{#each script.parent_hashes as hash}
@@ -283,7 +282,7 @@
{#if script.lock_error_logs || topHash || script.archived || script.deleted}
-
+
{#if script.lock_error_logs}
Error deploying this script
diff --git a/frontend/src/routes/user/workspaces@user.svelte b/frontend/src/routes/user/workspaces@user.svelte
index d5714788bb..d33ee1afcc 100644
--- a/frontend/src/routes/user/workspaces@user.svelte
+++ b/frontend/src/routes/user/workspaces@user.svelte
@@ -161,12 +161,14 @@
{#if $superadmin}
+
+ Superadmin settings
+
{/if}
+
+ User settings
+
|