From c43834b21f15545a25c61289db6a6b6dfbd0a8d6 Mon Sep 17 00:00:00 2001 From: Jurica Grgicevic Date: Mon, 9 Nov 2020 12:32:07 +0100 Subject: [PATCH 1/4] feat: fetch gitlab envs --- test/repos/tasks/test_sync_repos.py | 39 ++- test/services/test_forms.py | 2 + zoo/base/assets/js/components/RepoInput.vue | 8 + zoo/factories.py | 11 +- zoo/repos/admin.py | 5 + zoo/repos/forms.py | 2 + zoo/repos/gitlab.py | 8 + .../migrations/0008_repositoryenvironment.py | 43 ++++ zoo/repos/models.py | 16 ++ zoo/repos/tasks.py | 37 ++- .../templates/repos/fields/repo_input.html | 7 + zoo/repos/urls.py | 1 + zoo/repos/views.py | 23 ++ zoo/services/assets/img/gitlab-icon-rgb.svg | 69 +++++ zoo/services/assets/js/gitlab_envs.js | 80 ++++++ zoo/services/assets/js/service_form.js | 6 +- zoo/services/constants.py | 5 + zoo/services/forms.py | 9 +- .../migrations/0026_environment_type.py | 22 ++ zoo/services/models.py | 7 +- .../templates/services/service_form.html | 238 ++++++++++-------- zoo/services/views.py | 7 +- 22 files changed, 524 insertions(+), 121 deletions(-) create mode 100644 zoo/repos/migrations/0008_repositoryenvironment.py create mode 100644 zoo/services/assets/img/gitlab-icon-rgb.svg create mode 100644 zoo/services/assets/js/gitlab_envs.js create mode 100644 zoo/services/migrations/0026_environment_type.py diff --git a/test/repos/tasks/test_sync_repos.py b/test/repos/tasks/test_sync_repos.py index a7b304b2..3a4a7f5c 100644 --- a/test/repos/tasks/test_sync_repos.py +++ b/test/repos/tasks/test_sync_repos.py @@ -3,12 +3,21 @@ import pytest from faker import Faker -from zoo.repos.models import Provider, Repository +from zoo.repos.models import Provider, Repository, RepositoryEnvironment from zoo.repos.tasks import sync_repos pytestmark = pytest.mark.django_db +class FakeGitlabEnviroment: + def __init__(self, id=None, name=None, external_url=None, slug=None): + self.fake = Faker() + self.id = self.fake.pyint() if id is None else id + self.name = self.fake.word() if name is None else name + self.slug = self.fake.word() if slug is None else slug + self.external_url = self.fake.url() if external_url is None else external_url + + class FakeGitProject: def __init__(self, pid): self.fake = Faker() @@ -53,26 +62,42 @@ def generate_project_list(pid=None, owner=None, name=None, url=None, **kwargs): } +def generate_proj_envs_list(): + return [FakeGitlabEnviroment()] + + def test_sync_untouched_repo(repository): project_list = generate_project_list( repository.remote_id, repository.owner, repository.name, repository.url ) + gitlab_envs = generate_proj_envs_list() with patch( "gitlab.v4.objects.ProjectManager.list", return_value=project_list["gitlab"] ), patch( "github.AuthenticatedUser.AuthenticatedUser.get_repos", return_value=project_list["github"], + ), patch( + "zoo.repos.tasks.get_project_enviroments", + return_value=gitlab_envs, ): sync_repos() gitlab_project = project_list["gitlab"][0] - assert gitlab_project.id == repository.remote_id + repository = Repository.objects.get( + remote_id=gitlab_project.id, provider=Provider.GITLAB.value + ) assert gitlab_project.namespace["full_path"] == repository.owner assert gitlab_project.path == repository.name assert gitlab_project.web_url == repository.url + repo_env = repository.repository_environments.first() + assert gitlab_envs[0].name == repo_env.name + assert gitlab_envs[0].external_url == repo_env.external_url + github_project = project_list["github"][0] - assert github_project.id == repository.remote_id + 1 + repository = Repository.objects.get( + remote_id=github_project.id, provider=Provider.GITHUB.value + ) assert github_project.owner.login == repository.owner assert github_project.name == repository.name assert github_project.svn_url == repository.url @@ -80,11 +105,15 @@ def test_sync_untouched_repo(repository): def test_sync_moved_repo(repository): project_list = generate_project_list(repository.remote_id) + gitlab_envs = generate_proj_envs_list() with patch( "gitlab.v4.objects.ProjectManager.list", return_value=project_list["gitlab"] ), patch( "github.AuthenticatedUser.AuthenticatedUser.get_repos", return_value=project_list["github"], + ), patch( + "zoo.repos.tasks.get_project_enviroments", + return_value=gitlab_envs, ): sync_repos() @@ -96,6 +125,10 @@ def test_sync_moved_repo(repository): assert gitlab_project.path == repository.name assert gitlab_project.web_url == repository.url + repo_env = repository.repository_environments.first() + assert gitlab_envs[0].name == repo_env.name + assert gitlab_envs[0].external_url == repo_env.external_url + github_project = project_list["github"][0] repository = Repository.objects.get( remote_id=github_project.id, provider=Provider.GITHUB.value diff --git a/test/services/test_forms.py b/test/services/test_forms.py index e0334e90..92b07c7d 100644 --- a/test/services/test_forms.py +++ b/test/services/test_forms.py @@ -116,11 +116,13 @@ def test_service_form__complete__incorrect_status(repository): "environments-0-service_urls_0": fake.url(), "environments-0-service_urls_1": fake.url(), "environments-0-DELETE": False, + "environments-0-type": "zoo", "environments-1-name": fake.word(), "environments-1-dashboard_url": fake.url(), "environments-1-service_urls_0": fake.url(), "environments-1-service_urls_1": fake.url(), "environments-1-DELETE": False, + "environments-1-type": "zoo", } diff --git a/zoo/base/assets/js/components/RepoInput.vue b/zoo/base/assets/js/components/RepoInput.vue index 7543e1fe..75d7ad21 100644 --- a/zoo/base/assets/js/components/RepoInput.vue +++ b/zoo/base/assets/js/components/RepoInput.vue @@ -36,6 +36,8 @@ import { match } from "ramda" import RepoInputSuggestions from "./RepoInputSuggestions" import $ from 'jquery/src/jquery' +import { gitlabEnvs } from "../../../../services/assets/js/gitlab_envs.js" + function createPopup () { $('i.magic.icon').popup({ @@ -51,6 +53,11 @@ function popupAction (action) { $('i.magic.icon').popup(action) } +function loadGitlabEnvs(repoId) { + gitlabEnvsInfo["repoId"] = repoId + gitlabEnvs.load(gitlabEnvsInfo) +} + export default { template: "#repo-input-text-field-markup", data () { @@ -153,6 +160,7 @@ export default { this.$refs.suggestions.selectSuggestion(); this.isOnEditMode = false this.$store.commit("refreshEnteredText") + loadGitlabEnvs(parseInt(this.inputValue)) }, }, components: { diff --git a/zoo/factories.py b/zoo/factories.py index 103e8ac5..34843dbc 100644 --- a/zoo/factories.py +++ b/zoo/factories.py @@ -18,7 +18,7 @@ from zoo.auditing.check_discovery import Kind from zoo.auditing.models import Issue from zoo.datacenters.models import InfraNode -from zoo.repos.models import Repository +from zoo.repos.models import Repository, RepositoryEnvironment from zoo.services.models import Environment, Impact, Link, Service, Status, Tier @@ -33,6 +33,15 @@ class Meta: url = LazyAttribute(lambda o: f"https://gitlab.com/{o.owner}/{o.name}") +class RepositoryEnvironmentFactory(DjangoModelFactory): + class Meta: + model = RepositoryEnvironment + + name = Faker("domain_word") + repository = SubFactory(RepositoryFactory) + external_url = LazyAttribute(lambda o: f"https://gitlab.com/{o.name}/{o.name}") + + class IssueFactory(DjangoModelFactory): class Meta: model = Issue diff --git a/zoo/repos/admin.py b/zoo/repos/admin.py index 3e9786d8..5b4ebd95 100644 --- a/zoo/repos/admin.py +++ b/zoo/repos/admin.py @@ -6,3 +6,8 @@ @admin.register(models.Repository) class RepoAdmin(admin.ModelAdmin): search_fields = ("remote_id", "owner", "name", "provider") + + +@admin.register(models.RepositoryEnvironment) +class RepoEnvAdmin(admin.ModelAdmin): + search_fields = ("name", "external_url") diff --git a/zoo/repos/forms.py b/zoo/repos/forms.py index 9897372a..17ea0643 100644 --- a/zoo/repos/forms.py +++ b/zoo/repos/forms.py @@ -1,5 +1,6 @@ from django.forms import widgets +from ..services.constants import EnviromentType from .models import Repository @@ -19,4 +20,5 @@ def get_context(self, name, value, attrs): ) context["widget"]["value"] = value + context["env_type_gitlab"] = EnviromentType.GITLAB.value return context diff --git a/zoo/repos/gitlab.py b/zoo/repos/gitlab.py index 47556d45..c3c006d7 100644 --- a/zoo/repos/gitlab.py +++ b/zoo/repos/gitlab.py @@ -13,6 +13,14 @@ log = structlog.get_logger() +def get_project_enviroments(remote_id): + try: + project = gitlab.projects.get(remote_id) + return project.environments.list(as_list=False) + except GitlabGetError: + return [] + + def get_project(remote_id): try: project = gitlab.projects.get(remote_id) diff --git a/zoo/repos/migrations/0008_repositoryenvironment.py b/zoo/repos/migrations/0008_repositoryenvironment.py new file mode 100644 index 00000000..6765c155 --- /dev/null +++ b/zoo/repos/migrations/0008_repositoryenvironment.py @@ -0,0 +1,43 @@ +# Generated by Django 2.2.19 on 2021-03-28 20:22 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("repos", "0007_endpoint"), + ] + + operations = [ + migrations.CreateModel( + name="RepositoryEnvironment", + fields=[ + ( + "id", + models.AutoField( + auto_created=True, + primary_key=True, + serialize=False, + verbose_name="ID", + ), + ), + ("name", models.CharField(max_length=100)), + ("external_url", models.CharField(max_length=100, null=True)), + ( + "repository", + models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, + related_name="repository_environments", + related_query_name="repository_environment", + to="repos.Repository", + ), + ), + ], + options={ + "ordering": ["name"], + "unique_together": {("repository", "name")}, + }, + ), + ] diff --git a/zoo/repos/models.py b/zoo/repos/models.py index d9fcc210..54d54f61 100644 --- a/zoo/repos/models.py +++ b/zoo/repos/models.py @@ -86,3 +86,19 @@ class Meta: ) summary = models.CharField(max_length=500, null=True, blank=True) operation = models.CharField(max_length=200, null=True, blank=True) + + +class RepositoryEnvironment(models.Model): + class Meta: + unique_together = ("repository", "name") + ordering = ["name"] + + repository = models.ForeignKey( + Repository, + on_delete=models.CASCADE, + related_name="repository_environments", + related_query_name="repository_environment", + ) + + name = models.CharField(max_length=100) + external_url = models.CharField(max_length=100, null=True) diff --git a/zoo/repos/tasks.py b/zoo/repos/tasks.py index d3cd4250..bc9157ab 100644 --- a/zoo/repos/tasks.py +++ b/zoo/repos/tasks.py @@ -12,11 +12,13 @@ from ..auditing import runner from ..auditing.check_discovery import CHECKS as AUDITING_CHECKS from ..repos.models import Endpoint +from ..services.constants import EnviromentType from ..services.models import Environment, Service from .exceptions import MissingFilesError, RepositoryNotFoundError from .github import get_repositories as get_github_repositories +from .gitlab import get_project_enviroments from .gitlab import get_repositories as get_gitlab_repositories -from .models import Repository +from .models import Repository, RepositoryEnvironment from .utils import download_repository, get_scm_module, openapi_definition from .zoo_yml import parse, validate @@ -68,6 +70,9 @@ def sync_repos(): repo.full_clean() repo.save() + if project["provider"] == "gitlab": + sync_enviroments_from_gitlab(repo) + @shared_task def schedule_pulls(): @@ -208,3 +213,33 @@ def get_zoo_file_content(proj: Dict) -> str: return provider.get_file_content( proj["id"], settings.ZOO_YAML_FILE, settings.ZOO_YAML_DEFAULT_REF ) + + +def sync_enviroments_from_gitlab(repo: Repository): + gl_envs = get_project_enviroments(repo.remote_id) + envs = [] + for gl_env in gl_envs: + env, _ = RepositoryEnvironment.objects.get_or_create( + repository_id=repo.id, + name=gl_env.name, + external_url=gl_env.external_url, + ) + envs.append(env) + + RepositoryEnvironment.objects.filter(repository_id=repo.id).exclude( + id__in=[env.id for env in envs] + ).delete() + + # update gitlab envs on every service + services = Service.objects.filter(repository_id=repo.id) + for service in services: + Environment.objects.filter( + service_id=service.id, type=EnviromentType.GITLAB.value + ).exclude(name__in=[env.name for env in envs]).delete() + for env in envs: + Environment.objects.update_or_create( + service_id=service.id, + name=env.name, + external_url=env.external_url, + type=EnviromentType.GITLAB.value, + ) diff --git a/zoo/repos/templates/repos/fields/repo_input.html b/zoo/repos/templates/repos/fields/repo_input.html index 56b5a5c3..63db47f1 100644 --- a/zoo/repos/templates/repos/fields/repo_input.html +++ b/zoo/repos/templates/repos/fields/repo_input.html @@ -1,3 +1,5 @@ +{% load static %} +
@@ -20,4 +22,9 @@ name: '{{ widget.name }}', initialValue: '{{ widget.value|default:"" }}' }; + const gitlabEnvsInfo = { + envTypeGitlab: '{{ env_type_gitlab }}', + imageUrl: '{% static 'img/gitlab-icon-rgb.svg' %}', + envsUrl: '{% url "get_gitlab_envs" %}' + } diff --git a/zoo/repos/urls.py b/zoo/repos/urls.py index eb8ceba1..9f0cdc5b 100644 --- a/zoo/repos/urls.py +++ b/zoo/repos/urls.py @@ -6,4 +6,5 @@ urlpatterns = [ path("", views.RepoList.as_view(), name="repo_list"), path("//", views.repo_details, name="repo_details"), + path("api/get-gitlab-envs/", views.get_gitlab_envs, name="get_gitlab_envs"), ] diff --git a/zoo/repos/views.py b/zoo/repos/views.py index f1d0be3a..e6126cd9 100644 --- a/zoo/repos/views.py +++ b/zoo/repos/views.py @@ -1,9 +1,11 @@ import structlog from django.http import Http404, JsonResponse +from django.views.decorators.http import require_GET from django.views.generic import ListView from . import models from .exceptions import RepositoryNotFoundError +from .models import Provider, Repository from .utils import get_scm_module log = structlog.get_logger() @@ -22,3 +24,24 @@ def repo_details(request, provider, repo_id): raise Http404(f"Project {repo_id} not found") return JsonResponse(details) + + +@require_GET +def get_gitlab_envs(request): + project_id = request.GET.get("project_id") + + if not project_id: + return JsonResponse({"message": "Missing project_id"}, safe=False) + + try: + repo = Repository.objects.get(id=project_id, provider=Provider.GITLAB.value) + except RepositoryNotFoundError: + return JsonResponse({"message": "Wrong project_id"}, safe=False) + + return JsonResponse( + [ + {"name": gl_env.name, "dashboardUrl": gl_env.external_url} + for gl_env in repo.repository_environments.all() + ], + safe=False, + ) diff --git a/zoo/services/assets/img/gitlab-icon-rgb.svg b/zoo/services/assets/img/gitlab-icon-rgb.svg new file mode 100644 index 00000000..edb193bd --- /dev/null +++ b/zoo/services/assets/img/gitlab-icon-rgb.svg @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + 1x + + + 1x + + + 1x + + + + 1x + + + diff --git a/zoo/services/assets/js/gitlab_envs.js b/zoo/services/assets/js/gitlab_envs.js new file mode 100644 index 00000000..e9973223 --- /dev/null +++ b/zoo/services/assets/js/gitlab_envs.js @@ -0,0 +1,80 @@ +const gitlabEnvs = { + _resetGilabEnvs: (envTypeGitlab) => { + const gitlab_envs = $("input[value='" + envTypeGitlab + "']").closest(".ui.segment"); + if (gitlab_envs.length > 0) { + $.each(gitlab_envs, function(index, element){ + const uiSegment = $(element) + + // set values to default + uiSegment.find(".field.name input").val(""); + uiSegment.find('input[name$="type"]').val(""); + uiSegment.find('input[name$="dashboard_url"]').val(""); + uiSegment.find('input[name$="logs_url"]').val(""); + uiSegment.find('input[name$="open_api_url"]').val(""); + + // remove gitlab icon + uiSegment.find(".gitlab-img").hide() + + uiSegment.hide(); + uiSegment.find(".field.name input").prop("required", false); + + //if all segments are hidden, + const hidden = $(".ui.segment.environment:hidden"); + if (hidden.length == 5) { + let firstSegment = hidden.eq(0); + firstSegment.show() + } + + if (hidden.length > 0) { + $("button.add-environment").prop("disabled", false); + } + + }) + } + }, + _getFirstAvailableSegment: () => { + const all_envs = $(".ui.segment.environment"); + if (all_envs.length == 0) { return false } + + for (let i = 0; i < all_envs.length; i++) { + let firstSegment = all_envs.eq(i) + if (firstSegment.find(".field.name input").val() == "") { + return firstSegment + } + } + + return false; + }, + _fillData: (envTypeGitlab, firstSegment, response) => { + firstSegment.find(":not(.no-reset) input").val(""); + firstSegment.find('input[name$="type"]').val(envTypeGitlab); + firstSegment.find(".field.name input").val(response["name"]).prop('readonly', true); + firstSegment.find('input[name$="dashboard_url"]').val(response["dashboardUrl"]).prop('readonly', true); + firstSegment.find(".gitlab-img").show() + firstSegment.show(); + }, + load: (gitlabEnvsInfo) => { + //delete previous gitlab envs + gitlabEnvs._resetGilabEnvs(gitlabEnvsInfo.envTypeGitlab) + + //fetch gitlab envs + $.get(gitlabEnvsInfo.envsUrl + "?project_id=" + gitlabEnvsInfo.repoId, function (response) { + if (response.length == 0) { return console.log('Fetching Gitlab environments completed! No envs.') } + + $.each(response, function(index, element) { + let firstSegment = gitlabEnvs._getFirstAvailableSegment(); + if (!firstSegment) { return;} + + gitlabEnvs._fillData(gitlabEnvsInfo.envTypeGitlab, firstSegment, element) + if ($(".ui.segment.environment:hidden").length == 0) { + $("button.add-environment").prop("disabled", true); + } + }) + console.log('Fetching Gitlab environments completed!') + }).fail(function() { + console.log( "Error fetching envs" ); + }) + } +} + +export {gitlabEnvs}; diff --git a/zoo/services/assets/js/service_form.js b/zoo/services/assets/js/service_form.js index 9e7b1d38..5692cdbf 100644 --- a/zoo/services/assets/js/service_form.js +++ b/zoo/services/assets/js/service_form.js @@ -35,6 +35,7 @@ $("button.remove-environment").click(function () { var uiSegment = checkbox.closest(".ui.segment"); uiSegment.hide(); uiSegment.find(".field.name input").prop("required", false); + uiSegment.find(".field.type input").val(""); var hidden = $(".ui.segment.environment:hidden"); if (hidden.length > 0) { @@ -58,15 +59,16 @@ $("button.remove-link").click(function () { $("button.add-environment").click(function () { $(this).blur(); - var hidden = $(".ui.segment.environment:hidden"); + let hidden = $(".ui.segment.environment:hidden"); if (hidden.length > 0) { if (hidden.length == 1) { $(this).prop("disabled", true); } - var firstSegment = hidden.eq(0); + let firstSegment = hidden.eq(0); firstSegment.find(":not(.no-reset) input").val(""); firstSegment.find(".field.name input").prop("required", true); + firstSegment.find('input[name$="type"]').val(envTypeZoo); firstSegment.show(); } }); diff --git a/zoo/services/constants.py b/zoo/services/constants.py index cc60458d..3c346bc5 100644 --- a/zoo/services/constants.py +++ b/zoo/services/constants.py @@ -19,3 +19,8 @@ class SentryIssueCategory(Enum): DECAYING = "decaying" SPOILED = "spoiled" FRESH = "fresh" + + +class EnviromentType(Enum): + GITLAB = "gitlab" + ZOO = "zoo" diff --git a/zoo/services/forms.py b/zoo/services/forms.py index 90716050..bcbd2a7d 100644 --- a/zoo/services/forms.py +++ b/zoo/services/forms.py @@ -52,7 +52,14 @@ class EnvironmentForm(forms.ModelForm): class Meta: model = models.Environment - fields = ["name", "dashboard_url", "logs_url", "service_urls", "open_api_url"] + fields = [ + "name", + "dashboard_url", + "logs_url", + "service_urls", + "open_api_url", + "type", + ] labels = { "dashboard_url": "Dashboard URL", "logs_url": "Logs URL", diff --git a/zoo/services/migrations/0026_environment_type.py b/zoo/services/migrations/0026_environment_type.py new file mode 100644 index 00000000..8ee23bca --- /dev/null +++ b/zoo/services/migrations/0026_environment_type.py @@ -0,0 +1,22 @@ +# Generated by Django 2.2.19 on 2021-03-23 14:53 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("services", "0025_remove_general_tag"), + ] + + operations = [ + migrations.AddField( + model_name="environment", + name="type", + field=models.CharField( + choices=[("gitlab", "gitlab"), ("zoo", "zoo")], + max_length=100, + null=True, + ), + ), + ] diff --git a/zoo/services/models.py b/zoo/services/models.py index cf743902..8ff73e2e 100644 --- a/zoo/services/models.py +++ b/zoo/services/models.py @@ -10,7 +10,7 @@ from djangoql.schema import DjangoQLSchema from . import ratings -from .constants import Impact, SentryIssueCategory, Status +from .constants import EnviromentType, Impact, SentryIssueCategory, Status from .managers import SentryIssueManager @@ -191,6 +191,11 @@ class Meta: dashboard_url = models.URLField(max_length=500, null=True, blank=True) logs_url = models.URLField(max_length=500, null=True, blank=True) open_api_url = models.URLField(max_length=500, null=True, blank=True) + type = models.CharField( + choices=((item.value, item.value) for item in EnviromentType), + null=True, + max_length=100, + ) def slugify_attribute(attribute): diff --git a/zoo/services/templates/services/service_form.html b/zoo/services/templates/services/service_form.html index f786193d..91f451ea 100644 --- a/zoo/services/templates/services/service_form.html +++ b/zoo/services/templates/services/service_form.html @@ -14,10 +14,10 @@ {% endblock %} {% block disclaimer %} -{% singleton 'instance.Hints' as hints %} -{% if hints.service_form_explanation %} -

{{ hints.service_form_explanation|safe }}

-{% endif %} + {% singleton 'instance.Hints' as hints %} + {% if hints.service_form_explanation %} +

{{ hints.service_form_explanation|safe }}

+ {% endif %} {% endblock %} {% block content %} @@ -27,134 +27,152 @@ {% endblock %} {% block extrafields %} -
-
+
+

Environments

- +
+ +
+
{{ envs_formset.management_form }} {% for form in envs_formset %} -
1 %}style="display: none"{% endif %}> - {% if forloop.counter > 1 %} -
- -
- {% endif %} - {% if form.errors %} -
-
Please correct the following errors
-
    - {% for field, messages in form.errors.items %} -
  • {{ field }} - {{ messages|join:" " }}
    • - {% endfor %} -
+
1 %}style="display: none"{% endif %}> + - {% endif %} -
- {% for field in form %} - {% with field.field.widget.input_type as type %} - {% if type == "hidden" %} - {{ field }} + {% if forloop.counter > 1 and form.type != env_type_gitlab %} +
+ +
+ {% endif %} + {% if form.errors %} +
+
Please correct the following errors
+
    + {% for field, messages in form.errors.items %} +
  • {{ field }} - {{ messages|join:" " }}
    • + {% endfor %} +
+
+ {% endif %} +
+ {% for field in form %} + {% with field.field.widget.input_type as type %} + {% if type == "hidden" %} + {{ field }} + {% endif %} + {% endwith %} + {% endfor %} +
+ {{ form.DELETE.as_hidden }} + +
+
+ + {% if form.type == env_type_gitlab %} + + {% else %} + {{ form.name }} {% endif %} - {% endwith %} - {% endfor %} -
- {{ form.DELETE.as_hidden }} -
-
- - {{ form.name }} +
+
+ + {{ form.dashboard_url }} +
-
- - {{ form.dashboard_url }} +
+ + {{ form.logs_url }} +
+
+ + {% if form.type == env_type_gitlab %} + + {% else %} + {{ form.service_urls }} + {% endif %} +
+
+ + {{ form.open_api_url }}
-
- - {{ form.logs_url }} -
-
- - {{ form.service_urls }} -
-
- - {{ form.open_api_url }} -
-
{% endfor %} -
-
-
+ +
+

Links

-
- {{ links_formset.management_form }} - {% for form in links_formset %} -
1 %}style="display: none"{% endif %}> - {% if forloop.counter > 1 %} -
-
- {% endif %} - {% if form.errors %} -
-
Please correct the following errors
-
    - {% for field, messages in form.errors.items %} -
  • {{ field }} - {{ messages|join:" " }}
    • + {{ links_formset.management_form }} + {% for form in links_formset %} +
    1 %}style="display: none"{% endif %}> + {% if forloop.counter > 1 %} +
    + +
    + {% endif %} + {% if form.errors %} +
    +
    Please correct the following errors
    +
      + {% for field, messages in form.errors.items %} +
    • {{ field }} - {{ messages|join:" " }}
      • + {% endfor %} +
    +
    + {% endif %} +
    + {% for field in form %} + {% with field.field.widget.input_type as type %} + {% if type == "hidden" %} + {{ field }} + {% endif %} + {% endwith %} {% endfor %} -
-
- {% endif %} -
- {% for field in form %} - {% with field.field.widget.input_type as type %} - {% if type == "hidden" %} - {{ field }} - {% endif %} - {% endwith %} - {% endfor %} -
- {{ form.DELETE.as_hidden }} -
-
- - {{ form.name }} -
-
- - {{ form.url }} -
-
-
- -
- {{ form.icon }} -
- +
+ {{ form.DELETE.as_hidden }} +
+
+ + {{ form.name }} +
+
+ + {{ form.url }} +
+
+
+ +
+ {{ form.icon }} +
+ +
+
-
-
- {% endfor %} -
+ {% endfor %} +
{% endblock %} {% block scripts %} {{ block.super }} + {% endblock %} diff --git a/zoo/services/views.py b/zoo/services/views.py index 30eca805..89c75b59 100644 --- a/zoo/services/views.py +++ b/zoo/services/views.py @@ -16,7 +16,7 @@ from ..checklists.steps import STEPS from ..repos.utils import openapi_definition from . import forms, models -from .models import Service +from .models import EnviromentType, Service log = structlog.get_logger() @@ -43,7 +43,6 @@ def form_valid(self, form): with transaction.atomic(): self.object = form.save() log.info(form.data) - if envs_formset.is_valid(): envs_formset.instance = self.object envs_formset.save() @@ -82,6 +81,8 @@ def get_context_data(self, **kwargs): else: data["envs_formset"] = forms.ServiceEnvironmentsFormSet() data["links_formset"] = forms.ServiceLinksFormSet() + data["env_type_gitlab"] = EnviromentType.GITLAB.value + data["env_type_zoo"] = EnviromentType.ZOO.value return data @@ -238,6 +239,8 @@ def get_context_data(self, **kwargs): instance=self.object ) data["links_formset"] = forms.ServiceLinksFormSet(instance=self.object) + data["env_type_gitlab"] = EnviromentType.GITLAB.value + data["env_type_zoo"] = EnviromentType.ZOO.value return data From 8969e88f9d86f024d083f9dda433d3eed86adb0b Mon Sep 17 00:00:00 2001 From: Alex Viscreanu Date: Mon, 12 Apr 2021 18:54:52 +0200 Subject: [PATCH 2/4] fix(services): move gitlab icon to static folder --- zoo/repos/templates/repos/fields/repo_input.html | 2 +- .../img/gitlab-icon-rgb.svg => static/img/gitlab-icon.svg} | 0 zoo/services/templates/services/service_form.html | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename zoo/services/{assets/img/gitlab-icon-rgb.svg => static/img/gitlab-icon.svg} (100%) diff --git a/zoo/repos/templates/repos/fields/repo_input.html b/zoo/repos/templates/repos/fields/repo_input.html index 63db47f1..42108849 100644 --- a/zoo/repos/templates/repos/fields/repo_input.html +++ b/zoo/repos/templates/repos/fields/repo_input.html @@ -24,7 +24,7 @@ }; const gitlabEnvsInfo = { envTypeGitlab: '{{ env_type_gitlab }}', - imageUrl: '{% static 'img/gitlab-icon-rgb.svg' %}', + imageUrl: '{% static 'img/gitlab-icon.svg' %}', envsUrl: '{% url "get_gitlab_envs" %}' } diff --git a/zoo/services/assets/img/gitlab-icon-rgb.svg b/zoo/services/static/img/gitlab-icon.svg similarity index 100% rename from zoo/services/assets/img/gitlab-icon-rgb.svg rename to zoo/services/static/img/gitlab-icon.svg diff --git a/zoo/services/templates/services/service_form.html b/zoo/services/templates/services/service_form.html index 91f451ea..7e66a1b4 100644 --- a/zoo/services/templates/services/service_form.html +++ b/zoo/services/templates/services/service_form.html @@ -41,7 +41,7 @@

Environments

{% for form in envs_formset %}
1 %}style="display: none"{% endif %}> {% if forloop.counter > 1 and form.type != env_type_gitlab %}
From f17d2dcb6808b9b4c73c6b31daea4a3d1e80c2e9 Mon Sep 17 00:00:00 2001 From: Jurica Grgicevic Date: Mon, 19 Apr 2021 09:50:23 +0200 Subject: [PATCH 3/4] refactor: post rebase changes - change get_or_create usage - regenerate migrations for envs - fixed sending NaN on envs fetch --- zoo/repos/gitlab.py | 2 +- zoo/repos/migrations/0008_repositoryenvironment.py | 6 +++--- zoo/repos/models.py | 4 ++-- zoo/repos/tasks.py | 12 ++++++++---- zoo/repos/views.py | 3 +++ zoo/services/assets/js/gitlab_envs.js | 2 ++ ..._environment_type.py => 0027_environment_type.py} | 4 ++-- 7 files changed, 21 insertions(+), 12 deletions(-) rename zoo/services/migrations/{0026_environment_type.py => 0027_environment_type.py} (80%) diff --git a/zoo/repos/gitlab.py b/zoo/repos/gitlab.py index c3c006d7..be3526d5 100644 --- a/zoo/repos/gitlab.py +++ b/zoo/repos/gitlab.py @@ -17,7 +17,7 @@ def get_project_enviroments(remote_id): try: project = gitlab.projects.get(remote_id) return project.environments.list(as_list=False) - except GitlabGetError: + except (GitlabGetError, GitlabListError): return [] diff --git a/zoo/repos/migrations/0008_repositoryenvironment.py b/zoo/repos/migrations/0008_repositoryenvironment.py index 6765c155..4cfed074 100644 --- a/zoo/repos/migrations/0008_repositoryenvironment.py +++ b/zoo/repos/migrations/0008_repositoryenvironment.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.19 on 2021-03-28 20:22 +# Generated by Django 2.2.19 on 2021-04-30 14:24 import django.db.models.deletion from django.db import migrations, models @@ -23,8 +23,8 @@ class Migration(migrations.Migration): verbose_name="ID", ), ), - ("name", models.CharField(max_length=100)), - ("external_url", models.CharField(max_length=100, null=True)), + ("name", models.CharField(max_length=200)), + ("external_url", models.CharField(max_length=300, null=True)), ( "repository", models.ForeignKey( diff --git a/zoo/repos/models.py b/zoo/repos/models.py index 54d54f61..8fd6ead6 100644 --- a/zoo/repos/models.py +++ b/zoo/repos/models.py @@ -100,5 +100,5 @@ class Meta: related_query_name="repository_environment", ) - name = models.CharField(max_length=100) - external_url = models.CharField(max_length=100, null=True) + name = models.CharField(max_length=200) + external_url = models.CharField(max_length=300, null=True) diff --git a/zoo/repos/tasks.py b/zoo/repos/tasks.py index bc9157ab..7c8c25a4 100644 --- a/zoo/repos/tasks.py +++ b/zoo/repos/tasks.py @@ -217,13 +217,17 @@ def get_zoo_file_content(proj: Dict) -> str: def sync_enviroments_from_gitlab(repo: Repository): gl_envs = get_project_enviroments(repo.remote_id) + + if not gl_envs: + return + envs = [] for gl_env in gl_envs: env, _ = RepositoryEnvironment.objects.get_or_create( - repository_id=repo.id, - name=gl_env.name, - external_url=gl_env.external_url, + repository_id=repo.id, name=gl_env.name ) + env.external_url = gl_env.external_url + env.save() envs.append(env) RepositoryEnvironment.objects.filter(repository_id=repo.id).exclude( @@ -240,6 +244,6 @@ def sync_enviroments_from_gitlab(repo: Repository): Environment.objects.update_or_create( service_id=service.id, name=env.name, - external_url=env.external_url, + dashboard_url=env.external_url, type=EnviromentType.GITLAB.value, ) diff --git a/zoo/repos/views.py b/zoo/repos/views.py index e6126cd9..d5c7f0a8 100644 --- a/zoo/repos/views.py +++ b/zoo/repos/views.py @@ -33,6 +33,9 @@ def get_gitlab_envs(request): if not project_id: return JsonResponse({"message": "Missing project_id"}, safe=False) + if not project_id.isdigit(): + return JsonResponse({"message": "project_id is not a numeric"}, safe=False) + try: repo = Repository.objects.get(id=project_id, provider=Provider.GITLAB.value) except RepositoryNotFoundError: diff --git a/zoo/services/assets/js/gitlab_envs.js b/zoo/services/assets/js/gitlab_envs.js index e9973223..2ae497ae 100644 --- a/zoo/services/assets/js/gitlab_envs.js +++ b/zoo/services/assets/js/gitlab_envs.js @@ -54,6 +54,8 @@ const gitlabEnvs = { firstSegment.show(); }, load: (gitlabEnvsInfo) => { + if (Number.isNaN(gitlabEnvsInfo.repoId)) { return } + //delete previous gitlab envs gitlabEnvs._resetGilabEnvs(gitlabEnvsInfo.envTypeGitlab) diff --git a/zoo/services/migrations/0026_environment_type.py b/zoo/services/migrations/0027_environment_type.py similarity index 80% rename from zoo/services/migrations/0026_environment_type.py rename to zoo/services/migrations/0027_environment_type.py index 8ee23bca..1485f483 100644 --- a/zoo/services/migrations/0026_environment_type.py +++ b/zoo/services/migrations/0027_environment_type.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.19 on 2021-03-23 14:53 +# Generated by Django 2.2.19 on 2021-04-23 13:58 from django.db import migrations, models @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ("services", "0025_remove_general_tag"), + ("services", "0026_link"), ] operations = [ From 47988396edeb3f865c9fbe4f0a5c48b0f81c276f Mon Sep 17 00:00:00 2001 From: Jurica Grgicevic Date: Tue, 4 May 2021 23:37:45 +0200 Subject: [PATCH 4/4] refactor: rework of gitlab envs --- test/repos/tasks/test_sync_repos.py | 1 + zoo/repos/tasks.py | 21 ++- .../templates/repos/fields/repo_input.html | 2 - zoo/repos/views.py | 3 +- zoo/services/assets/js/gitlab_envs.js | 81 ++------- zoo/services/assets/js/service_form.js | 6 + zoo/services/forms.py | 22 ++- .../migrations/0027_auto_20210509_1900.py | 33 ++++ .../migrations/0027_environment_type.py | 22 --- zoo/services/models.py | 6 +- .../templates/services/service_detail.html | 12 +- .../templates/services/service_form.html | 164 +++++++++++------- zoo/services/views.py | 12 +- 13 files changed, 219 insertions(+), 166 deletions(-) create mode 100644 zoo/services/migrations/0027_auto_20210509_1900.py delete mode 100644 zoo/services/migrations/0027_environment_type.py diff --git a/test/repos/tasks/test_sync_repos.py b/test/repos/tasks/test_sync_repos.py index 3a4a7f5c..b8739bd9 100644 --- a/test/repos/tasks/test_sync_repos.py +++ b/test/repos/tasks/test_sync_repos.py @@ -16,6 +16,7 @@ def __init__(self, id=None, name=None, external_url=None, slug=None): self.name = self.fake.word() if name is None else name self.slug = self.fake.word() if slug is None else slug self.external_url = self.fake.url() if external_url is None else external_url + self.state = "available" class FakeGitProject: diff --git a/zoo/repos/tasks.py b/zoo/repos/tasks.py index 7c8c25a4..c9475429 100644 --- a/zoo/repos/tasks.py +++ b/zoo/repos/tasks.py @@ -41,6 +41,8 @@ @shared_task def sync_repos(): + + i = 0 for project in itertools.chain( get_github_repositories(), get_gitlab_repositories() ): @@ -48,7 +50,8 @@ def sync_repos(): continue if settings.SYNC_REPOS_SKIP_PERSONAL and project["is_personal"]: continue - + i += 1 + log.info("sync_repos.fetch", repo_number=i, project=project) try: repo = Repository.objects.get( remote_id=project["id"], provider=project["provider"] @@ -71,8 +74,11 @@ def sync_repos(): repo.save() if project["provider"] == "gitlab": + log.info("sync_repos.calling.sync_enviroments_from_gitlab") sync_enviroments_from_gitlab(repo) + log.info("sync_repos.total", repo_number=i) + @shared_task def schedule_pulls(): @@ -219,16 +225,22 @@ def sync_enviroments_from_gitlab(repo: Repository): gl_envs = get_project_enviroments(repo.remote_id) if not gl_envs: + log.info("sync_enviroments_from_gitlab.no_envs") return envs = [] + i = 0 + log.info("sync_enviroments_from_gitlab.start") for gl_env in gl_envs: + if gl_env.state != "available": + continue env, _ = RepositoryEnvironment.objects.get_or_create( repository_id=repo.id, name=gl_env.name ) env.external_url = gl_env.external_url env.save() envs.append(env) + i += 1 RepositoryEnvironment.objects.filter(repository_id=repo.id).exclude( id__in=[env.id for env in envs] @@ -241,9 +253,12 @@ def sync_enviroments_from_gitlab(repo: Repository): service_id=service.id, type=EnviromentType.GITLAB.value ).exclude(name__in=[env.name for env in envs]).delete() for env in envs: - Environment.objects.update_or_create( + service_env, _ = Environment.objects.get_or_create( service_id=service.id, name=env.name, - dashboard_url=env.external_url, type=EnviromentType.GITLAB.value, ) + service_env.dashboard_url = env.external_url + service_env.save() + + log.info("sync_enviroments_from_gitlab.total.synced", envs_synced=i) diff --git a/zoo/repos/templates/repos/fields/repo_input.html b/zoo/repos/templates/repos/fields/repo_input.html index 42108849..b9daa47f 100644 --- a/zoo/repos/templates/repos/fields/repo_input.html +++ b/zoo/repos/templates/repos/fields/repo_input.html @@ -23,8 +23,6 @@ initialValue: '{{ widget.value|default:"" }}' }; const gitlabEnvsInfo = { - envTypeGitlab: '{{ env_type_gitlab }}', - imageUrl: '{% static 'img/gitlab-icon.svg' %}', envsUrl: '{% url "get_gitlab_envs" %}' } diff --git a/zoo/repos/views.py b/zoo/repos/views.py index d5c7f0a8..70de8c0c 100644 --- a/zoo/repos/views.py +++ b/zoo/repos/views.py @@ -44,7 +44,8 @@ def get_gitlab_envs(request): return JsonResponse( [ {"name": gl_env.name, "dashboardUrl": gl_env.external_url} - for gl_env in repo.repository_environments.all() + for index, gl_env in enumerate(repo.repository_environments.all()) + if index < 10 ], safe=False, ) diff --git a/zoo/services/assets/js/gitlab_envs.js b/zoo/services/assets/js/gitlab_envs.js index 2ae497ae..ef1f322e 100644 --- a/zoo/services/assets/js/gitlab_envs.js +++ b/zoo/services/assets/js/gitlab_envs.js @@ -1,76 +1,31 @@ const gitlabEnvs = { - _resetGilabEnvs: (envTypeGitlab) => { - const gitlab_envs = $("input[value='" + envTypeGitlab + "']").closest(".ui.segment"); - if (gitlab_envs.length > 0) { - $.each(gitlab_envs, function(index, element){ - const uiSegment = $(element) - - // set values to default - uiSegment.find(".field.name input").val(""); - uiSegment.find('input[name$="type"]').val(""); - uiSegment.find('input[name$="dashboard_url"]').val(""); - uiSegment.find('input[name$="logs_url"]').val(""); - uiSegment.find('input[name$="open_api_url"]').val(""); - - // remove gitlab icon - uiSegment.find(".gitlab-img").hide() - - uiSegment.hide(); - uiSegment.find(".field.name input").prop("required", false); - - //if all segments are hidden, - const hidden = $(".ui.segment.environment:hidden"); - if (hidden.length == 5) { - let firstSegment = hidden.eq(0); - firstSegment.show() - } - - if (hidden.length > 0) { - $("button.add-environment").prop("disabled", false); - } - - }) - } - }, - _getFirstAvailableSegment: () => { - const all_envs = $(".ui.segment.environment"); - if (all_envs.length == 0) { return false } - - for (let i = 0; i < all_envs.length; i++) { - let firstSegment = all_envs.eq(i) - if (firstSegment.find(".field.name input").val() == "") { - return firstSegment - } - } - - return false; - }, - _fillData: (envTypeGitlab, firstSegment, response) => { - firstSegment.find(":not(.no-reset) input").val(""); - firstSegment.find('input[name$="type"]').val(envTypeGitlab); - firstSegment.find(".field.name input").val(response["name"]).prop('readonly', true); - firstSegment.find('input[name$="dashboard_url"]').val(response["dashboardUrl"]).prop('readonly', true); - firstSegment.find(".gitlab-img").show() - firstSegment.show(); + _fillData: (response) => { + const envName = response['name'] || "" + const envDashboardUrl = response['dashboardUrl'] || "" + + let $env = $('#env_template').clone() + $env.find("input[name='gitlab-name']").val(envName) + $env.find("input[name='gitlab-dashboard-url']").val(envDashboardUrl) + $env.appendTo("#gitlab_envs" ) + $env.show() }, load: (gitlabEnvsInfo) => { if (Number.isNaN(gitlabEnvsInfo.repoId)) { return } //delete previous gitlab envs - gitlabEnvs._resetGilabEnvs(gitlabEnvsInfo.envTypeGitlab) - + $("#gitlab_envs").empty() //fetch gitlab envs $.get(gitlabEnvsInfo.envsUrl + "?project_id=" + gitlabEnvsInfo.repoId, function (response) { - if (response.length == 0) { return console.log('Fetching Gitlab environments completed! No envs.') } + let customEnvsNameInput = $(".ui.segment.environment:visible").find(".field.name input") + if (response.length == 0) { + customEnvsNameInput.prop("required", true); + return console.log('Fetching Gitlab environments completed! No envs.') + } + customEnvsNameInput.prop("required", false); $.each(response, function(index, element) { - let firstSegment = gitlabEnvs._getFirstAvailableSegment(); - if (!firstSegment) { return;} - - gitlabEnvs._fillData(gitlabEnvsInfo.envTypeGitlab, firstSegment, element) - if ($(".ui.segment.environment:hidden").length == 0) { - $("button.add-environment").prop("disabled", true); - } + if (index > 10) { return;} + gitlabEnvs._fillData(element) }) console.log('Fetching Gitlab environments completed!') }).fail(function() { diff --git a/zoo/services/assets/js/service_form.js b/zoo/services/assets/js/service_form.js index 5692cdbf..8fc2353f 100644 --- a/zoo/services/assets/js/service_form.js +++ b/zoo/services/assets/js/service_form.js @@ -94,3 +94,9 @@ $('.icon-hint .label').popup({ variation: 'inverted', position: 'left center' }); + +$(".ui.green.button").on('submit', function(e) { + e.preventDefault(); + $("#gitlab_envs input").prop('disabled', true) + $(this).submit(); +}); diff --git a/zoo/services/forms.py b/zoo/services/forms.py index bcbd2a7d..4fc572dc 100644 --- a/zoo/services/forms.py +++ b/zoo/services/forms.py @@ -16,6 +16,7 @@ from ..repos.forms import RepoInput from ..repos.github import get_namespaces as get_github_namespaces from ..repos.gitlab import get_namespaces as get_gitlab_namespaces +from ..repos.models import Provider from . import models @@ -58,7 +59,6 @@ class Meta: "logs_url", "service_urls", "open_api_url", - "type", ] labels = { "dashboard_url": "Dashboard URL", @@ -178,7 +178,25 @@ def save(self, commit=True): repository.save() except (KeyError, AttributeError): pass - return super().save() + + service = super().save() + self.create_gitlab_envs(service) + return service + + def create_gitlab_envs(self, service): + if not service.repository: + return + + if service.repository.provider == Provider.GITHUB: + return + + for env in service.repository.repository_environments.all(): + models.Environment.objects.update_or_create( + type=models.EnviromentType.GITLAB, + name=env.name, + dashboard_url=env.external_url, + service_id=service.id, + ) ServiceEnvironmentsFormSet = forms.inlineformset_factory( diff --git a/zoo/services/migrations/0027_auto_20210509_1900.py b/zoo/services/migrations/0027_auto_20210509_1900.py new file mode 100644 index 00000000..8d5a24a2 --- /dev/null +++ b/zoo/services/migrations/0027_auto_20210509_1900.py @@ -0,0 +1,33 @@ +# Generated by Django 2.2.19 on 2021-05-09 19:00 + +from django.db import migrations, models + +import zoo.services.constants + + +class Migration(migrations.Migration): + + dependencies = [ + ("services", "0026_link"), + ] + + operations = [ + migrations.AddField( + model_name="environment", + name="type", + field=models.CharField( + choices=[("gitlab", "gitlab"), ("zoo", "zoo")], + default=zoo.services.constants.EnviromentType("zoo"), + max_length=100, + ), + ), + migrations.AlterField( + model_name="environment", + name="name", + field=models.CharField(max_length=200), + ), + migrations.AlterUniqueTogether( + name="environment", + unique_together={("service", "name", "type")}, + ), + ] diff --git a/zoo/services/migrations/0027_environment_type.py b/zoo/services/migrations/0027_environment_type.py deleted file mode 100644 index 1485f483..00000000 --- a/zoo/services/migrations/0027_environment_type.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.2.19 on 2021-04-23 13:58 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("services", "0026_link"), - ] - - operations = [ - migrations.AddField( - model_name="environment", - name="type", - field=models.CharField( - choices=[("gitlab", "gitlab"), ("zoo", "zoo")], - max_length=100, - null=True, - ), - ), - ] diff --git a/zoo/services/models.py b/zoo/services/models.py index 8ff73e2e..f2803231 100644 --- a/zoo/services/models.py +++ b/zoo/services/models.py @@ -174,7 +174,7 @@ def __repr__(self): class Environment(models.Model): class Meta: - unique_together = ("service", "name") + unique_together = ("service", "name", "type") ordering = ["name"] service = models.ForeignKey( @@ -183,7 +183,7 @@ class Meta: related_name="environments", related_query_name="environment", ) - name = models.CharField(max_length=100) + name = models.CharField(max_length=200) service_urls = pg_fields.ArrayField( models.URLField(max_length=500), null=True, default=list ) @@ -193,8 +193,8 @@ class Meta: open_api_url = models.URLField(max_length=500, null=True, blank=True) type = models.CharField( choices=((item.value, item.value) for item in EnviromentType), - null=True, max_length=100, + default=EnviromentType.ZOO, ) diff --git a/zoo/services/templates/services/service_detail.html b/zoo/services/templates/services/service_detail.html index c1b442cc..73b2538a 100644 --- a/zoo/services/templates/services/service_detail.html +++ b/zoo/services/templates/services/service_detail.html @@ -57,14 +57,18 @@ docs - {% if object.environments_dict|length >= 1 %} + {% if environments_dict|length >= 1 %}
env:{{ environment.name }}

