Issue 177: Dev QOL Stuff; PI Department info and forms

bootstrap/ansible/main.copyme

@@ -5,6 +5,7 @@
 # Types of Ansible tasks to run by default.
 provisioning_tasks: true
 common_tasks: true
+chmod_tasks: true # Can be false when a Windows FS is mounted
 
 ###############################################################################
 # General Settings
@@ -36,16 +37,15 @@ db_host: localhost
 # The credentials for the database admin user.
 # TODO: Replace the username and password.
 db_admin_user: admin
-db_admin_passwd: ''
+db_admin_passwd: root
 
 #------------------------------------------------------------------------------
 # Redis settings
 #------------------------------------------------------------------------------
 
 # The password for Redis.
 # TODO: Replace the password.
-redis_passwd: ''
-
+redis_passwd: root
 redis_host: localhost
 
 #------------------------------------------------------------------------------
@@ -123,7 +123,7 @@ cilogon_app_secret: ""
 # Django Flags settings
 #------------------------------------------------------------------------------
 
-# # Note: Use uppercase True/False so that Python interprets these as booleans.
+# Note: Use uppercase True/False so that Python interprets these as booleans.
 
 # TODO: For LRC, disable link login.
 flag_basic_auth_enabled: False
@@ -149,6 +149,15 @@ flag_mou_generation_enabled: False
 # Whether to include a survey as part of the allowance renewal request process.
 flag_renewal_survey_enabled: True
 
+#------------------------------------------------------------------------------
+# Plugin: departments
+#------------------------------------------------------------------------------
+
+# TODO: Enable for BRC, disable for LRC.
+plugin_departments_enabled: true
+plugin_departments_department_display_name: "Department"
+plugin_departments_department_data_source: "coldfront.plugins.departments.utils.data_sources.backends.calnet_ldap.CalNetLdapDataSourceBackend"
+
 #------------------------------------------------------------------------------
 # User-facing strings
 #------------------------------------------------------------------------------
@@ -167,6 +176,8 @@ center_user_guide: "https://docs-research-it.berkeley.edu/services/high-performa
 center_login_guide: "https://docs-research-it.berkeley.edu/services/high-performance-computing/user-guide/logging-brc-clusters/#Logging-in"
 # TODO: For MyLRC, use "[email protected]".
 center_help_email: "[email protected]"
+# TODO: For MyLRC, use "Division".
+department_display_name: "Department"
 
 #------------------------------------------------------------------------------
 # BRC Vector settings
@@ -421,16 +432,13 @@ sentry_dsn: ""
 # # Email settings.
 # email_host: localhost
 # email_port: 1025
-# # TODO: Set these addresses to yours.
-# from_email: [email protected]
-# admin_email: [email protected]
+# from_email: [email protected]
+# admin_email: [email protected]
 # # TODO: For LRC, use the substring 'MyLRC'.
 # email_subject_prefix: '[MyBRC-User-Portal]'
 
 # # A list of admin email addresses to be notified about new requests and other
 # # events.
-# # TODO: Set these addresses to yours.
-# email_admin_list: ['[email protected]']
+# email_admin_list: ['[email protected]']
 # # A list of email addresses to CC when certain requests are processed.
-# # TODO: Set these addresses to yours.
-# request_approval_cc_list: ['[email protected]']
+# request_approval_cc_list: ['[email protected]']

bootstrap/ansible/playbook.yml

@@ -13,7 +13,6 @@
     cwd: "{{ lookup('env', 'PWD') }} "
     provisioning_tasks: true
     common_tasks: true
-
     python_version: 3.6
     postgres_version: 15
     python_version_dotless: "{{ python_version | regex_replace('\\.','') }}"
@@ -61,6 +60,9 @@
             name: https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox-0.12.6-1.centos7.x86_64.rpm
             state: present
 
+        # The SCL role runs many tasks when it's included, so having it do
+        # everything in one run would be ideal to not have redundant tasks.
+
         - name: Install SCL
           include_role:
             role: smbambling.scl
@@ -648,6 +650,8 @@
             requirements: "{{ git_prefix }}/{{ reponame }}/requirements.txt"
             executable: "{{ git_prefix }}/venv/bin/pip3"
           become_user: "{{ djangooperator }}"
