Merge pull request #181 from scaleoutsystems/develop

STACKn v0.4.0

Author: dstoyanova

.gitignore

@@ -137,3 +137,5 @@ media/visualisers/
 
 tele_settings.py
 tele_settings_worker.py
+
+.vscode/

components/chart-controller/controller/controller.py

@@ -52,7 +52,7 @@ def deploy(self, options, action='install'):
             try:
                 args.append('--set')
                 # If list, don't escape ,
-                if options[key][0] == '{' and options[key][-1] == '}':
+                if len(options[key]) > 0 and options[key][0] == '{' and options[key][-1] == '}':
                     args.append(key+"="+options[key])
                 # And if not list, we should escape ,
                 else:

components/studio/models/views.py

@@ -20,7 +20,7 @@
 
 
 def index(request):
-    models = Model.objects.filter(access='PU')
+    models = Model.objects.filter(access='PU', project__isnull=False)
 
     return render(request, 'models_cards.html', locals())
 

components/studio/projects/templates/settings.html

@@ -131,22 +131,49 @@ <h6>Settings for sharing and collaboration</h6>
     {% if user_permissions.add_member %}
     <div class="container-fluid" style="padding: 15px;">
         <h5>Grant access</h5>
-        <p>For granting access to this project, select one or more users from the list below.</p>
+        <p>For granting/revoking access to this project, select one or more users from the list below.</p>
         <p>Hold <b>ctrl</b> or <b>shift</b> (or drag with the mouse) to select more than one.</p>
+        {% if platform_users|length == project.authorized.all|length %}
+        <div class="get-started-header">
+            <p>All users have already been added as members to this project.</p>
+        </div>
+        {% else %}
         <form method="POST" action="{% url 'projects:grant_access' request.user project.slug %}">
             {% csrf_token %}
 
             <div class="form-group">
                 <select name="selected_users" required="" multiple="" class="form-control" id="id_selected_users">
                     {% for user in platform_users %}
-                    <option value="{{ user.pk }}"
-                            {% if user in project.authorized.all %} style="background-color: #D5F5E3;" {% endif %}>
+                    {% if user not in project.authorized.all %}
+                    <option value="{{ user.pk }}">
                         {{ user.username }}
                     </option>
+                    {% endif %}
                     {% endfor %}
                 </select>
             </div>
-            <button type="submit" class="btn btn-primary">Save</button>
+            <button type="submit" class="btn btn-primary">Grant</button>
+        </form>
+        {% endif %}
+    </div>
+    {% endif %}
+
+    {% if user_permissions.add_member and project.authorized.all %}
+    <div class="container-fluid" style="padding: 15px;">
+        <h5>Revoke access</h5>
+        <form method="POST" action="{% url 'projects:revoke_access' request.user project.slug %}">
+            {% csrf_token %}
+
+            <div class="form-group">
+                <select name="selected_users" required="" multiple="" class="form-control" id="id_selected_users">
+                    {% for user in project.authorized.all %}
+                    <option value="{{ user.pk }}">
+                        {{ user.username }}
+                    </option>
+                    {% endfor %}
+                </select>
+            </div>
+            <button type="submit" class="btn btn-danger">Revoke</button>
         </form>
     </div>
     {% endif %}

components/studio/projects/urls.py

@@ -12,5 +12,6 @@
     path('<user>/<project_slug>/details/change', views.change_description, name='change_description'),
     path('<user>/<project_slug>/project/publish', views.publish_project, name='publish_project'),
     path('<user>/<project_slug>/project/access/grant', views.grant_access_to_project, name='grant_access'),
+    path('<user>/<project_slug>/project/access/revoke', views.revoke_access_to_project, name='revoke_access'),
     path('<user>/<project_slug>/logs', views.load_project_activity, name='project_activity'),
 ]

components/studio/projects/views.py

@@ -89,21 +89,12 @@ def change_description(request, user, project_slug):
 
 @login_required
 def grant_access_to_project(request, user, project_slug):
-    project = Project.objects.filter(slug=project_slug).first()
 
-    if request.method == 'POST':
+    project = Project.objects.get(slug=project_slug)
 
