Merge branch 'candidate' into GH-3081-richt-text-editor-templates

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,54 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [candidate, master]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [candidate]
+  schedule:
+    - cron: '0 3 * * 3'
+
+jobs:
+  analyse:
+    name: Analyse
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      # with:
+      #   languages: go, javascript, csharp, python, cpp, java
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/shiftleft-analysis.yml

@@ -0,0 +1,36 @@
+# This workflow integrates ShiftLeft Scan with GitHub's code scanning feature
+# ShiftLeft Scan is a free open-source security tool for modern DevOps teams
+# Visit https://slscan.io/en/latest/integrations/code-scan for help
+name: ShiftLeft Scan
+
+# This section configures the trigger for the workflow. Feel free to customize depending on your convention
+on: push
+
+jobs:
+  Scan-Build:
+    # Scan runs on ubuntu, mac and windows
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    # Instructions
+    # 1. Setup JDK, Node.js, Python etc depending on your project type
+    # 2. Compile or build the project before invoking scan
+    #    Example: mvn compile, or npm install or pip install goes here
+    # 3. Invoke ShiftLeft Scan with the github token. Leave the workspace empty to use relative url
+
+    - name: Perform ShiftLeft Scan
+      uses: ShiftLeftSecurity/scan-action@master
+      env:
+        WORKSPACE: ""
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        SCAN_AUTO_BUILD: true
+      with:
+        output: reports
+        # Scan auto-detects the languages in your project. To override uncomment the below variable and set the type
+        # type: credscan,java
+        # type: python
+
+    - name: Upload report
+      uses: github/codeql-action/upload-sarif@v1
+      with:
+        sarif_file: reports

anet.yml

@@ -225,35 +225,20 @@ dictionary:
           componentClass: textarea
           style:
             height: 400px
-        assessment:
-          customFields:
-            issues:
-              type: special_field
-              label: Top 3 issues
-              placeholder:  Enter the top 3 issues
-              widget: richTextEditor
-              style:
-                height: 300px
-              validations:
-                - type: required
-                  params: [You must provide the top 3 issues]
-            status:
-              type: enum
-              label: Project status
-              helpText: Select an assessement status for objective
-              choices:
-                GREEN:
-                  label: Green
-                  color: '#c2ffb3'
-                AMBER:
-                  label: Amber
-                  color: '#ffe396'
-                RED:
-                  label: Red
-                  color: '#ff8279'
-              validations:
-                - type: required
-                  params: [You must provide the assessment status]
+        assessments:
+          - recurrence: semiannualy
+            questions:
+              issues:
+                type: special_field
+                label: Top 3 issues
+                placeholder:  Enter the top 3 issues
+                widget: richTextEditor
+                style:
+                  height: 300px
+                validations:
+                  - type: required
+                    params: [You must provide the top 3 issues]
+
       subLevel:
         shortLabel: Effort
         shortName:
@@ -266,19 +251,48 @@ dictionary:
           componentClass: textarea
           style:
             height: 400px
-        assessment:
-          customFields:
-            issues:
-              type: special_field
-              label: Top 3 issues
-              placeholder:  Enter the top 3 issues
-              widget: richTextEditor
-              style:
-                height: 300px
-              validations:
-                - type: required
-                  params: [You must provide the top 3 issues]
-
+        assessments:
+          - recurrence: monthly
+            questions:
+              issues:
+                type: special_field
+                label: Top 3 issues
+                placeholder:  Enter the top 3 issues
+                widget: richTextEditor
+                style:
+                  height: 300px
+                validations:
+                  - type: required
+                    params: [You must provide the top 3 issues]
+              status:
+                type: enum
+                label: Project status
+                helpText: Select an assessment status for objective
+                choices:
+                  GREEN:
+                    label: Green
+                    color: '#c2ffb3'
+                  AMBER:
+                    label: Amber
+                    color: '#ffe396'
+                  RED:
+                    label: Red
+                    color: '#ff8279'
+                validations:
+                  - type: required
+                    params: [You must provide the assessment status]
+          - recurrence: weekly
+            questions:
+              issues:
+                type: special_field
+                label: Top 3 issues
+                placeholder:  Enter the top 3 issues
+                widget: richTextEditor
+                style:
+                  height: 300px
+                validations:
+                  - type: required
+                    params: [You must provide the top 3 issues]
       customFieldRef1:
         label: Parent task
         placeholder: Start typing to search for a higher level task
