[airavata-django-portal] 01/03: AIRAVATA-3081 Move Uppy into common components

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git

commit 49d19825029fb6e5765e89aaa2925f12c801de9e
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Oct 2 15:17:30 2019 -0400

    AIRAVATA-3081 Move Uppy into common components
---
 .../experiment/input-editors/InputFileSelector.vue           | 12 +++++-------
 .../js/containers/UserStorageContainer.vue                   |  8 +++-----
 .../input-editors => static/common/js/components}/Uppy.vue   |  0
 django_airavata/static/common/js/index.js                    |  4 +++-
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/input-editors/InputFileSelector.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/input-editors/InputFileSelector.vue
index df3063b..2c01d84 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/input-editors/InputFileSelector.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/input-editors/InputFileSelector.vue
@@ -30,8 +30,8 @@
 
 <script>
 import { models } from "django-airavata-api";
+import { components } from "django-airavata-common-ui";
 import UserStorageFileSelectionContainer from "../../storage/UserStorageFileSelectionContainer";
-import Uppy from "./Uppy";
 
 export default {
   name: "input-file-selector",
@@ -47,17 +47,15 @@ export default {
   },
   components: {
     UserStorageFileSelectionContainer,
-    Uppy
-  },
-  computed: {
+    uppy: components.Uppy
   },
+  computed: {},
   data() {
     return {
-      isSelectingFile: false,
+      isSelectingFile: false
     };
   },
-  created() {
-  },
+  created() {},
   methods: {
     unselect() {
       this.file = null;
diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/containers/UserStorageContainer.vue b/django_airavata/apps/workspace/static/django_airavata_workspace/js/containers/UserStorageContainer.vue
index d3a2aab..c8aec4d 100644
--- a/django_airavata/apps/workspace/static/django_airavata_workspace/js/containers/UserStorageContainer.vue
+++ b/django_airavata/apps/workspace/static/django_airavata_workspace/js/containers/UserStorageContainer.vue
@@ -54,14 +54,12 @@
 
 <script>
 import { services, session, utils } from "django-airavata-api";
-import { notifications } from "django-airavata-common-ui";
-
-import Uppy from "../components/experiment/input-editors/Uppy";
+import { components, notifications } from "django-airavata-common-ui";
 
 export default {
   name: "user-storage-container",
   components: {
-    Uppy
+    uppy: components.Uppy
   },
   computed: {
     storagePath() {
@@ -82,7 +80,7 @@ export default {
   data() {
     return {
       userStoragePath: null,
-      dirName: null,
+      dirName: null
     };
   },
   methods: {
diff --git a/django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/input-editors/Uppy.vue b/django_airavata/static/common/js/components/Uppy.vue
similarity index 100%
rename from django_airavata/apps/workspace/static/django_airavata_workspace/js/components/experiment/input-editors/Uppy.vue
rename to django_airavata/static/common/js/components/Uppy.vue
diff --git a/django_airavata/static/common/js/index.js b/django_airavata/static/common/js/index.js
index 9bec96e..25b3519 100644
--- a/django_airavata/static/common/js/index.js
+++ b/django_airavata/static/common/js/index.js
@@ -19,6 +19,7 @@ import Sidebar from "./components/Sidebar.vue";
 import SidebarFeed from "./components/SidebarFeed.vue";
 import SidebarHeader from "./components/SidebarHeader.vue";
 import UnsavedChangesGuard from "./components/UnsavedChangesGuard.vue";
+import Uppy from "./components/Uppy";
 
 import GlobalErrorHandler from "./errors/GlobalErrorHandler";
 import ValidationErrors from "./errors/ValidationErrors";
@@ -55,7 +56,8 @@ const components = {
   Sidebar,
   SidebarFeed,
   SidebarHeader,
-  UnsavedChangesGuard
+  UnsavedChangesGuard,
+  Uppy
 };
 
 const errors = {