From 9240e0c90380fc6b44a3dde480bd2d29476b2a0f Mon Sep 17 00:00:00 2001
From: Philipp Dormann <philipp.dormann1@gmail.com>
Date: Sun, 24 Jan 2021 17:30:31 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20general=20runner=20cleanup?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ref #13
---
 src/components/RunnerDetail.svelte     |  2 +-
 src/components/RunnerFileUpload.svelte | 75 --------------------------
 src/components/Runners.svelte          | 20 ++++---
 3 files changed, 15 insertions(+), 82 deletions(-)
 delete mode 100644 src/components/RunnerFileUpload.svelte

diff --git a/src/components/RunnerDetail.svelte b/src/components/RunnerDetail.svelte
index 036792a8..7b558f46 100644
--- a/src/components/RunnerDetail.svelte
+++ b/src/components/RunnerDetail.svelte
@@ -6,9 +6,9 @@
   import Toastify from "toastify-js";
   import PromiseError from "./PromiseError.svelte";
   import isEmail from "validator/es/lib/isEmail";
-  const runner_promise = RunnerService.runnerControllerGetOne(params.runnerid);
   let data_loaded = false;
   export let params;
+  const runner_promise = RunnerService.runnerControllerGetOne(params.runnerid);
   $: delete_triggered = false;
   $: original_data = {};
   $: editable = {};
diff --git a/src/components/RunnerFileUpload.svelte b/src/components/RunnerFileUpload.svelte
deleted file mode 100644
index 5dfc723d..00000000
--- a/src/components/RunnerFileUpload.svelte
+++ /dev/null
@@ -1,75 +0,0 @@
-<script>
-  import "filepond/dist/filepond.css";
-  import FilePond from "svelte-filepond";
-  import { _ } from "svelte-i18n";
-  let pond;
-  // pond.getFiles() will return the active files
-  // the name to use for the internal file input
-  let name = "filepond";
-  function handleInit() {
-    // console.log("FilePond has initialised");
-  }
-  function handleAddFile(err, fileItem) {
-    // console.log("A file has been added", fileItem);
-  }
-  const labelInvalidField = $_("filepond__field-contains-invalid-files");
-  const labelFileWaitingForSize = $_("filepond__waiting-for-size");
-  const labelFileSizeNotAvailable = $_("filepond__size-not-available");
-  const labelFileLoading = $_("filepond__loading");
-  const labelFileLoadError = $_("filepond__error-during-load");
-  const labelFileProcessing = $_("filepond__uploading");
-  const labelFileProcessingComplete = $_("filepond__upload-complete");
-  const labelFileProcessingAborted = $_("filepond__upload-cancelled");
-  const labelFileProcessingError = $_("filepond__error-during-upload");
-  const labelFileProcessingRevertError = $_("filepond__error-during-revert");
-  const labelFileRemoveError = $_("filepond__error-during-remove");
-  const labelTapToCancel = $_("filepond__tap-to-cancel");
-  const labelTapToRetry = $_("filepond__tap-to-retry");
-  const labelTapToUndo = $_("filepond__tap-to-undo");
-  const labelButtonRemoveItem = $_("filepond__remove");
-  const labelButtonAbortItemLoad = $_("filepond__abort");
-  const labelButtonRetryItemLoad = $_("filepond__retry");
-  const labelButtonAbortItemProcessing = $_("filepond__cancel");
-  const labelButtonUndoItemProcessing = $_("filepond__undo");
-  const labelButtonRetryItemProcessing = $_("filepond__retry");
-  const labelButtonProcessItem = $_("filepond__upload");
-  const labelIdle =
-    $_("drag-and-drop-your-files-or") +
-    ` <span class="filepond--label-action"> ` +
-    $_("browse") +
-    ` </span>`;
-</script>
-
-<div class="col-span-6">
-  <FilePond
-    class="col-span-6"
-    bind:this={pond}
-    {name}
-    {labelFileWaitingForSize}
-    {labelFileSizeNotAvailable}
-    {labelFileLoading}
-    {labelFileLoadError}
-    {labelFileProcessing}
-    {labelFileProcessingComplete}
-    {labelFileProcessingAborted}
-    {labelFileProcessingError}
-    {labelFileProcessingRevertError}
-    {labelFileRemoveError}
-    {labelTapToCancel}
-    {labelTapToRetry}
-    {labelTapToUndo}
-    {labelButtonRemoveItem}
-    {labelButtonAbortItemLoad}
-    {labelButtonRetryItemLoad}
-    {labelButtonAbortItemProcessing}
-    {labelButtonUndoItemProcessing}
-    {labelButtonRetryItemProcessing}
-    {labelButtonProcessItem}
-    {labelIdle}
-    {labelInvalidField}
-    server="/api"
-    allowMultiple={false}
-    credits={false}
-    oninit={handleInit}
-    onaddfile={handleAddFile} />
-</div>
diff --git a/src/components/Runners.svelte b/src/components/Runners.svelte
index e3297f97..8b33c482 100644
--- a/src/components/Runners.svelte
+++ b/src/components/Runners.svelte
@@ -2,11 +2,11 @@
   import { _ } from "svelte-i18n";
   import store from "../store";
   import AddRunnerModal from "./AddRunnerModal.svelte";
-  // import ImportRunnerModal from "./ImportRunnerModal.svelte";
+  import ImportRunnerModal from "./ImportRunnerModal.svelte";
   import RunnersOverview from "./RunnersOverview.svelte";
-  export let modal_open = false;
-  // export let import_modal_open = false;
   let current_runners = [];
+  export let modal_open = false;
+  export let import_modal_open = false;
 </script>
 
 <section class="container p-5">
@@ -21,14 +21,14 @@
         class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
         Läufer hinzufügen
       </button>
-      <!-- <button
+      <button
         on:click={() => {
           import_modal_open = true;
         }}
         type="button"
         class="w-full inline-flex justify-center rounded-md border border-transparent shadow-sm px-4 py-2 bg-blue-600 text-base font-medium text-white hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 sm:ml-3 sm:w-auto sm:text-sm">
         Läufer importieren
-      </button> -->
+      </button>
     {/if}
   </span>
   <p class="mb-8 text-lg text-gray-500">läuft bei ihnen</p>
@@ -37,5 +37,13 @@
 
 {#if store.state.jwtinfo.userdetails.permissions.includes('RUNNER:CREATE')}
   <AddRunnerModal bind:current_runners bind:modal_open />
-  <!-- <ImportRunnerModal bind:import_modal_open /> -->
+  <ImportRunnerModal
+    on:cancelDelete={(event) => {
+      import_modal_open = false;
+    }}
+    passed_team={{}}
+    passed_orgs={[]}
+    passed_org={{}}
+    opened_from="RunnerOverview"
+    bind:import_modal_open />
 {/if}