Merge pull request #127 from galaxyproject/add_screenshot_url

Added screenshot property to install template

cloudman/helmsman/api.py

@@ -443,6 +443,10 @@ def info_url(self):
     def icon_url(self):
         return self.template_obj.icon_url
 
+    @property
+    def screenshot_url(self):
+        return self.template_obj.screenshot_url
+
     def render_values(self, context):
         if not context:
             context = {}

cloudman/helmsman/management/commands/add_install_template.py

@@ -38,6 +38,8 @@ def add_arguments(self, parser):
                             help='chart info url')
         parser.add_argument('--icon_url', required=False,
                             help='chart icon url')
+        parser.add_argument('--screenshot_url', required=False,
+                            help='chart screenshot url')
 
     def handle(self, *args, **options):
         self.add_install_template(
@@ -50,12 +52,13 @@ def handle(self, *args, **options):
             options.get('description'),
             options.get('maintainers'),
             options.get('info_url'),
-            options.get('icon_url'))
+            options.get('icon_url'),
+            options.get('screenshot_url'))
 
     @staticmethod
     def add_install_template(name, repo, chart, chart_version, template,
                              context, display_name, summary, description,
-                             maintainers, info_url, icon_url):
+                             maintainers, info_url, icon_url, screenshot_url):
         try:
             print(f"Adding template: {name}")
             admin = User.objects.filter(is_superuser=True).first()
@@ -69,7 +72,7 @@ def add_install_template(name, repo, chart, chart_version, template,
                     name, repo, chart, chart_version, template, context,
                     display_name=display_name, summary=summary,
                     description=description, maintainers=maintainers,
-                    info_url=info_url, icon_url=icon_url)
+                    info_url=info_url, icon_url=icon_url, screenshot_url=screenshot_url)
                 print(f"Successfully added template named: '{name}'"
                       f" for chart: '{repo}/{chart}'.")
         except Exception as e:

cloudman/helmsman/management/commands/helmsman_load_config.py

@@ -41,6 +41,8 @@ def process_settings(settings):
                 extra_args += ["--info_url", template.get('info_url')]
             if template.get('icon_url'):
                 extra_args += ["--icon_url", template.get('icon_url')]
+            if template.get('screenshot_url'):
+                extra_args += ["--screenshot_url", template.get('screenshot_url')]
             if template.get('template'):
                 with helpers.TempInputFile(template.get('template')) as f:
                     extra_args += ["--template_file", f.name]

cloudman/helmsman/migrations/0001_initial.py

@@ -28,6 +28,7 @@ class Migration(migrations.Migration):
                 ('maintainers', models.TextField(blank=True, null=True)),
                 ('info_url', models.TextField(blank=True, null=True)),
                 ('icon_url', models.TextField(blank=True, null=True)),
+                ('screenshot_url', models.TextField(blank=True, null=True)),
             ],
             options={
                 'verbose_name': 'Install Template',

cloudman/helmsman/models.py

@@ -21,6 +21,7 @@ class HMInstallTemplate(models.Model):
     maintainers = models.TextField(blank=True, null=True)
     info_url = models.TextField(blank=True, null=True)
     icon_url = models.TextField(blank=True, null=True)
+    screenshot_url = models.TextField(blank=True, null=True)
 
     class Meta:
         verbose_name = "Install Template"

cloudman/helmsman/serializers.py

@@ -18,6 +18,7 @@ class HMInstallTemplateSerializer(serializers.Serializer):
     maintainers = serializers.CharField(allow_blank=True, required=False)
     info_url = serializers.CharField(allow_blank=True, required=False)
     icon_url = serializers.CharField(allow_blank=True, required=False)
+    screenshot_url = serializers.CharField(allow_blank=True, required=False)
 
     def create(self, valid_data):
         return HelmsManAPI.from_request(
@@ -33,7 +34,8 @@ def create(self, valid_data):
                 description=valid_data.get('description'),
                 maintainers=valid_data.get('maintainers'),
                 info_url=valid_data.get('info_url'),
-                icon_url=valid_data.get('icon_url'))
+                icon_url=valid_data.get('icon_url'),
+                screenshot_url=valid_data.get('screenshot_url'))
 
     def render_values(self, valid_data):
         return HelmsManAPI.from_request(self.context['request']

cloudman/helmsman/tests/data/helmsman_config.yaml

@@ -20,6 +20,7 @@ install_templates:
       maintainers: jupyter
       info_url: https://jupyter.org/
       icon_url: https://jupyter.org/assets/hublogo.svg
+      screenshot_url: https://jupyter.org/assets/hublogo.svg
       template: |
         ingress:
           enabled: true

cloudman/helmsman/tests/test_helmsman_api.py

@@ -249,6 +249,7 @@ class InstallTemplateServiceTests(HelmsManServiceTestBase):
         'maintainers': 'Galaxy Team',
         'info_url': 'https://usegalaxy.org',
         'icon_url': 'https://usegalaxy.org/some_icon.png',
+        'screenshot_url': 'https://usegalaxy.org/some_screenshot.png',
         'context': {'project': 'test'},
         'template': """ingress:
               enabled: true