+          environment: # needed as pg_config isn't in PATH by default
+            PATH: "{{ ansible_env.PATH }}:/usr/pgsql-{{ postgres_version }}/bin"
 
         # Run Django management commands.
 
@@ -731,6 +735,7 @@
             state: directory
             mode: 0755
             group: apache
+          when: chmod_tasks
 
         - name: Grant Apache recursive read access to the application directory
           file:
@@ -739,6 +744,7 @@
             recurse: true
             mode: "u=rwX,g=rX,o=rX"
             group: apache
+          when: chmod_tasks
 
         # Gracefully restart Apache so that processes handle current requests
         # before being replaced by a new process.

bootstrap/ansible/settings_template.tmpl

@@ -21,7 +21,7 @@ CENTER_BASE_URL = '{{ full_host_path }}'
 CENTER_HELP_URL = CENTER_BASE_URL + '/help'
 CENTER_PROJECT_RENEWAL_HELP_URL = CENTER_BASE_URL + '/help'
 
-EMAIL_HOST = '{{ email_host}}'
+EMAIL_HOST = '{{ email_host }}'
 EMAIL_PORT = {{ email_port }}
 EMAIL_SUBJECT_PREFIX = '{{ email_subject_prefix }}'
 # A list of admin email addresses to be notified about new requests and other
@@ -298,6 +298,7 @@ FLAGS = {
     'SECURE_DIRS_REQUESTABLE': [{'condition': 'boolean', 'value': {{ flag_brc_enabled }}}],
     'SERVICE_UNITS_PURCHASABLE': [{'condition': 'boolean', 'value': {{ flag_brc_enabled }}}],
     'SSO_ENABLED': [{'condition': 'boolean', 'value': {{ flag_sso_enabled }}}],
+    'USER_DEPARTMENTS_ENABLED': [{'condition': 'app installed', 'value': 'coldfront.plugins.departments'}],
     'MOU_GENERATION_ENABLED': [{'condition': 'boolean', 'value': {{ flag_mou_generation_enabled }}}],
     'RENEWAL_SURVEY_ENABLED': [{'condition': 'boolean', 'value': {{ flag_renewal_survey_enabled }}}],
 }
@@ -318,6 +319,19 @@ if (not FLAGS['SSO_ENABLED'][0]['value'] and
         'LINK_LOGIN_ENABLED should only be enabled when SSO_ENABLED is '
         'enabled.')
 
+{% if plugin_departments_enabled is defined and plugin_departments_enabled | bool %}
+#------------------------------------------------------------------------------
+# Plugin: departments
+#------------------------------------------------------------------------------
+
+EXTRA_EXTRA_APPS += [
+    'coldfront.plugins.departments'
+]
+
+DEPARTMENTS_DEPARTMENT_DISPLAY_NAME = '{{ plugin_departments_department_display_name }}'
+DEPARTMENTS_DEPARTMENT_DATA_SOURCE = '{{ plugin_departments_department_data_source }}'
+{% endif %}
+
 {% if file_storage_backend == 'google_drive' %}
 #------------------------------------------------------------------------------
 # django-googledrive-storage settings

bootstrap/development/docker-legacy/docker-compose.yml

@@ -26,7 +26,7 @@ services:
       - 6379:6379
     volumes:
       - redis_data:/data
-    command: --requirepass ${REDIS_PASSWORD}
+    command: --requirepass "${REDIS_PASSWORD}"
     healthcheck:
       test: ["CMD", "redis-cli", "ping"]
       interval: 10s

bootstrap/development/docker-legacy/docker_load_database_backup.sh

@@ -32,4 +32,4 @@ echo MODIFYING PERMISSIONS...
 docker exec -i coldfront-db-1 \
 psql -U $DB_OWNER -c "ALTER SCHEMA public OWNER TO $DB_OWNER;" $DB_NAME
 
-echo DONE.
+echo DONE.

bootstrap/development/docker/config/brc_defaults.yml

@@ -16,6 +16,10 @@ flag_lrc_enabled: False
 flag_next_period_renewal_requestable_month: 5
 flag_multiple_email_addresses_allowed: False
 