@@ -304,13 +318,49 @@ dictionary:
         label: Responsible positions
         placeholder: Search for a position...
       customFields:
-        assessmentDefinition:
-          type: text
-          label: Assessment definition
-          placeholder: JSON that defines the effort (you need to know what you are doing)
-          componentClass: textarea
-          style:
-            height: 200px
+        assessments:
+          type: array_of_objects
+          label: Assessments definition
+          addButtonLabel: Add an assessment
+          objectLabel: Assessment
+          objectFields:
+            recurrence:
+              type: enum
+              label: Recurrence
+              helpText: Select a recurrence for this periodic assessment
+              choices:
+                once:
+                  label: once
+                daily:
+                  label: daily
+                weekly:
+                  label: weekly
+                biweekly:
+                  label: biweekly
+                semimonthly:
+                  label: semimonthly
+                monthly:
+                  label: monthly
+                quarterly:
+                  label: quarterly
+                semiannualy:
+                  label: semiannualy
+            relatedObjectType:
+              type: enum
+              label: Related object type
+              helpText: object type context in which the assessment will be made
+              choices:
+                report:
+                  label: Report
+                null:
+                  label: None
+            questions:
+              type: text
+              label: Questions
+              placeholder: JSON that defines the assessment (you need to know what you are doing)
+              componentClass: textarea
+              style:
+                height: 200px
 
     report:
       intent: Engagement purpose
@@ -372,6 +422,10 @@ dictionary:
             - color: lightGray
               endValue: 10
               label: advanced advanced advanced advanced
+        trainingDate:
+          type: date
+          label: Training date
+          visibleWhen: $[?(@.multipleButtons && @.multipleButtons.indexOf('train') != -1)]
         systemProcess:
           type: enum
           label: System / process
@@ -649,6 +703,64 @@ dictionary:
                 - value: "3"
                   label: three
                   color: '#ff8279'
+        assessments:
+          - recurrence: quarterly
+            questions:
+              test1:
+                type: enum
+                label: Test question 1
+                choices:
+                  "1":
+                    label: one
+                    color: '#c2ffb3'
+                  "2":
+                    label: two
+                    color: '#ffe396'
+                  "3":
+                    label: three
+                    color: '#ff8279'
+              test2:
+                type: enum
+                label: Test question 2
+                choices:
+                  "3":
+                    label: three
+                    color: '#ff8279'
+                  "4":
+                    label: four
+                    color: '#ffe396'
+                  "5":
+                    label: five
+                    color: '#c2ffb3'
+              test3:
+                type: enum
+                label: Test question 3
+                choices:
+                  "1":
+                    label: one
+                    color: '#c2ffb3'
+                  "2":
+                    label: two
+                    color: '#ff8279'
+                  "3":
+                    label: three
+                    color: '#ff8279'
+          - recurrence: once
+            relatedObjectType: report
+            questions:
+              question1:
+                type: enum
+                label: Attendee involvement
+                choices:
+                  "1":
+                    label: low
+                    color: '#c2ffb3'
+                  "2":
+                    label: medium
+                    color: '#ffe396'
+                  "3":
+                    label: high
+                    color: '#ff8279'
 
       position:
         name: Afghan Tashkil
@@ -728,3 +840,6 @@ dictionary:
     - label: decisives
       data: /data/dashboards/decisives.json
       type: decisives
+    - label: process board
+      type: board
+      data: /data/dashboards/process.json