diff --git a/plugins/cloudimport/app_views.py b/plugins/cloudimport/app_views.py index a9a97ab6..c9f8e5b5 100644 --- a/plugins/cloudimport/app_views.py +++ b/plugins/cloudimport/app_views.py @@ -11,6 +11,7 @@ from app.plugins import logger from .platform_helper import get_all_extended_platforms class DynamicForm(forms.Form): + """This dynamic form will go through all the extended platforms, and retrieve their fields""" def __init__(self, *args, **kwargs): ds = kwargs.pop('data_store') super(DynamicForm, self).__init__(*args, **kwargs) diff --git a/plugins/cloudimport/manifest.json b/plugins/cloudimport/manifest.json index 54ecdf72..609d11ab 100644 --- a/plugins/cloudimport/manifest.json +++ b/plugins/cloudimport/manifest.json @@ -1,7 +1,7 @@ { "name": "Cloud Import", "webodmMinVersion": "1.1.2", - "description": "Import images from external servers directly", + "description": "Import images from external sources directly", "version": "1.0.0", "author": "Nicolas Chamo", "email": "nicolas@chamo.com.ar", diff --git a/plugins/cloudimport/plugin.py b/plugins/cloudimport/plugin.py index 8acfc6a4..82fbc6e1 100644 --- a/plugins/cloudimport/plugin.py +++ b/plugins/cloudimport/plugin.py @@ -16,7 +16,7 @@ class Plugin(PluginBase): return ["load_buttons.js"] def include_css_files(self): - return ["font.css", "build/ImportView.css"] + return ["build/ImportView.css"] def build_jsx_components(self): return ["ImportView.jsx"] @@ -24,6 +24,7 @@ class Plugin(PluginBase): def api_mount_points(self): api_views = [api_view for platform in get_all_extended_platforms() for api_view in platform.get_api_views()] mount_points = [MountPoint(path, view) for (path, view) in api_views] + # Add mount points for each extended platform that might require us to do so return mount_points + [ MountPoint("projects/(?P[^/.]+)/tasks/(?P[^/.]+)/import", ImportFolderTaskView.as_view()), MountPoint("platforms/(?P[^/.]+)/verify", PlatformsVerifyTaskView.as_view()), diff --git a/plugins/cloudimport/public/components/LibraryDialog.jsx b/plugins/cloudimport/public/components/LibraryDialog.jsx index 11bc866e..98a69816 100644 --- a/plugins/cloudimport/public/components/LibraryDialog.jsx +++ b/plugins/cloudimport/public/components/LibraryDialog.jsx @@ -21,7 +21,7 @@ export default class LibraryDialog extends Component { this.state = { availableFolders: [], - selectedFolder: null, + selectedFolder: null, loadingFolders: true, error: "", }; @@ -29,7 +29,6 @@ export default class LibraryDialog extends Component { componentDidUpdate(){ if (this.props.platform !== null && this.props.platform.type == "library" && this.state.loadingFolders){ - // this.setState({loadingFolders: true}); $.get(`${this.props.apiURL}/cloudlibrary/${this.props.platform.name}/listfolders`) .done(result => { result.folders.forEach(album => { diff --git a/plugins/cloudimport/public/package.json b/plugins/cloudimport/public/package.json index 2c2ff9d5..b06dd294 100644 --- a/plugins/cloudimport/public/package.json +++ b/plugins/cloudimport/public/package.json @@ -1,7 +1,4 @@ { - "scripts": { - "dev": "webpack --watch" - }, "dependencies": { "react-bootstrap": "^0.32.4", "react-select": "^3.0.4" diff --git a/plugins/cloudimport/templates/app.html b/plugins/cloudimport/templates/app.html index 61166b86..6e03bbdb 100644 --- a/plugins/cloudimport/templates/app.html +++ b/plugins/cloudimport/templates/app.html @@ -1,16 +1,6 @@ {% extends "app/plugins/templates/base.html" %} {% load bootstrap_extras %} {% block content %} -

Welcome to Cloud Import!

Instructions
On this screen, you will be able to configure everything that is necessary for your different platforms.