+plugin_departments_enabled: true
+plugin_departments_department_display_name: "Department"
+plugin_departments_department_data_source: "coldfront.plugins.departments.utils.data_sources.backends.calnet_ldap.CalNetLdapDataSourceBackend"
+
 portal_name: MyBRC
 program_name_long: Berkeley Research Computing
 program_name_short: BRC

bootstrap/development/docker/config/lrc_defaults.yml

@@ -16,6 +16,10 @@ flag_lrc_enabled: True
 flag_next_period_renewal_requestable_month: 9
 flag_multiple_email_addresses_allowed: False
 
+plugin_departments_enabled: false
+plugin_departments_department_display_name: "Division"
+plugin_departments_department_data_source: "coldfront.plugins.departments.utils.data_sources.backends.dummy.DummyDataSourceBackend"
+
 portal_name: MyLRC
 program_name_long: Laboratory Research Computing
 program_name_short: LRC

bootstrap/development/docker/docker-compose.yml

@@ -53,6 +53,11 @@ services:
     volumes:
       - ../../..:/var/www/coldfront_app/coldfront
 
+  qcluster:
+    image: coldfront-qcluster
+    volumes:
+      - ../../..:/var/www/coldfront_app/coldfront
+
 volumes:
   db-postgres:
     external: false

bootstrap/development/docker/images/qcluster.Dockerfile

@@ -0,0 +1,3 @@
+FROM coldfront-app-base
+
+CMD ["python3", "manage.py", "qcluster"]

bootstrap/development/docker/scripts/build_images.sh

@@ -7,3 +7,4 @@ docker build -f bootstrap/development/docker/images/app-shell.Dockerfile -t cold
 docker build -f bootstrap/development/docker/images/web.Dockerfile -t coldfront-web .
 docker build -f bootstrap/development/docker/images/email-server.Dockerfile -t coldfront-email-server .
 docker build -f bootstrap/development/docker/images/db-postgres-shell.Dockerfile -t coldfront-db-postgres-shell .
+docker build -f bootstrap/development/docker/images/qcluster.Dockerfile -t coldfront-qcluster .

bootstrap/development/docs/vagrant-vm-README.md

@@ -30,16 +30,14 @@ The application may be installed within a Vagrant VM that is running on Scientif
    # This produces two lines: condense them into one.
    openssl rand -base64 64
    ```
-8. Customize `main.yml`. In particular, uncomment everything under the `dev_settings` section, and fill in the below variables. Note that quotes need not be provided, except in the list variable.
-   ```
-   django_secret_key: secret_key_from_previous_step
-   db_admin_passwd: password_here
-   redis_passwd: password_here
-   from_email: [email protected]
-   admin_email: [email protected]
-   email_admin_list: ["[email protected]"]
-   request_approval_cc_list: ["[email protected]"]
-   ```
+8. In `main.yml`, uncomment everything under the dev_settings section,
+and customize the following variables with your own values.
+    ```
+    django_secret_key: secret_key_from_previous_step 
+    chmod_tasks: true # Can be false when a Windows FS is mounted
+    db_admin_passwd: root
+    redis_passwd: root
+    ```
 9. Provision the VM. This should run the Ansible playbook. Expect this to take a few minutes on the first run.
    ```
    vagrant up

coldfront/config/settings.py