Environments

- {% for name in object.environments_dict %} - - {{ name }} + {% for env in environments_dict %} + + {% if env.type == environment_type_gitlab %} + gitlab {{ env.name }} + {% else %} + {{ env.name }} + {% endif %} {% endfor %}
diff --git a/zoo/services/templates/services/service_form.html b/zoo/services/templates/services/service_form.html index 7e66a1b4..b973fcef 100644 --- a/zoo/services/templates/services/service_form.html +++ b/zoo/services/templates/services/service_form.html @@ -30,81 +30,128 @@

Environments

-
- -
+
-
- {{ envs_formset.management_form }} - {% for form in envs_formset %} -
1 %}style="display: none"{% endif %}> - - {% if forloop.counter > 1 and form.type != env_type_gitlab %} -
- + {{ envs_formset.management_form }} + {% for form in envs_formset %} +
1 %}style="display: none"{% endif %}> + {% if forloop.counter > 1 %} +
+ +
+ {% endif %} + {% if form.errors %} +
+
Please correct the following errors
+
    + {% for field, messages in form.errors.items %} +
  • {{ field }} - {{ messages|join:" " }}
    • + {% endfor %} +
+
+ {% endif %} +
+ {% for field in form %} + {% with field.field.widget.input_type as type %} + {% if type == "hidden" %} + {{ field }} + {% endif %} + {% endwith %} + {% endfor %}
- {% endif %} - {% if form.errors %} -
-
Please correct the following errors
-
    - {% for field, messages in form.errors.items %} -
  • {{ field }} - {{ messages|join:" " }}
    • - {% endfor %} -
