From 35bb0c85ee04164ddbe97f19767db523c1406e9a Mon Sep 17 00:00:00 2001 From: Nathan Swain Date: Fri, 20 Jan 2023 16:20:34 -0700 Subject: [PATCH] Updates for Tethys 4.0 --- install.yml | 6 ++- setup.py | 8 ++-- tethysapp/earth_engine/__init__.py | 2 +- tethysapp/earth_engine/app.py | 30 +++--------- tethysapp/earth_engine/controllers.py | 9 ++-- tethysapp/earth_engine/handoff.py | 3 -- tethysapp/earth_engine/public/css/main.css | 2 +- tethysapp/earth_engine/public/css/map.css | 2 +- tethysapp/earth_engine/public/images/icon.gif | Bin 14125 -> 0 bytes .../earth_engine/public/js/gee_datasets.js | 32 ++++++------- .../templates/earth_engine/base.html | 20 ++++---- .../templates/earth_engine/home.html | 10 ++-- tethysapp/earth_engine/tests/tests.py | 44 ++++++------------ 13 files changed, 67 insertions(+), 101 deletions(-) delete mode 100644 tethysapp/earth_engine/handoff.py delete mode 100644 tethysapp/earth_engine/public/images/icon.gif diff --git a/install.yml b/install.yml index 3a9e48e..e4deb55 100644 --- a/install.yml +++ b/install.yml @@ -1,5 +1,7 @@ # This file should be committed to your app code. version: 1.0 +# This should be greater or equal to your tethys-platform in your environment +tethys_version: ">=4.0.0" # This should match the app - package name in your setup.py name: earth_engine @@ -14,4 +16,6 @@ requirements: - oauth2client pip: -post: + npm: + +post: \ No newline at end of file diff --git a/setup.py b/setup.py index 90a817f..7f32563 100644 --- a/setup.py +++ b/setup.py @@ -1,16 +1,16 @@ from setuptools import setup, find_namespace_packages -from tethys_apps.app_installation import find_resource_files +from tethys_apps.app_installation import find_all_resource_files +from tethys_apps.base.app_base import TethysAppBase # -- Apps Definition -- # app_package = 'earth_engine' -release_package = 'tethysapp-' + app_package +release_package = f'{TethysAppBase.package_namespace}-{app_package}' # -- Python Dependencies -- # dependencies = [] # -- Get Resource File -- # -resource_files = find_resource_files('tethysapp/' + app_package + '/templates', 'tethysapp/' + app_package) -resource_files += find_resource_files('tethysapp/' + app_package + '/public', 'tethysapp/' + app_package) +resource_files = find_all_resource_files(app_package, TethysAppBase.package_namespace) setup( diff --git a/tethysapp/earth_engine/__init__.py b/tethysapp/earth_engine/__init__.py index 8766881..c927d02 100644 --- a/tethysapp/earth_engine/__init__.py +++ b/tethysapp/earth_engine/__init__.py @@ -1 +1 @@ -# Included for native namespace package support \ No newline at end of file +# Included for native namespace package support diff --git a/tethysapp/earth_engine/app.py b/tethysapp/earth_engine/app.py index 660567e..d368756 100644 --- a/tethysapp/earth_engine/app.py +++ b/tethysapp/earth_engine/app.py @@ -1,4 +1,4 @@ -from tethys_sdk.base import TethysAppBase, url_map_maker +from tethys_sdk.base import TethysAppBase class EarthEngine(TethysAppBase): @@ -6,29 +6,13 @@ class EarthEngine(TethysAppBase): Tethys app class for Earth Engine. """ - name = 'Earth Engine' - index = 'earth_engine:home' - icon = 'earth_engine/images/earth-engine-logo.png' - package = 'earth_engine' + name = 'Google Earth Engine Tutorial' + description = '' + package = 'earth_engine' # WARNING: Do not change this value + index = 'home' + icon = f'{package}/images/earth-engine-logo.png' root_url = 'earth-engine' color = '#524745' - description = '' tags = '' enable_feedback = False - feedback_emails = [] - - def url_maps(self): - """ - Add controllers - """ - UrlMap = url_map_maker(self.root_url) - - url_maps = ( - UrlMap( - name='home', - url='earth-engine', - controller='earth_engine.controllers.home' - ), - ) - - return url_maps \ No newline at end of file + feedback_emails = [] \ No newline at end of file diff --git a/tethysapp/earth_engine/controllers.py b/tethysapp/earth_engine/controllers.py index ad23d24..4ff96cd 100644 --- a/tethysapp/earth_engine/controllers.py +++ b/tethysapp/earth_engine/controllers.py @@ -1,11 +1,12 @@ import datetime as dt from django.shortcuts import render -from tethys_sdk.permissions import login_required -from tethys_sdk.gizmos import SelectInput, DatePicker, Button, MapView, MVView +from tethys_sdk.routing import controller +from tethys_sdk.gizmos import SelectInput, DatePicker, Button +from tethys_sdk.gizmos import MapView, MVView from .gee.products import EE_PRODUCTS -@login_required() +@controller def home(request): """ Controller for the app home page. @@ -112,7 +113,7 @@ def home(request): load_button = Button( name='load_map', display_text='Load', - style='default', + style='outline-secondary', attributes={'id': 'load_map'} ) diff --git a/tethysapp/earth_engine/handoff.py b/tethysapp/earth_engine/handoff.py deleted file mode 100644 index 1e15fb8..0000000 --- a/tethysapp/earth_engine/handoff.py +++ /dev/null @@ -1,3 +0,0 @@ -# Define your handoff handlers here -# for more information, see: -# http://docs.tethysplatform.org/en/dev/tethys_sdk/handoff.html \ No newline at end of file diff --git a/tethysapp/earth_engine/public/css/main.css b/tethysapp/earth_engine/public/css/main.css index b2b732d..be9379d 100644 --- a/tethysapp/earth_engine/public/css/main.css +++ b/tethysapp/earth_engine/public/css/main.css @@ -1,4 +1,4 @@ /* Remove padding on bottom where app-actions section used to be */ #app-content-wrapper #app-content { padding-bottom: 0; -} +} \ No newline at end of file diff --git a/tethysapp/earth_engine/public/css/map.css b/tethysapp/earth_engine/public/css/map.css index 6d72cbb..7a0907e 100644 --- a/tethysapp/earth_engine/public/css/map.css +++ b/tethysapp/earth_engine/public/css/map.css @@ -6,4 +6,4 @@ #inner-app-content { height: 100%; padding: 0; -} +} \ No newline at end of file diff --git a/tethysapp/earth_engine/public/images/icon.gif b/tethysapp/earth_engine/public/images/icon.gif deleted file mode 100644 index 5c8236e97d2adfe5a66e7bed323cd70d223576d4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14125 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 date_evd && date_csd <= date_lvd && date_ced >= date_evd && date_ced <= date_lvd) { reset_current_dates = false; } - + // Update start date datepicker bounds $('#start_date').datepicker('setStartDate', earliest_valid_date); $('#start_date').datepicker('setEndDate', latest_valid_date); @@ -174,7 +173,7 @@ var GEE_DATASETS = (function() { $('#start_date').datepicker('update', INITIAL_START_DATE); m_start_date = INITIAL_START_DATE; } - + // Update end date datepicker bounds $('#end_date').datepicker('setStartDate', earliest_valid_date); $('#end_date').datepicker('setEndDate', latest_valid_date); @@ -182,7 +181,7 @@ var GEE_DATASETS = (function() { $('#end_date').datepicker('update', INITIAL_END_DATE); m_end_date = INITIAL_END_DATE; } - + console.log('Date Bounds Changed To: ' + earliest_valid_date + ' - ' + latest_valid_date); }; @@ -198,7 +197,6 @@ var GEE_DATASETS = (function() { return data; }; - /************************************************************************ * PUBLIC INTERFACE *************************************************************************/ @@ -225,4 +223,4 @@ var GEE_DATASETS = (function() { return public_interface; -}()); // End of package wrapper +}()); // End of package wrapper \ No newline at end of file diff --git a/tethysapp/earth_engine/templates/earth_engine/base.html b/tethysapp/earth_engine/templates/earth_engine/base.html index 5dc873e..2c1e6d2 100644 --- a/tethysapp/earth_engine/templates/earth_engine/base.html +++ b/tethysapp/earth_engine/templates/earth_engine/base.html @@ -13,16 +13,16 @@ {% block app_title %}{{ tethys_app.name }}{% endblock %} {% block app_navigation_items %} -
  • App Navigation
    • -
  • Home
    • -
  • Jobs
    • -
  • Results
    • -
  • Steps
    • -
  • 1. The First Step
    • -
  • 2. The Second Step
    • -
  • 3. The Third Step
    • -
  • -
  • Get Started
    • +
  • App Navigation
    • +
  • Home
    • +
  • Jobs
    • +
  • Results
    • +
  • Steps
    • +
  • 1. The First Step
    • +
  • 2. The Second Step
    • +
  • 3. The Third Step
    • +
  • +
  • Get Started
    • {% endblock %} {% block app_content %} diff --git a/tethysapp/earth_engine/templates/earth_engine/home.html b/tethysapp/earth_engine/templates/earth_engine/home.html index e5b7455..d9043e8 100644 --- a/tethysapp/earth_engine/templates/earth_engine/home.html +++ b/tethysapp/earth_engine/templates/earth_engine/home.html @@ -1,11 +1,6 @@ {% extends "earth_engine/base.html" %} {% load tethys_gizmos static %} -{% block content_dependent_styles %} - {{ block.super }} - -{% endblock %} - {% block app_navigation_items %}
  • Select Dataset
    • {% gizmo platform_select %} @@ -31,3 +26,8 @@ {{ block.super }} {% endblock %} + +{% block content_dependent_styles %} + {{ block.super }} + +{% endblock %} \ No newline at end of file diff --git a/tethysapp/earth_engine/tests/tests.py b/tethysapp/earth_engine/tests/tests.py index e3e1e4e..24d629d 100644 --- a/tethysapp/earth_engine/tests/tests.py +++ b/tethysapp/earth_engine/tests/tests.py @@ -1,24 +1,19 @@ # Most of your test classes should inherit from TethysTestCase from tethys_sdk.testing import TethysTestCase -# Use if your app has persistent stores that will be tested against. -# Your app class from app.py must be passed as an argument to the TethysTestCase functions to both -# create and destroy the temporary persistent stores for your app used during testing -# from ..app import EarthEngine - -# Use if you'd like a simplified way to test rendered HTML templates. -# You likely need to install BeautifulSoup, as it is not included by default in Tethys Platform -# 1. Open a terminal -# 2. Enter command ". /usr/lib/tethys/bin/activate" to activate the Tethys python environment -# 3. Enter command "pip install beautifulsoup4" -# For help, see https://www.crummy.com/software/BeautifulSoup/bs4/doc/ +# For testing rendered HTML templates it may be helpful to use BeautifulSoup. # from bs4 import BeautifulSoup +# For help, see https://www.crummy.com/software/BeautifulSoup/bs4/doc/ + """ -To run any tests: - 1. Open a terminal - 2. Enter command ". /usr/lib/tethys/bin/activate" to activate the Tethys python environment - 3. In portal_config.yml make sure that the default database user is set to tethys_super or is a super user of the database +To run tests for an app: + + 1. Open a terminal and activate the Tethys environment:: + + conda activate tethys + + 2. In portal_config.yml make sure that the default database user is set to tethys_super or is a super user of the database DATABASES: default: ENGINE: django.db.backends.postgresql_psycopg2 @@ -28,28 +23,15 @@ HOST: 127.0.0.1 PORT: 5435 - 4. Enter tethys test command. - The general form is: "tethys test -f tethys_apps.tethysapp....." - See below for specific examples - - To run all tests across this app: - Test command: "tethys test -f tethys_apps.tethysapp.earth_engine" + 3. From the root directory of your app, run the ``tethys manage test`` command:: - To run all tests in this file: - Test command: "tethys test -f tethys_apps.tethysapp.earth_engine.tests.tests" + tethys manage test tethysapp//tests - To run tests in the EarthEngineTestCase class: - Test command: "tethys test -f tethys_apps.tethysapp.earth_engine.tests.tests.EarthEngineTestCase" - - To run only the test_if_tethys_platform_is_great function in the EarthEngineTestCase class: - Test command: "tethys test -f tethys_apps.tethysapp.earth_engine.tests.tests.EarthEngineTestCase.test_if_tethys_platform_is_great" To learn more about writing tests, see: - https://docs.djangoproject.com/en/1.9/topics/testing/overview/#writing-tests - https://docs.python.org/2.7/library/unittest.html#module-unittest + https://docs.tethysplatform.org/en/stable/tethys_sdk/testing.html """ - class EarthEngineTestCase(TethysTestCase): """ In this class you may define as many functions as you'd like to test different aspects of your app.