@@ -53,6 +53,7 @@
 INSTALLED_APPS += [
     'coldfront.core.user',
     'coldfront.core.field_of_science',
+    # 'coldfront.core.department',
     'coldfront.core.utils',
     'coldfront.core.portal',
     'coldfront.core.project',

coldfront/config/test_settings.py.sample

@@ -157,6 +157,26 @@ FLAGS = {
     'SECURE_DIRS_REQUESTABLE': [{'condition': 'boolean', 'value': True}],
     'SERVICE_UNITS_PURCHASABLE': [{'condition': 'boolean', 'value': True}],
     'SSO_ENABLED': [{'condition': 'boolean', 'value': False}],
+    'USER_DEPARTMENTS_ENABLED': [{'condition': 'app installed', 'value': 'coldfront.plugins.departments'}],
     'MOU_GENERATION_ENABLED': [{'condition': 'boolean', 'value': False}],
     'RENEWAL_SURVEY_ENABLED': [{'condition': 'boolean', 'value': True}],
 }
+
+#------------------------------------------------------------------------------
+# Plugin: departments
+#------------------------------------------------------------------------------
+
+EXTRA_EXTRA_APPS += [
+    'coldfront.plugins.departments'
+]
+
+DEPARTMENTS_DEPARTMENT_DISPLAY_NAME = 'Department'
+DEPARTMENTS_DEPARTMENT_DATA_SOURCE = 'coldfront.plugins.departments.utils.data_sources.backends.dummy.DummyDataSourceBackend'
+
+#------------------------------------------------------------------------------
+# django-q settings
+#------------------------------------------------------------------------------
+
+Q_CLUSTER = {
+    'sync': True,
+}

coldfront/core/project/forms_/new_project_forms/request_forms.py

@@ -18,7 +18,6 @@
 from django import forms
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.core.exceptions import ImproperlyConfigured
 from django.core.validators import MaxValueValidator
 from django.core.validators import MinLengthValidator
 from django.core.validators import MinValueValidator

coldfront/core/project/templates/project/project_request/savio/project_pi_department.html

@@ -0,0 +1,84 @@
+{% extends "common/base.html" %}
+{% load feature_flags %}
+{% load crispy_forms_tags %}
+{% load common_tags %}
+{% load static %}
+
+
+{% block title %}
+{{ PRIMARY_CLUSTER_NAME }} Project Request - PI {% settings_value 'DEPARTMENTS_DEPARTMENT_DISPLAY_NAME' %}
+{% endblock %}
+
+
+{% block head %}
+{{ wizard.form.media }}
+{% endblock %}
+
+
+{% block content %}
+<script type="text/javascript" src="{% static 'common/js/leave_form_alert.js' %}"></script>
+<script type='text/javascript' src="{% static 'selectize/selectize.min.js' %}"></script>
+<link rel='stylesheet' type='text/css' href="{% static 'selectize/selectize.bootstrap3.css' %}"/>
+
+<h1>{{ PRIMARY_CLUSTER_NAME }}: Principal Investigator</h1><hr>
+
+<ol class="breadcrumb">
+  <li>Allowance: {{ computing_allowance.name }}</li>
+  <li>&nbsp;<i class="fas fa-angle-double-right"></i>&nbsp;</li>
+  <li>Allocation Period: {{ allocation_period.name }}</li>
+  <li>&nbsp;<i class="fas fa-angle-double-right"></i>&nbsp;</li>
+  <li>{{ breadcrumb_pi }}</li>
+</ol>
+
+{% settings_value 'DEPARTMENTS_DEPARTMENT_DISPLAY_NAME' as department_display_name %}
+<p>Select one or more {{ department_display_name | lower }}s for the Principal Investigator of the project. You may search for the {{ department_display_name | lower }}(s) in the selection field.</p>
+<p>
+  {% flag_enabled 'BRC_ONLY' as brc_only %}
+  {% if brc_only %} Non-Berkeley {% else %} Non-Lab {% endif %}
+  users should select "Other".</p>
+
+<form action="" method="post">
+  {% csrf_token %}
+  <table>
+    {{ wizard.management_form }}
+    {% if wizard.form.forms %}
+      {{ wizard.form.management_form }}
+      {% for form in wizard.form.forms %}
+        {{ form|crispy }}
+      {% endfor %}
+    {% else %}
+      {{ wizard.form|crispy }}
+    {% endif %}
+  </table>
+  {% if wizard.steps.prev %}
+    <button
+        class="btn btn-secondary"
+        formnovalidate="formnovalidate"
+        name="wizard_goto_step"
+        type="submit"
+        value="{{ wizard.steps.first }}">
+      First Step
+    </button>
+    <button
+        class="btn btn-secondary"
+        formnovalidate="formnovalidate"
+        name="wizard_goto_step"
+        type="submit"
+        value="{{ wizard.steps.prev }}">
+      Previous Step
+    </button>
+  {% endif %}
+  <input class="btn btn-primary" type="submit" value="Next Step"/>
+</form>
+<br>
+
+<p>Step {{ wizard.steps.step1 }} of {{ wizard.steps.count }}</p>
+
+<script>
+  $('select').selectize({
+    create: false,
+    sortField: 'text'
+  })
+</script>
+
+{% endblock %}