-        print(request.POST)
-        # if form.is_valid():
-        # print('Form valid:')
-        # print(form.is_valid())
+    if request.method == 'POST':
 
-        selected_users = request.POST.getlist('selected_users') #form.cleaned_data.get('selected_users')
-        print('Selected users:')
-        print(request.POST.getlist('selected_users'))
-        print('....')
-        project.authorized.set(selected_users)
-        project.save()
+        selected_users = request.POST.getlist('selected_users')
 
         l = ProjectLog(project=project, module='PR', headline='New members',
                        description='{number} new members have been added to the Project'.format(
@@ -115,13 +106,41 @@ def grant_access_to_project(request, user, project_slug):
 
         for selected_user in selected_users:
             user_tmp = User.objects.get(pk=selected_user)
+            project.authorized.add(user_tmp)
             username_tmp = user_tmp.username
             logger.info('Trying to add user {} to project.'.format(username_tmp))
             kc.keycloak_add_role_to_user(project.slug, username_tmp, 'member')
 
     return HttpResponseRedirect(
         reverse('projects:settings', kwargs={'user': user, 'project_slug': project.slug}))
 
+@login_required
+def revoke_access_to_project(request, user, project_slug):
+
+    project = Project.objects.get(slug=project_slug)
+
+    if request.method == 'POST':
+
+        selected_users = request.POST.getlist('selected_users')
+
+        l = ProjectLog(project=project, module='PR', headline='Removed Project members',
+                       description='{number} of members have been removed from the Project'.format(
+                           number=len(selected_users)))
+        l.save()
+
+        if len(selected_users) == 1:
+            selected_users = list(selected_users)
+
+        for selected_user in selected_users:
+            user_tmp = User.objects.get(pk=selected_user)
+            project.authorized.remove(user_tmp)
+            username_tmp = user_tmp.username
+            logger.info('Trying to add user {} to project.'.format(username_tmp))
+            kc.keycloak_remove_role_from_user(project.slug, username_tmp, 'member')
+
+    return HttpResponseRedirect(
+        reverse('projects:settings', kwargs={'user': user, 'project_slug': project.slug}))
+
 @login_required
 def create(request):
     template = 'index_projects.html'
@@ -206,8 +225,6 @@ def details(request, user, project_slug):
     except Exception as e:
         logger.error("Failed to get response from {} with error: {}".format(url, e))
 
-    project_logs = ProjectLog.objects.filter(project=project).order_by('-created_at')
-
     return render(request, template, locals())
 
 
@@ -281,16 +298,25 @@ def publish_project(request, user, project_slug):
 def load_project_activity(request, user, project_slug):
     template = 'project_activity.html'
 
-    time_period = request.GET.get('period')
-    if time_period == 'week':
-        last_week = datetime.today() - timedelta(days=7)
-        project_logs = ProjectLog.objects.filter(created_at__gte=last_week).order_by('-created_at')
-    elif time_period == 'month':
-        last_month = datetime.today() - timedelta(days=30)
-        project_logs = ProjectLog.objects.filter(created_at__gte=last_month).order_by('-created_at')
+    member = None
+    project = None
+    try:
+        member = User.objects.get(username=user)
+        project = Project.objects.get(Q(slug=project_slug), Q(owner=member) | Q(authorized=member))
+    except Exception as e:
+        print(e)
+
+    if member and project:
+        time_period = request.GET.get('period')
+        if time_period == 'week':
+            last_week = datetime.today() - timedelta(days=7)
+            project_logs = ProjectLog.objects.filter(project=project, created_at__gte=last_week).order_by('-created_at')
+        elif time_period == 'month':
+            last_month = datetime.today() - timedelta(days=30)
+            project_logs = ProjectLog.objects.filter(project=project, created_at__gte=last_month).order_by('-created_at')
+        else:
+            project_logs = ProjectLog.objects.filter(project=project).order_by('-created_at')
     else:
-        project_logs = ProjectLog.objects.all().order_by('-created_at')
+        project_logs = ProjectLog.objects.none()
 
     return render(request, template, {'project_logs': project_logs})
-
-