+ {{ form.DELETE.as_hidden }} +
+
+ + {{ form.name }} +
+
+ + {{ form.dashboard_url }} +
- {% endif %} -
- {% for field in form %} - {% with field.field.widget.input_type as type %} - {% if type == "hidden" %} - {{ field }} - {% endif %} - {% endwith %} +
+ + {{ form.logs_url }} +
+
+ + {{ form.service_urls }} +
+
+ + {{ form.open_api_url }} +
+
+ {% endfor %} +
+ {% if envs_gitlab %} + {% for env in envs_gitlab %} +
+
+ gitlab +
+ +
+
+ + +
+
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+
{% endfor %} + {% endif %} +
+ - {% endfor %} - +

Links

@@ -171,8 +218,5 @@

Links

{% block scripts %} {{ block.super }} - {% endblock %} diff --git a/zoo/services/views.py b/zoo/services/views.py index 89c75b59..14c1534a 100644 --- a/zoo/services/views.py +++ b/zoo/services/views.py @@ -16,7 +16,7 @@ from ..checklists.steps import STEPS from ..repos.utils import openapi_definition from . import forms, models -from .models import EnviromentType, Service +from .models import EnviromentType, Environment, Service log = structlog.get_logger() @@ -81,8 +81,6 @@ def get_context_data(self, **kwargs): else: data["envs_formset"] = forms.ServiceEnvironmentsFormSet() data["links_formset"] = forms.ServiceLinksFormSet() - data["env_type_gitlab"] = EnviromentType.GITLAB.value - data["env_type_zoo"] = EnviromentType.ZOO.value return data @@ -161,11 +159,13 @@ def get_context_data(self, **kwargs): status=Issue.Status.NEW.value ).count() + context["environment_type_gitlab"] = str(EnviromentType.GITLAB) context["sentry_data"] = self.get_sentry_context() context["checklist"] = self.get_checklists_context() context["environment"] = self.object.get_environment( self.request.GET.get("environment") ) + context["environments_dict"] = list(self.object.environments_dict.values())[:10] return context @@ -235,12 +235,12 @@ def get_context_data(self, **kwargs): self.request.POST, instance=self.object ) else: + data["envs_gitlab"] = Environment.objects.filter(type=EnviromentType.GITLAB) data["envs_formset"] = forms.ServiceEnvironmentsFormSet( - instance=self.object + instance=self.object, + queryset=Environment.objects.filter(type=EnviromentType.ZOO), ) data["links_formset"] = forms.ServiceLinksFormSet(instance=self.object) - data["env_type_gitlab"] = EnviromentType.GITLAB.value - data["env_type_zoo"] = EnviromentType.ZOO.value return data