refactor: rework of gitlab envs

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:

zoo/repos/tasks.py

@@ -41,14 +41,17 @@
 
 @shared_task
 def sync_repos():
+
+    i = 0
     for project in itertools.chain(
         get_github_repositories(), get_gitlab_repositories()
     ):
         if settings.SYNC_REPOS_SKIP_FORKS and project["is_fork"]:
             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)

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" %}'
   }
 </script>

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,
     )

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() {

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();
+});

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(

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")},
+        ),
+    ]

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,
     )
 
 

zoo/services/templates/services/service_detail.html

@@ -57,12 +57,12 @@
       docs
     </a>
 
-    {% if object.environments_dict|length >= 1 %}
+    {% if environments_dict|length >= 1 %}
     <div class="ui environments item top pointing fade dropdown">
       <i class="laptop icon"></i> env:{{ environment.name }}
       <div class="large bottom menu transition">
         <h4 class="ui header">Environments</h4>
-        {% for name in object.environments_dict %}
+        {% for name in environments_dict %}
           <a class="item {% if environment.name == name %}active{% endif %}" href="{{ request.path }}?environment={{ name }}">
             <i class="laptop icon"></i> {{ name }}
           </a>