Merge pull request #123 from fractal-analytics-platform/v0.3

Minor fixes in v0.3

Author: rkpasia

src/lib/components/workflow/common/FormStructure.svelte

@@ -13,6 +13,9 @@
   export let entryId = undefined
   export let isListEntry = false
   export let entryIndex = undefined
+  // Set a random guid to the entry
+  let entryEscapedName = 'entry-' + entryName
+  // Generate a random string
 
   // TODO: This is a temporary solution to the problem of having multiple entries with the same name
   if (entryId === undefined) {
@@ -100,11 +103,11 @@
       <div class="accordion">
         <div class="accordion-item">
           <div class="accordion-header">
-            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#{entryId}">
+            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#{entryEscapedName}">
               {!isListEntry? entryName : ''} (obj)
             </button>
           </div>
-          <div id="{entryId}" class="accordion-collapse collapse">
+          <div id="{entryEscapedName}" class="accordion-collapse collapse">
             <div class="accordion-body p-2">
               {#each Object.entries(entry) as [key, value]}
                 <svelte:self entry={value} entryName={key} on:entryUpdated={handleEntryUpdate} on:entryInserted={handleNewEntryInserted}/>
@@ -132,11 +135,11 @@
       <div class="accordion">
         <div class="accordion-item">
           <div class="accordion-header">
-            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#{entryName}">
+            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#{entryEscapedName}">
               {!isListEntry ? entryName : ''} (list)
             </button>
           </div>
-          <div id="{entryName}" class="accordion-collapse collapse">
+          <div id="{entryEscapedName}" class="accordion-collapse collapse">
             <div class="accordion-body p-2">
               {#each entry as listItem, index}
                 <svelte:self isListEntry={true} entry={listItem} entryIndex={index} entryId={entryName + '-' + index + '-' + 'list-item' } entryName={entryName + '-' + index + '-' + 'list-item' } on:entryUpdated={handleEntryUpdate} on:entryInserted={handleNewEntryInserted} />

src/routes/projects/[id]/datasets/[datasetId]/+page.svelte

@@ -3,21 +3,30 @@
   import { page } from '$app/stores'
   import { enhance } from '$app/forms'
   import { getDataset, updateDataset, deleteDatasetResource, createDatasetResource } from '$lib/api/v1/project/project_api'
+  import { loadProjectContext } from '$lib/components/projects/controller'
+  import { contextProject } from '$lib/stores/projectStores'
   import ConfirmActionButton from '$lib/components/common/ConfirmActionButton.svelte'
   import StandardErrorAlert from '$lib/components/common/StandardErrorAlert.svelte'
 
   let projectId = $page.params.id
   let datasetId = $page.params.datasetId
 
+  let project = undefined
   let dataset = undefined
   let updateDatasetSuccess = false
   let createResourceSuccess = false
 
+
+  contextProject.subscribe((context) => {
+    project = context.project
+  })
+
   onMount(async () => {
     dataset = await getDataset(projectId, datasetId)
       .catch(error => {
         console.error(error)
       })
+    await loadProjectContext(projectId)
   })
 
   async function handleDatasetUpdate({ form, data, cancel }) {
@@ -94,7 +103,7 @@
         <a href="/projects">Projects</a>
       </li>
       <li class="breadcrumb-item" aria-current="page">
-        <a href="/projects/{projectId}">Project</a>
+        <a href="/projects/{projectId}">{project?.name}</a>
       </li>
       <li class="breadcrumb-item" aria-current="page">Datasets</li>
       {#if dataset}

src/routes/projects/[id]/jobs/+page.svelte

@@ -52,21 +52,25 @@
     let workflowQueryFilter = $page.url.searchParams.get('workflow')
     if (workflowQueryFilter) {
       tableHandler.filter(workflowQueryFilter, 'workflow_id', check.isEqualTo)
+      workflowFilter = Number.parseInt(workflowQueryFilter)
     }
 
     let inputDatasetQueryFilter = $page.url.searchParams.get('input_dataset')
     if (inputDatasetQueryFilter) {
       tableHandler.filter(inputDatasetQueryFilter, 'input_dataset_id', check.isEqualTo)
+      inputDatasetFilter = Number.parseInt(inputDatasetQueryFilter)
     }
 
     let outputDatasetQueryFilter = $page.url.searchParams.get('output_dataset')
     if (outputDatasetQueryFilter) {
       tableHandler.filter(outputDatasetQueryFilter, 'output_dataset_id', check.isEqualTo)
+      outputDatasetFilter = Number.parseInt(outputDatasetQueryFilter)
     }
 
     let statusQueryFilter = $page.url.searchParams.get('status')
     if (statusQueryFilter) {
       tableHandler.filter(statusQueryFilter, 'status', check.isEqualTo)
+      statusFilter = statusQueryFilter
     }
 
   })

src/routes/projects/[id]/workflows/[workflowId]/+page.svelte

@@ -210,7 +210,7 @@
       </li>
       {#if $page.params.id}
         <li class="breadcrumb-item" aria-current="page">
-          <a href="/projects/{$page.params.id}">{$page.params.id}</a>
+          <a href="/projects/{$page.params.id}">{project?.name}</a>
         </li>
       {/if}
       <li class="breadcrumb-item">
@@ -224,6 +224,7 @@
     </ol>
   </nav>
   <div>
+    <a href="/projects/{project?.id}/jobs?workflow={workflow?.id}" class="btn btn-light"><i class="bi-journal-code"></i> List jobs</a>
     <button class="btn btn-light" on:click|preventDefault={handleExportWorkflow}><i class="bi-box-arrow-up"></i></button>
     <a id="downloadWorkflowButton" class="d-none">Download workflow link</a>
     <button class="btn btn-light" data-bs-toggle="modal" data-bs-target="#editWorkflowModal"><i class="bi-gear-wide-connected"></i></button>

tests/data/example_server_startup/fresh_startup.sh

@@ -20,6 +20,7 @@ JWT_EXPIRE_SECONDS=84600
 
 rm test.db
 rm -r /tmp/FRACTAL_TASKS_DIR
+rm -r artifacts
 
 # Create an empty db
 fractalctl set-db