From cdab9b6afedd0f0fc6e9a31080942a100c4f3655 Mon Sep 17 00:00:00 2001
From: Roman K <romankupkovic1@gmail.com>
Date: Sat, 22 Jan 2022 18:18:00 +0100
Subject: [PATCH 1/9] add dynamic dropdown options for Status and Type dropdown

---
 .../gr2/planner/main/MainPageServlet.java     |  10 +
 .../META-INF/plugin-descriptors/wr-defs.xml   |   2 +-
 backend/src/main/resources/main_page.vm       |  32 +-
 frontend/package-lock.json                    | 108 ++--
 package-lock.json                             | 529 ++++++------------
 package.json                                  |   5 +
 6 files changed, 259 insertions(+), 427 deletions(-)
 create mode 100644 package.json

diff --git a/backend/src/main/java/de/tuberlin/amos/gr2/planner/main/MainPageServlet.java b/backend/src/main/java/de/tuberlin/amos/gr2/planner/main/MainPageServlet.java
index 6ab8777..fedb382 100644
--- a/backend/src/main/java/de/tuberlin/amos/gr2/planner/main/MainPageServlet.java
+++ b/backend/src/main/java/de/tuberlin/amos/gr2/planner/main/MainPageServlet.java
@@ -8,6 +8,8 @@
 import com.atlassian.jira.security.PermissionManager;
 import com.atlassian.jira.user.ApplicationUser;
 import com.atlassian.jira.user.UserProjectHistoryManager;
+import com.atlassian.jira.config.ConstantsManager;
+import com.atlassian.jira.issue.status.Status;
 import com.atlassian.plugin.spring.scanner.annotation.imports.ComponentImport;
 import static com.atlassian.jira.component.ComponentAccessor.getJiraAuthenticationContext;
 
@@ -44,6 +46,10 @@ public class MainPageServlet extends HttpServlet {
     @ComponentImport
     private PermissionManager permissionManager;
 
+    @Inject
+    @ComponentImport
+    private ConstantsManager constantsManager;
+
     @Inject
     @ComponentImport
     private IssueTypeSchemeManager issueTypeSchemeManager;
@@ -70,8 +76,12 @@ protected void doGet(HttpServletRequest req, HttpServletResponse response) throw
         //using a deprecated class because there is no such method for getCurrentProject with ProjectPermissionKey yet
         Project currentProject = userProjectHistoryManager.getCurrentProject(Permissions.BROWSE, user);
         Collection<Project> allProjects = permissionManager.getProjects(ProjectPermissions.BROWSE_PROJECTS, user);
+        Collection<Status> statuses = constantsManager.getStatusObjects();
+        Collection<IssueType> issueType = constantsManager.getAllIssueTypeObjects();
         params.put("currentProject", currentProject);
         params.put("allProjects", allProjects);
+        params.put("statuses", statuses);
+        params.put("issueType", issueType);
 
         Collection<IssueType> issueTypes = issueTypeSchemeManager.getIssueTypesForDefaultScheme();
 
diff --git a/backend/src/main/resources/META-INF/plugin-descriptors/wr-defs.xml b/backend/src/main/resources/META-INF/plugin-descriptors/wr-defs.xml
index a401f4e..d8acca1 100644
--- a/backend/src/main/resources/META-INF/plugin-descriptors/wr-defs.xml
+++ b/backend/src/main/resources/META-INF/plugin-descriptors/wr-defs.xml
@@ -5,7 +5,7 @@
     </transformation>
     <resource type="download" name="bundled.dynamictable.js" location="frontend//bundled.dynamictable.js"/>
   </web-resource>
-  <web-resource key="assets-65dc4053-2cb4-4dc1-846d-c8ddf8b6cde1">
+  <web-resource key="assets-b6fd0072-2917-41fe-96f6-7fd27263003e">
     <resource type="download" name="bundled.dynamictable.js.LICENSE.txt" location="frontend//bundled.dynamictable.js.LICENSE.txt"/>
   </web-resource>
 </bundles>
\ No newline at end of file
diff --git a/backend/src/main/resources/main_page.vm b/backend/src/main/resources/main_page.vm
index 917efd5..83298cc 100644
--- a/backend/src/main/resources/main_page.vm
+++ b/backend/src/main/resources/main_page.vm
@@ -143,7 +143,7 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
 
                                 ## second filter bar buttons
                                 <div class="aui-group">
-                                    <div class="aui-item" id="second-filter" style="display:inline-block">
+                                    <div class="aui-item" id="second-filter" style="display: inline-block">
                                         <form style="float: left" class="aui">
                                             <input id="search-issues" placeholder="Search Issues" type="text"
                                                    class="text">
@@ -184,7 +184,7 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                                     </div>
 
                                     ## second filter bar advanced search
-                                    <div class="aui-item" id="jql-search" style="display:none">
+                                    <div class="aui-item" id="jql-search" style="display: none">
                                         <form style="float: left" class="aui">
                                             <input style="min-width: 50rem" id="search-issues-textfield"
                                                    placeholder="Type JQL Query.." type="text" class="text">
@@ -196,7 +196,7 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                                                 id="jql-search-button">Search
                                         </button>
                                     </div>
-                                    <div style="display:inline-block; float: right">
+                                    <div style="display: inline-block; float: right">
                                         <aui-label for="JQL-switch">Use JQL</aui-label>
                                         <aui-toggle id="JQL-switch" label="use JQL"></aui-toggle>
                                     </div>
@@ -222,7 +222,7 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
 
 
                                 <script>
-                                    //JQL-Search
+                                    ## JQL-Search
                                     const jqlSearchButton = document.getElementById("jql-search-button");
                                     jqlSearchButton.addEventListener("click", function (e) {
                                         console.log('Event:Click')
@@ -286,18 +286,29 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
 
                             ## dropdown popup activated when clicking type
 
+
+
                             <aui-dropdown-menu id="type-dropdown">
-                                <aui-section label="Request Type">
-                                    <aui-item-checkbox interactive>Task Issue</aui-item-checkbox>
-                                    <aui-item-checkbox interactive>Sub-Task Issue</aui-item-checkbox>
+                                <aui-section label="Type">
+                                    #foreach( $type in $issueType )
+                                        <aui-item-checkbox interactive>$type.name</aui-item-checkbox>
+                                    #end
                                 </aui-section>
                             </aui-dropdown-menu>
 
+                            ## /rest/api/2/project/{currentProject}/statuses
+                            ## getCurrentProject(com.atlassian.jira.security.Permissions.PROJECT_ADMIN, currentUser())
+                            ## com.atlassian.jira.security.Permissions.PROJECT_ADMIN
+
+                            ## let request_currentProject = new Request(protocol.concat('//', window.location.host, '/jira/rest/api/2/search?jql=', jqlquery));
+                            ## http://localhost:2990/jira/rest/api/2/project/TES/statuses
+
                             ## Dropdown type dynamic query update (checkbox)
                             <script>
                                 var typeQuery = " ";
                                 var typeParams = [];
                                 var typeDropdown = document.getElementById('type-dropdown');
+
                                 typeDropdown.addEventListener('change', function (e) {
                                     var isChecked = e.target.hasAttribute('checked');
                                     if (isChecked) {
@@ -320,6 +331,7 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                                             });
                                         }
                                         console.log(typeParams);
+
                                     }
 
                                     ## Prepare updated query
@@ -345,9 +357,9 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
 
                             <aui-dropdown-menu id="status-dropdown">
                                 <aui-section label="Request Status">
-                                    <aui-item-checkbox interactive>To Do</aui-item-checkbox>
-                                    <aui-item-checkbox interactive>Done</aui-item-checkbox>
-                                    ##<aui-item-checkbox interactive>Canceled</aui-item-checkbox>
+                                #foreach( $status in $statuses )
+                                    <aui-item-checkbox interactive>$status.name</aui-item-checkbox>
+                                #end
                                 </aui-section>
                             </aui-dropdown-menu>
 
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 2273bb8..beb1ea1 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -679,11 +679,11 @@
       }
     },
     "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.7.tgz",
-      "integrity": "sha512-7twV3pzhrRxSwHeIvFE6coPgvo+exNDOiGUMg39o2LiLo1Y+4aKpfkcLGcg1UHonzorCt7SNXnoMyCnnIOA8Sw==",
+      "version": "7.16.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz",
+      "integrity": "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==",
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
+        "@babel/helper-create-class-features-plugin": "^7.16.10",
         "@babel/helper-plugin-utils": "^7.16.7"
       },
       "engines": {
@@ -1594,9 +1594,9 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.16.10",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.10.tgz",
-      "integrity": "sha512-iCac3fZn9oOcLqc1N2/copPiX7aoxzsvjeDdXoZobrlbQ6YGgS3bL9HyldOJ8V8AY5P7pFynCATrn7M4dMw0Yg==",
+      "version": "7.16.11",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz",
+      "integrity": "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==",
       "dependencies": {
         "@babel/compat-data": "^7.16.8",
         "@babel/helper-compilation-targets": "^7.16.7",
@@ -1616,7 +1616,7 @@
         "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
         "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
         "@babel/plugin-proposal-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-private-methods": "^7.16.7",
+        "@babel/plugin-proposal-private-methods": "^7.16.11",
         "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
         "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
@@ -5529,9 +5529,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001300",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001300.tgz",
-      "integrity": "sha512-cVjiJHWGcNlJi8TZVKNMnvMid3Z3TTdDHmLDzlOdIiZq138Exvo0G+G0wTdVYolxKb4AYwC+38pxodiInVtJSA==",
+      "version": "1.0.30001301",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001301.tgz",
+      "integrity": "sha512-csfD/GpHMqgEL3V3uIgosvh+SVIQvCh43SNu9HRbP1lnxkKm1kjDG4f32PP571JplkLjfS+mg2p1gxR7MYrrIA==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/browserslist"
@@ -7629,9 +7629,9 @@
       }
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.49",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.49.tgz",
-      "integrity": "sha512-k/0t1TRfonHIp8TJKfjBu2cKj8MqYTiEpOhci+q7CVEE5xnCQnx1pTa+V8b/sdhe4S3PR4p4iceEQWhGrKQORQ=="
+      "version": "1.4.51",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.51.tgz",
+      "integrity": "sha512-JNEmcYl3mk1tGQmy0EvL5eik/CKSBuzAyGP0QFdG6LIgxQe3II0BL1m2zKc2MZMf3uGqHWE1TFddJML0RpjSHQ=="
     },
     "node_modules/elliptic": {
       "version": "6.5.4",
@@ -24992,9 +24992,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz",
-      "integrity": "sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ==",
+      "version": "6.0.9",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz",
+      "integrity": "sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -27926,9 +27926,9 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
     },
     "node_modules/resolve": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.0.tgz",
-      "integrity": "sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==",
+      "version": "1.21.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.1.tgz",
+      "integrity": "sha512-lfEImVbnolPuaSZuLQ52cAxPBHeI77sPwCOWRdy12UG/CNa8an7oBHH1R+Fp1/mUqSJi4c8TIP6FOIPSZAUrEQ==",
       "dependencies": {
         "is-core-module": "^2.8.0",
         "path-parse": "^1.0.7",
@@ -30974,9 +30974,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz",
-      "integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg==",
+      "version": "4.5.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz",
+      "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -31765,9 +31765,9 @@
       }
     },
     "node_modules/webpack": {
-      "version": "5.66.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.66.0.tgz",
-      "integrity": "sha512-NJNtGT7IKpGzdW7Iwpn/09OXz9inIkeIQ/ibY6B+MdV1x6+uReqz/5z1L89ezWnpPDWpXF0TY5PCYKQdWVn8Vg==",
+      "version": "5.67.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz",
+      "integrity": "sha512-LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw==",
       "dependencies": {
         "@types/eslint-scope": "^3.7.0",
         "@types/estree": "^0.0.50",
@@ -31792,7 +31792,7 @@
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.1.3",
         "watchpack": "^2.3.1",
-        "webpack-sources": "^3.2.2"
+        "webpack-sources": "^3.2.3"
       },
       "bin": {
         "webpack": "bin/webpack.js"
@@ -33663,11 +33663,11 @@
       }
     },
     "@babel/plugin-proposal-private-methods": {
-      "version": "7.16.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.7.tgz",
-      "integrity": "sha512-7twV3pzhrRxSwHeIvFE6coPgvo+exNDOiGUMg39o2LiLo1Y+4aKpfkcLGcg1UHonzorCt7SNXnoMyCnnIOA8Sw==",
+      "version": "7.16.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz",
+      "integrity": "sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==",
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.16.7",
+        "@babel/helper-create-class-features-plugin": "^7.16.10",
         "@babel/helper-plugin-utils": "^7.16.7"
       }
     },
@@ -34227,9 +34227,9 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.16.10",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.10.tgz",
-      "integrity": "sha512-iCac3fZn9oOcLqc1N2/copPiX7aoxzsvjeDdXoZobrlbQ6YGgS3bL9HyldOJ8V8AY5P7pFynCATrn7M4dMw0Yg==",
+      "version": "7.16.11",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz",
+      "integrity": "sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==",
       "requires": {
         "@babel/compat-data": "^7.16.8",
         "@babel/helper-compilation-targets": "^7.16.7",
@@ -34249,7 +34249,7 @@
         "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
         "@babel/plugin-proposal-optional-catch-binding": "^7.16.7",
         "@babel/plugin-proposal-optional-chaining": "^7.16.7",
-        "@babel/plugin-proposal-private-methods": "^7.16.7",
+        "@babel/plugin-proposal-private-methods": "^7.16.11",
         "@babel/plugin-proposal-private-property-in-object": "^7.16.7",
         "@babel/plugin-proposal-unicode-property-regex": "^7.16.7",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
@@ -37292,9 +37292,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001300",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001300.tgz",
-      "integrity": "sha512-cVjiJHWGcNlJi8TZVKNMnvMid3Z3TTdDHmLDzlOdIiZq138Exvo0G+G0wTdVYolxKb4AYwC+38pxodiInVtJSA=="
+      "version": "1.0.30001301",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001301.tgz",
+      "integrity": "sha512-csfD/GpHMqgEL3V3uIgosvh+SVIQvCh43SNu9HRbP1lnxkKm1kjDG4f32PP571JplkLjfS+mg2p1gxR7MYrrIA=="
     },
     "capture-exit": {
       "version": "2.0.0",
@@ -38935,9 +38935,9 @@
       "integrity": "sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="
     },
     "electron-to-chromium": {
-      "version": "1.4.49",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.49.tgz",
-      "integrity": "sha512-k/0t1TRfonHIp8TJKfjBu2cKj8MqYTiEpOhci+q7CVEE5xnCQnx1pTa+V8b/sdhe4S3PR4p4iceEQWhGrKQORQ=="
+      "version": "1.4.51",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.51.tgz",
+      "integrity": "sha512-JNEmcYl3mk1tGQmy0EvL5eik/CKSBuzAyGP0QFdG6LIgxQe3II0BL1m2zKc2MZMf3uGqHWE1TFddJML0RpjSHQ=="
     },
     "elliptic": {
       "version": "6.5.4",
@@ -52310,9 +52310,9 @@
       }
     },
     "postcss-selector-parser": {
-      "version": "6.0.8",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.8.tgz",
-      "integrity": "sha512-D5PG53d209Z1Uhcc0qAZ5U3t5HagH3cxu+WLZ22jt3gLUpXM4eXXfiO14jiDWST3NNooX/E8wISfOhZ9eIjGTQ==",
+      "version": "6.0.9",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz",
+      "integrity": "sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==",
       "requires": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -54643,9 +54643,9 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
     },
     "resolve": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.0.tgz",
-      "integrity": "sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==",
+      "version": "1.21.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.1.tgz",
+      "integrity": "sha512-lfEImVbnolPuaSZuLQ52cAxPBHeI77sPwCOWRdy12UG/CNa8an7oBHH1R+Fp1/mUqSJi4c8TIP6FOIPSZAUrEQ==",
       "requires": {
         "is-core-module": "^2.8.0",
         "path-parse": "^1.0.7",
@@ -57072,9 +57072,9 @@
       }
     },
     "typescript": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz",
-      "integrity": "sha512-VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg=="
+      "version": "4.5.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz",
+      "integrity": "sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="
     },
     "uglify-js": {
       "version": "3.4.10",
@@ -57715,9 +57715,9 @@
       "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w=="
     },
     "webpack": {
-      "version": "5.66.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.66.0.tgz",
-      "integrity": "sha512-NJNtGT7IKpGzdW7Iwpn/09OXz9inIkeIQ/ibY6B+MdV1x6+uReqz/5z1L89ezWnpPDWpXF0TY5PCYKQdWVn8Vg==",
+      "version": "5.67.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.67.0.tgz",
+      "integrity": "sha512-LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw==",
       "requires": {
         "@types/eslint-scope": "^3.7.0",
         "@types/estree": "^0.0.50",
@@ -57742,7 +57742,7 @@
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.1.3",
         "watchpack": "^2.3.1",
-        "webpack-sources": "^3.2.2"
+        "webpack-sources": "^3.2.3"
       },
       "dependencies": {
         "acorn": {
diff --git a/package-lock.json b/package-lock.json
index 5d939a6..79657e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,387 +1,192 @@
 {
+  "name": "amos2021ws02-agile-trans-jira",
+  "lockfileVersion": 2,
   "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz",
-      "integrity": "sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA==",
-      "requires": {
-        "@babel/highlight": "^7.16.0"
-      }
-    },
-    "@babel/compat-data": {
-      "version": "7.16.4",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz",
-      "integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q=="
-    },
-    "@babel/generator": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.16.0.tgz",
-      "integrity": "sha512-RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew==",
-      "requires": {
-        "@babel/types": "^7.16.0",
-        "jsesc": "^2.5.1",
-        "source-map": "^0.5.0"
-      }
-    },
-    "@babel/helper-compilation-targets": {
-      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz",
-      "integrity": "sha512-vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA==",
-      "requires": {
-        "@babel/compat-data": "^7.16.0",
-        "@babel/helper-validator-option": "^7.14.5",
-        "browserslist": "^4.17.5",
-        "semver": "^6.3.0"
-      }
-    },
-    "@babel/helper-define-polyfill-provider": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz",
-      "integrity": "sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg==",
-      "requires": {
-        "@babel/helper-compilation-targets": "^7.13.0",
-        "@babel/helper-module-imports": "^7.12.13",
-        "@babel/helper-plugin-utils": "^7.13.0",
-        "@babel/traverse": "^7.13.0",
-        "debug": "^4.1.1",
-        "lodash.debounce": "^4.0.8",
-        "resolve": "^1.14.2",
-        "semver": "^6.1.2"
-      }
-    },
-    "@babel/helper-function-name": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz",
-      "integrity": "sha512-BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog==",
-      "requires": {
-        "@babel/helper-get-function-arity": "^7.16.0",
-        "@babel/template": "^7.16.0",
-        "@babel/types": "^7.16.0"
-      }
-    },
-    "@babel/helper-get-function-arity": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz",
-      "integrity": "sha512-ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ==",
-      "requires": {
-        "@babel/types": "^7.16.0"
-      }
-    },
-    "@babel/helper-hoist-variables": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz",
-      "integrity": "sha512-1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg==",
-      "requires": {
-        "@babel/types": "^7.16.0"
-      }
-    },
-    "@babel/helper-module-imports": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz",
-      "integrity": "sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==",
-      "requires": {
-        "@babel/types": "^7.16.0"
-      }
-    },
-    "@babel/helper-plugin-utils": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz",
-      "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ=="
-    },
-    "@babel/helper-split-export-declaration": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz",
-      "integrity": "sha512-0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw==",
-      "requires": {
-        "@babel/types": "^7.16.0"
-      }
-    },
-    "@babel/helper-validator-identifier": {
-      "version": "7.15.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz",
-      "integrity": "sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="
-    },
-    "@babel/helper-validator-option": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz",
-      "integrity": "sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="
-    },
-    "@babel/highlight": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz",
-      "integrity": "sha512-t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g==",
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.15.7",
-        "chalk": "^2.0.0",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "@babel/parser": {
-      "version": "7.16.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz",
-      "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng=="
-    },
-    "@babel/plugin-transform-runtime": {
-      "version": "7.16.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.4.tgz",
-      "integrity": "sha512-pru6+yHANMTukMtEZGC4fs7XPwg35v8sj5CIEmE+gEkFljFiVJxEWxx/7ZDkTK+iZRYo1bFXBtfIN95+K3cJ5A==",
-      "requires": {
-        "@babel/helper-module-imports": "^7.16.0",
-        "@babel/helper-plugin-utils": "^7.14.5",
-        "babel-plugin-polyfill-corejs2": "^0.3.0",
-        "babel-plugin-polyfill-corejs3": "^0.4.0",
-        "babel-plugin-polyfill-regenerator": "^0.3.0",
-        "semver": "^6.3.0"
-      }
-    },
-    "@babel/template": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.16.0.tgz",
-      "integrity": "sha512-MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A==",
-      "requires": {
-        "@babel/code-frame": "^7.16.0",
-        "@babel/parser": "^7.16.0",
-        "@babel/types": "^7.16.0"
-      }
-    },
-    "@babel/traverse": {
-      "version": "7.16.3",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.3.tgz",
-      "integrity": "sha512-eolumr1vVMjqevCpwVO99yN/LoGL0EyHiLO5I043aYQvwOJ9eR5UsZSClHVCzfhBduMAsSzgA/6AyqPjNayJag==",
-      "requires": {
-        "@babel/code-frame": "^7.16.0",
-        "@babel/generator": "^7.16.0",
-        "@babel/helper-function-name": "^7.16.0",
-        "@babel/helper-hoist-variables": "^7.16.0",
-        "@babel/helper-split-export-declaration": "^7.16.0",
-        "@babel/parser": "^7.16.3",
-        "@babel/types": "^7.16.0",
-        "debug": "^4.1.0",
-        "globals": "^11.1.0"
-      }
-    },
-    "@babel/types": {
-      "version": "7.16.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz",
-      "integrity": "sha512-PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg==",
-      "requires": {
-        "@babel/helper-validator-identifier": "^7.15.7",
-        "to-fast-properties": "^2.0.0"
-      }
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "babel-plugin-polyfill-corejs2": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.0.tgz",
-      "integrity": "sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA==",
-      "requires": {
-        "@babel/compat-data": "^7.13.11",
-        "@babel/helper-define-polyfill-provider": "^0.3.0",
-        "semver": "^6.1.1"
-      }
-    },
-    "babel-plugin-polyfill-corejs3": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz",
-      "integrity": "sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw==",
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.0",
-        "core-js-compat": "^3.18.0"
-      }
-    },
-    "babel-plugin-polyfill-regenerator": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz",
-      "integrity": "sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg==",
-      "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.0"
+  "packages": {
+    "": {
+      "dependencies": {
+        "@atlassian/aui": "^9.4.3"
       }
     },
-    "browserslist": {
-      "version": "4.18.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz",
-      "integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==",
-      "requires": {
-        "caniuse-lite": "^1.0.30001280",
-        "electron-to-chromium": "^1.3.896",
-        "escalade": "^3.1.1",
-        "node-releases": "^2.0.1",
-        "picocolors": "^1.0.0"
+    "node_modules/@atlassian/aui": {
+      "version": "9.4.3",
+      "resolved": "https://registry.npmjs.org/@atlassian/aui/-/aui-9.4.3.tgz",
+      "integrity": "sha512-m7tEMhZun/gMPM+uMpOzWFH2/QAZ8WnBzNRLRMtswMFHtzVT1A/YZIAr2242kAUv3uWIqC1I2siUGpweaPiGSQ==",
+      "dependencies": {
+        "@atlassian/tipsy": "1.3.3",
+        "@popperjs/core": "2.4.4",
+        "backbone": "1.4.0",
+        "css.escape": "1.5.0",
+        "fancy-file-input": "2.0.4",
+        "jquery-ui": "1.13.0",
+        "skatejs": "0.13.17",
+        "skatejs-template-html": "0.0.0",
+        "trim-extra-html-whitespace": "1.3.0",
+        "underscore": "1.13.1"
+      },
+      "engines": {
+        "node": "^6 || >=8",
+        "yarn": "^1.6"
+      },
+      "peerDependencies": {
+        "jquery": "^2 || ^3"
       }
     },
-    "caniuse-lite": {
-      "version": "1.0.30001283",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001283.tgz",
-      "integrity": "sha512-9RoKo841j1GQFSJz/nCXOj0sD7tHBtlowjYlrqIUS812x9/emfBLBt6IyMz1zIaYc/eRL8Cs6HPUVi2Hzq4sIg=="
-    },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      }
+    "node_modules/@atlassian/tipsy": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@atlassian/tipsy/-/tipsy-1.3.3.tgz",
+      "integrity": "sha512-6jd9wdoiPdCbwsNi1Xrn/oMdGz22dKPeCoZ/cCGKqjnh+UYkBKb5W3spW+WNqRSxGvVtfUEEg6TXotRK/FPDaw=="
     },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "requires": {
-        "color-name": "1.1.3"
+    "node_modules/@popperjs/core": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.4.4.tgz",
+      "integrity": "sha512-1oO6+dN5kdIA3sKPZhRGJTfGVP4SWV6KqlMOwry4J3HfyD68sl/3KmG7DeYUzvN+RbhXDnv/D8vNNB8168tAMg==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
       }
     },
-    "color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-    },
-    "core-js-compat": {
-      "version": "3.19.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.1.tgz",
-      "integrity": "sha512-Q/VJ7jAF/y68+aUsQJ/afPOewdsGkDtcMb40J8MbuWKlK3Y+wtHq8bTHKPj2WKWLIqmS5JhHs4CzHtz6pT2W6g==",
-      "requires": {
-        "browserslist": "^4.17.6",
-        "semver": "7.0.0"
-      },
+    "node_modules/backbone": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/backbone/-/backbone-1.4.0.tgz",
+      "integrity": "sha512-RLmDrRXkVdouTg38jcgHhyQ/2zjg7a8E6sz2zxfz21Hh17xDJYUHBZimVIt5fUyS8vbfpeSmTL3gUjTEvUV3qQ==",
       "dependencies": {
-        "semver": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
-          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="
-        }
+        "underscore": ">=1.8.3"
       }
     },
-    "debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-      "requires": {
-        "ms": "2.1.2"
-      }
-    },
-    "electron-to-chromium": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.4.tgz",
-      "integrity": "sha512-teHtgwcmVcL46jlFvAaqjyiTLWuMrUQO1JqV303JKB4ysXG6m8fXSFhbjal9st0r9mNskI22AraJZorb1VcLVg=="
-    },
-    "escalade": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
-      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-    },
-    "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
+    "node_modules/css.escape": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.0.tgz",
+      "integrity": "sha1-lZhNeIfOTKkGhOgTlm9C0e+H7Oo="
     },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "requires": {
-        "function-bind": "^1.1.1"
+    "node_modules/fancy-file-input": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/fancy-file-input/-/fancy-file-input-2.0.4.tgz",
+      "integrity": "sha512-l+J0WwDl4nM/zMJ/C8qleYnXMUJKsLng7c5uWH/miAiHoTvPDtEoLW1tmVO6Cy2O8i/1VfA+2YOwg/Q3+kgO6w==",
+      "engines": {
+        "node": ">= 0.6.0"
+      },
+      "peerDependencies": {
+        "jquery": "^1.11 || ^2.1.0"
       }
     },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0="
+    "node_modules/jquery": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
+      "integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI="
     },
-    "is-core-module": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
-      "integrity": "sha512-vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw==",
-      "requires": {
-        "has": "^1.0.3"
+    "node_modules/jquery-ui": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.0.tgz",
+      "integrity": "sha512-Osf7ECXNTYHtKBkn9xzbIf9kifNrBhfywFEKxOeB/OVctVmLlouV9mfc2qXCp6uyO4Pn72PXKOnj09qXetopCw==",
+      "dependencies": {
+        "jquery": ">=1.8.0 <4.0.0"
       }
     },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
-    },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
-    },
-    "node-releases": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz",
-      "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA=="
-    },
-    "path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
-    },
-    "picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
-    },
-    "resolve": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz",
-      "integrity": "sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==",
-      "requires": {
-        "is-core-module": "^2.2.0",
-        "path-parse": "^1.0.6"
+    "node_modules/skatejs": {
+      "version": "0.13.17",
+      "resolved": "https://registry.npmjs.org/skatejs/-/skatejs-0.13.17.tgz",
+      "integrity": "sha1-eiH7s0NNpF5StHthZHFo7p53gHE=",
+      "engines": {
+        "node": ">=0.12.x",
+        "npm": "2.x.x"
       }
     },
-    "semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
+    "node_modules/skatejs-template-html": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/skatejs-template-html/-/skatejs-template-html-0.0.0.tgz",
+      "integrity": "sha1-6ZDBp9S1i3MF/8wzOJOb9AICPfc="
     },
-    "source-map": {
-      "version": "0.5.7",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-      "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+    "node_modules/trim-extra-html-whitespace": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/trim-extra-html-whitespace/-/trim-extra-html-whitespace-1.3.0.tgz",
+      "integrity": "sha1-tH77DRpfKlaoXMRc6lJWUek0BM8="
     },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "to-fast-properties": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
-      "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4="
+    "node_modules/underscore": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
+      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
+    }
+  },
+  "dependencies": {
+    "@atlassian/aui": {
+      "version": "9.4.3",
+      "resolved": "https://registry.npmjs.org/@atlassian/aui/-/aui-9.4.3.tgz",
+      "integrity": "sha512-m7tEMhZun/gMPM+uMpOzWFH2/QAZ8WnBzNRLRMtswMFHtzVT1A/YZIAr2242kAUv3uWIqC1I2siUGpweaPiGSQ==",
+      "requires": {
+        "@atlassian/tipsy": "1.3.3",
+        "@popperjs/core": "2.4.4",
+        "backbone": "1.4.0",
+        "css.escape": "1.5.0",
+        "fancy-file-input": "2.0.4",
+        "jquery-ui": "1.13.0",
+        "skatejs": "0.13.17",
+        "skatejs-template-html": "0.0.0",
+        "trim-extra-html-whitespace": "1.3.0",
+        "underscore": "1.13.1"
+      }
+    },
+    "@atlassian/tipsy": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@atlassian/tipsy/-/tipsy-1.3.3.tgz",
+      "integrity": "sha512-6jd9wdoiPdCbwsNi1Xrn/oMdGz22dKPeCoZ/cCGKqjnh+UYkBKb5W3spW+WNqRSxGvVtfUEEg6TXotRK/FPDaw=="
+    },
+    "@popperjs/core": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.4.4.tgz",
+      "integrity": "sha512-1oO6+dN5kdIA3sKPZhRGJTfGVP4SWV6KqlMOwry4J3HfyD68sl/3KmG7DeYUzvN+RbhXDnv/D8vNNB8168tAMg=="
+    },
+    "backbone": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/backbone/-/backbone-1.4.0.tgz",
+      "integrity": "sha512-RLmDrRXkVdouTg38jcgHhyQ/2zjg7a8E6sz2zxfz21Hh17xDJYUHBZimVIt5fUyS8vbfpeSmTL3gUjTEvUV3qQ==",
+      "requires": {
+        "underscore": ">=1.8.3"
+      }
+    },
+    "css.escape": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.0.tgz",
+      "integrity": "sha1-lZhNeIfOTKkGhOgTlm9C0e+H7Oo="
+    },
+    "fancy-file-input": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/fancy-file-input/-/fancy-file-input-2.0.4.tgz",
+      "integrity": "sha512-l+J0WwDl4nM/zMJ/C8qleYnXMUJKsLng7c5uWH/miAiHoTvPDtEoLW1tmVO6Cy2O8i/1VfA+2YOwg/Q3+kgO6w==",
+      "requires": {}
+    },
+    "jquery": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
+      "integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI="
+    },
+    "jquery-ui": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.0.tgz",
+      "integrity": "sha512-Osf7ECXNTYHtKBkn9xzbIf9kifNrBhfywFEKxOeB/OVctVmLlouV9mfc2qXCp6uyO4Pn72PXKOnj09qXetopCw==",
+      "requires": {
+        "jquery": ">=1.8.0 <4.0.0"
+      }
+    },
+    "skatejs": {
+      "version": "0.13.17",
+      "resolved": "https://registry.npmjs.org/skatejs/-/skatejs-0.13.17.tgz",
+      "integrity": "sha1-eiH7s0NNpF5StHthZHFo7p53gHE="
+    },
+    "skatejs-template-html": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/skatejs-template-html/-/skatejs-template-html-0.0.0.tgz",
+      "integrity": "sha1-6ZDBp9S1i3MF/8wzOJOb9AICPfc="
+    },
+    "trim-extra-html-whitespace": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/trim-extra-html-whitespace/-/trim-extra-html-whitespace-1.3.0.tgz",
+      "integrity": "sha1-tH77DRpfKlaoXMRc6lJWUek0BM8="
+    },
+    "underscore": {
+      "version": "1.13.1",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz",
+      "integrity": "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g=="
     }
   }
 }
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..cb22844
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@atlassian/aui": "^9.4.3"
+  }
+}

From 9619d0b4f4b24856cb0d1b9ecbea3097b9b82bc2 Mon Sep 17 00:00:00 2001
From: Roman K <romankupkovic1@gmail.com>
Date: Mon, 24 Jan 2022 15:25:58 +0100
Subject: [PATCH 2/9] added function buildQuery() for connecting the dropdown
 queries into one final query

---
 backend/src/main/resources/main_page.vm | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/resources/main_page.vm b/backend/src/main/resources/main_page.vm
index 83298cc..79b06f6 100644
--- a/backend/src/main/resources/main_page.vm
+++ b/backend/src/main/resources/main_page.vm
@@ -288,6 +288,7 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
 
 
 
+
                             <aui-dropdown-menu id="type-dropdown">
                                 <aui-section label="Type">
                                     #foreach( $type in $issueType )
@@ -303,6 +304,24 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                             ## let request_currentProject = new Request(protocol.concat('//', window.location.host, '/jira/rest/api/2/search?jql=', jqlquery));
                             ## http://localhost:2990/jira/rest/api/2/project/TES/statuses
 
+                            ## Function for building the connected final query out of all dropdowns
+                            <script>
+                                function buildQuery(){
+                                    let tempQuery = [];
+                                    let resultQuery = "";
+                                    tempQuery.push(typeQuery);
+                                    tempQuery.push(statusQuery);
+                                    tempQuery.push(assigneeQuery);
+                                    tempQuery.forEach(element => {
+                                        if (element.length >= 2){
+                                            resultQuery += element + " AND "
+                                        }
+                                    })
+                                    resultQuery = resultQuery.slice(0, -5);
+                                    return resultQuery;
+                                }
+                            </script>
+
                             ## Dropdown type dynamic query update (checkbox)
                             <script>
                                 var typeQuery = " ";
@@ -348,7 +367,7 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                                     console.log(typeQuery);
 
                                     ## Input Query into search issues textfield
-                                    document.getElementById('search-issues-textfield').value = typeQuery;
+                                    document.getElementById('search-issues-textfield').value = buildQuery();
 
                                 });
                             </script>
@@ -417,7 +436,7 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                                 console.log(statusQuery);
 
                                 ## Input Query into search issues textfield
-                                document.getElementById('search-issues-textfield').value = statusQuery;
+                                document.getElementById('search-issues-textfield').value = buildQuery();
 
                                 });
                             </script>
@@ -485,7 +504,7 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                                     console.log(assigneeQuery);
 
                                     ## Input Query into search issues textfield
-                                    document.getElementById('search-issues-textfield').value = assigneeQuery;
+                                    document.getElementById('search-issues-textfield').value = buildQuery();
                                 });
                             </script>
 

From 73d798f25534e710e1cae39452ca3cb1ab6c4374 Mon Sep 17 00:00:00 2001
From: Roman K <romankupkovic1@gmail.com>
Date: Mon, 24 Jan 2022 15:37:55 +0100
Subject: [PATCH 3/9] fixed dead search button on advanced jql search; search
 button for dropdown and advanced jql search is same element now.

---
 backend/src/main/resources/main_page.vm | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/resources/main_page.vm b/backend/src/main/resources/main_page.vm
index 79b06f6..c124aff 100644
--- a/backend/src/main/resources/main_page.vm
+++ b/backend/src/main/resources/main_page.vm
@@ -175,20 +175,20 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                                                 More
                                                 <span class="aui-icon aui-icon-small aui-iconfont-add"></span>
                                             </button>
-                                            ## search button
-                                            <button style="float: left;"
-                                                    class="aui-button aui-button-primary search-button"
-                                                    type="button" original-title="Search for issues" resolved id="jql-search-button">Search
-                                            </button>
                                         </div>
                                     </div>
 
+
                                     ## second filter bar advanced search
                                     <div class="aui-item" id="jql-search" style="display: none">
                                         <form style="float: left" class="aui">
                                             <input style="min-width: 50rem" id="search-issues-textfield"
                                                    placeholder="Type JQL Query.." type="text" class="text">
                                         </form>
+
+                                    </div>
+
+                                    <div style="display: inline-block">
                                         ## search button
                                         <button style="float: left;"
                                                 class="aui-button aui-button-primary search-button"
@@ -196,6 +196,7 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                                                 id="jql-search-button">Search
                                         </button>
                                     </div>
+
                                     <div style="display: inline-block; float: right">
                                         <aui-label for="JQL-switch">Use JQL</aui-label>
                                         <aui-toggle id="JQL-switch" label="use JQL"></aui-toggle>

From f0aa6db4c99c0382e4a8137c53089105bdadca1a Mon Sep 17 00:00:00 2001
From: Roman K <romankupkovic1@gmail.com>
Date: Tue, 25 Jan 2022 19:52:05 +0100
Subject: [PATCH 4/9] add assignee dropdown shows all assignable users from the
 current project, will be refined when dropdown search is ready, so not too
 many users are displayed in options

---
 backend/src/main/resources/main_page.vm | 94 +++++++++++++++++++++----
 1 file changed, 79 insertions(+), 15 deletions(-)

diff --git a/backend/src/main/resources/main_page.vm b/backend/src/main/resources/main_page.vm
index c124aff..5982df8 100644
--- a/backend/src/main/resources/main_page.vm
+++ b/backend/src/main/resources/main_page.vm
@@ -307,6 +307,7 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
 
                             ## Function for building the connected final query out of all dropdowns
                             <script>
+
                                 function buildQuery(){
                                     let tempQuery = [];
                                     let resultQuery = "";
@@ -321,6 +322,40 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                                     resultQuery = resultQuery.slice(0, -5);
                                     return resultQuery;
                                 }
+
+                                ## Promise that does the GET Request for Assignable Users and puts their names into Array 'assignableUsers'
+                                function getAssignableUsersPromise(){
+                                    return new Promise(async (resolve, reject) => {
+                                        let options = {
+                                            method: 'GET',
+                                            headers: {
+                                                'Content-Type': 'application/json;charset=utf-8'
+                                            },
+                                            credentials: 'include'
+                                        }
+
+                                        let assignableUsers = []; ## Array for GET request results
+
+                                        ## Do GET reuqest for data and put data into Array 'assignableUsers'
+                                        let user_request = new Request(window.location.protocol.concat('//', window.location.host, '/jira/rest/api/2/user/assignable/search?project=', '$currentProject.getKey()'));
+
+                                        let response = await fetch(user_request, options)
+                                        let data = await response.json();
+
+                                        data.forEach((obj, index) => {
+                                            ## add next name to array
+                                            assignableUsers.push(obj.name);
+                                        });
+                                        if (assignableUsers.length > 0) {
+                                            resolve(assignableUsers);
+                                        } else {
+                                            reject(error);
+                                        }
+
+                                    });
+
+                                }
+
                             </script>
 
                             ## Dropdown type dynamic query update (checkbox)
@@ -445,24 +480,53 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
 
                             ## dropdown popup activated when clicking assignee
                             <aui-dropdown-menu id="assignee-dropdown">
-                                <aui-section label="Search">
-                                    ##<input autocomplete="off" role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-expanded="true" placeholder="Find Assignee.." class="text" id="assignee-input" aria-controls="assignee-suggestions" aria-activedescendant="group:jira-administrators-2">
-                                    <form style="float: left" class="aui">
-                                        <input id="search-issues" placeholder="Find Assignee.."
-                                               aria-autocomplete="list"
-                                               aria-haspopup="true" aria-expanded="true" type="text"
-                                               class="text">
-                                    </form>
-                                </aui-section>
-                                <aui-section label="Assignees">
-                                    <aui-item-checkbox interactive>Current User</aui-item-checkbox>
-                                    <aui-item-checkbox interactive>Unassigned</aui-item-checkbox>
+                                <aui-section id="assignee-section" label="Issue Assignee">
+                                    <aui-item-checkbox id="assignableUsers" interactive></aui-item-checkbox>
                                 </aui-section>
-                                ##<aui-section label="Suggested Users">
-                                ##    <aui-item-checkbox interactive checked>admin</aui-item-checkbox>
-                                ##</aui-section>
                             </aui-dropdown-menu>
 
+                            <script>
+                                ## function that waits for the AssignableUsers to get retrieved
+                                ## from Promise and GET Request and then fills in the Dropdown Options
+                                async function fillAssignableUsers() {
+
+                                    let assignableUsers = await getAssignableUsersPromise(); ## awaits Promise from GET Request Function
+
+                                    let replacements = {
+                                        id: 0
+                                    };
+
+                                    ##fill in Dropdown Option for every user in AssignableUsers
+                                    assignableUsers.forEach(user => {
+                                        let stringWithPlaceholders = '<aui-item-checkbox id="assignee{id}" interactive></aui-item-checkbox>';
+
+                                        let string = stringWithPlaceholders.replace(
+                                                /{(\w+)}/g,
+                                                (placeholderWithDelimiters, placeholderWithoutDelimiters) =>
+                                                        replacements.hasOwnProperty(placeholderWithoutDelimiters) ?
+                                                                replacements[placeholderWithoutDelimiters] : placeholderWithDelimiters
+                                        );
+                                        document.getElementById('assignee-section').innerHTML = string;
+                                        stringWithPlaceholders = 'assignee{id}';
+                                        replacements = {
+                                            id: 0
+                                        };
+                                        string = stringWithPlaceholders.replace(
+                                                /{(\w+)}/g,
+                                                (placeholderWithDelimiters, placeholderWithoutDelimiters) =>
+                                                        replacements.hasOwnProperty(placeholderWithoutDelimiters) ?
+                                                                replacements[placeholderWithoutDelimiters] : placeholderWithDelimiters
+                                        );
+                                        document.getElementById(string).innerHTML = user;
+                                        replacements.id++;
+                                    });
+
+                                };
+                                ## execute function
+                                fillAssignableUsers();
+
+                            </script>
+
                             ## Dropdown assignee dynamic query update (checkbox)
                             <script>
                                 var assigneeQuery = " ";

From bb670193140c72baba1e6d91bef2beda7f2abaf9 Mon Sep 17 00:00:00 2001
From: Roman K <romankupkovic1@gmail.com>
Date: Tue, 25 Jan 2022 23:41:40 +0100
Subject: [PATCH 5/9] fixed little error so assignee dropdown elements are
 added instead of replaced

---
 backend/src/main/resources/main_page.vm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/resources/main_page.vm b/backend/src/main/resources/main_page.vm
index 5982df8..08829da 100644
--- a/backend/src/main/resources/main_page.vm
+++ b/backend/src/main/resources/main_page.vm
@@ -481,7 +481,7 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                             ## dropdown popup activated when clicking assignee
                             <aui-dropdown-menu id="assignee-dropdown">
                                 <aui-section id="assignee-section" label="Issue Assignee">
-                                    <aui-item-checkbox id="assignableUsers" interactive></aui-item-checkbox>
+
                                 </aui-section>
                             </aui-dropdown-menu>
 
@@ -506,7 +506,7 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                                                         replacements.hasOwnProperty(placeholderWithoutDelimiters) ?
                                                                 replacements[placeholderWithoutDelimiters] : placeholderWithDelimiters
                                         );
-                                        document.getElementById('assignee-section').innerHTML = string;
+                                        document.getElementById('assignee-section').innerHTML += string;
                                         stringWithPlaceholders = 'assignee{id}';
                                         replacements = {
                                             id: 0

From 73b068c0e85d575ff126c24447440ad0d321110e Mon Sep 17 00:00:00 2001
From: Roman K <romankupkovic1@gmail.com>
Date: Wed, 26 Jan 2022 13:23:59 +0100
Subject: [PATCH 6/9] assignee dropdown: add 'unassigned' option to filter for
 unassigned issues

---
 backend/src/main/resources/main_page.vm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/resources/main_page.vm b/backend/src/main/resources/main_page.vm
index 08829da..6cac7a0 100644
--- a/backend/src/main/resources/main_page.vm
+++ b/backend/src/main/resources/main_page.vm
@@ -481,7 +481,7 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                             ## dropdown popup activated when clicking assignee
                             <aui-dropdown-menu id="assignee-dropdown">
                                 <aui-section id="assignee-section" label="Issue Assignee">
-
+                                    <aui-item-checkbox id="unassigned-option" interactive>unassigned</aui-item-checkbox>
                                 </aui-section>
                             </aui-dropdown-menu>
 
@@ -559,7 +559,11 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                                     ## Query depending on available status options, change if necessary
                                     assigneeQuery = " ";
                                     assigneeParams.forEach((element) => {
-                                        assigneeQuery += 'assignee = "' + element + '" OR ';
+                                        if(element === "unassigned"){
+                                            assigneeQuery += 'assignee is Empty' + ' OR ';
+                                        } else {
+                                            assigneeQuery += 'assignee = "' + element + '" OR ';
+                                        }
                                     });
                                     assigneeQuery = assigneeQuery.slice(0, -3);
                                     document.getElementById("btn-assignee-dropdown").innerHTML = "Assignee: " + assigneeParams;

From 6c1df9c69c612133c2bbad50f1295fbf281eb8bb Mon Sep 17 00:00:00 2001
From: Roman K <romankupkovic1@gmail.com>
Date: Wed, 26 Jan 2022 14:36:18 +0100
Subject: [PATCH 7/9] type and status dropdown options: added icons, improved
 jql query so bug from logical priorities with AND and OR doesnt happen

---
 backend/src/main/resources/main_page.vm | 54 ++++++++++++++++---------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/backend/src/main/resources/main_page.vm b/backend/src/main/resources/main_page.vm
index 6cac7a0..3072d00 100644
--- a/backend/src/main/resources/main_page.vm
+++ b/backend/src/main/resources/main_page.vm
@@ -287,24 +287,14 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
 
                             ## dropdown popup activated when clicking type
 
-
-
-
                             <aui-dropdown-menu id="type-dropdown">
                                 <aui-section label="Type">
                                     #foreach( $type in $issueType )
-                                        <aui-item-checkbox interactive>$type.name</aui-item-checkbox>
+                                        <aui-item-checkbox interactive><img src="$type.completeIconUrl"/><span>$type.name</span></aui-item-checkbox>
                                     #end
                                 </aui-section>
                             </aui-dropdown-menu>
 
-                            ## /rest/api/2/project/{currentProject}/statuses
-                            ## getCurrentProject(com.atlassian.jira.security.Permissions.PROJECT_ADMIN, currentUser())
-                            ## com.atlassian.jira.security.Permissions.PROJECT_ADMIN
-
-                            ## let request_currentProject = new Request(protocol.concat('//', window.location.host, '/jira/rest/api/2/search?jql=', jqlquery));
-                            ## http://localhost:2990/jira/rest/api/2/project/TES/statuses
-
                             ## Function for building the connected final query out of all dropdowns
                             <script>
 
@@ -392,16 +382,28 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                                     ## Prepare updated query
                                     ## Query depending on available status options, change if necessary
                                     typeQuery = " ";
-                                    typeParams.forEach((element) => {
-                                        typeQuery += 'type = "' + element + '" OR ' ;
-                                    });
-                                    typeQuery = typeQuery.slice(0, -3);
+                                    ##typeParams.forEach((element) => {
+                                    ##  typeQuery += 'type = "' + element + '" OR ' ;
+                                    ##});
+
+                                    ##typeQuery = typeQuery.slice(0, -3);
                                     document.getElementById("btn-type-dropdown").innerHTML = "Type: " + typeParams;
                                     if (typeParams.length == 0) {
                                         document.getElementById("btn-type-dropdown").innerHTML = "Type"; ##deletes ":"
                                     }
                                     console.log(typeQuery);
 
+                                    ## create improved query
+                                    let resultStringType = "";
+                                    typeParams.forEach(element => {
+                                        resultStringType += "'"+element+"',";
+                                    });
+                                    resultStringType = resultStringType.slice(0, -1);
+
+                                    if(typeParams.length>0) {
+                                        typeQuery = "type IN (" + resultStringType + ")";
+                                    }
+
                                     ## Input Query into search issues textfield
                                     document.getElementById('search-issues-textfield').value = buildQuery();
 
@@ -413,7 +415,7 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                             <aui-dropdown-menu id="status-dropdown">
                                 <aui-section label="Request Status">
                                 #foreach( $status in $statuses )
-                                    <aui-item-checkbox interactive>$status.name</aui-item-checkbox>
+                                    <aui-item-checkbox interactive><img src="$status.completeIconUrl"/><span>$status.name</span></aui-item-checkbox>
                                 #end
                                 </aui-section>
                             </aui-dropdown-menu>
@@ -461,16 +463,28 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                                 ## Prepare updated query
                                 ## Query depending on available status options, change if necessary
                                 statusQuery = " ";
-                                statusParams.forEach((element) => {
-                                    statusQuery += 'status = "' + element + '" OR ' ;
-                                });
-                                statusQuery = statusQuery.slice(0, -3);
+                                ##statusParams.forEach((element) => {
+                                ##    statusQuery += 'status = "' + element + '" OR ' ;
+                                ##});
+                                ##statusQuery = statusQuery.slice(0, -3);
                                 document.getElementById("btn-status-dropdown").innerHTML = "Status: " + statusParams;
                                 if (statusParams.length == 0) {
                                     document.getElementById("btn-status-dropdown").innerHTML = "Status"; ##deletes ":"
                                 }
                                 console.log(statusQuery);
 
+                                ## create improved query
+                                let resultStringStatus = "";
+
+                                statusParams.forEach(element => {
+                                    resultStringStatus += "'"+element+"',";
+                                });
+                                resultStringStatus = resultStringStatus.slice(0, -1);
+
+                                if(statusParams.length>0) {
+                                    statusQuery = "status IN (" + resultStringStatus + ")";
+                                }
+
                                 ## Input Query into search issues textfield
                                 document.getElementById('search-issues-textfield').value = buildQuery();
 

From f19254fe149c136fd75a00a41a10345dd6c7b79d Mon Sep 17 00:00:00 2001
From: Roman K <romankupkovic1@gmail.com>
Date: Wed, 26 Jan 2022 15:00:33 +0100
Subject: [PATCH 8/9] add aui-icon class and spacer to better align icons with
 dropdown option names

---
 backend/src/main/resources/main_page.vm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/resources/main_page.vm b/backend/src/main/resources/main_page.vm
index 3072d00..57e33d1 100644
--- a/backend/src/main/resources/main_page.vm
+++ b/backend/src/main/resources/main_page.vm
@@ -290,7 +290,12 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                             <aui-dropdown-menu id="type-dropdown">
                                 <aui-section label="Type">
                                     #foreach( $type in $issueType )
-                                        <aui-item-checkbox interactive><img src="$type.completeIconUrl"/><span>$type.name</span></aui-item-checkbox>
+                                        <aui-item-checkbox interactive>
+                                            <span class="aui-icon aui-icon-small\">
+                                                <img src="$type.completeIconUrl" alt=\"Icon\" />
+                                            </span>&ensp;
+                                            <span>$type.name</span>
+                                        </aui-item-checkbox>
                                     #end
                                 </aui-section>
                             </aui-dropdown-menu>
@@ -415,7 +420,12 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                             <aui-dropdown-menu id="status-dropdown">
                                 <aui-section label="Request Status">
                                 #foreach( $status in $statuses )
-                                    <aui-item-checkbox interactive><img src="$status.completeIconUrl"/><span>$status.name</span></aui-item-checkbox>
+                                    <aui-item-checkbox interactive>
+                                        <span class="aui-icon aui-icon-small\">
+                                            <img src="$status.completeIconUrl" alt=\"Icon\" />
+                                        </span>&ensp;
+                                        <span>$status.name</span>
+                                    </aui-item-checkbox>
                                 #end
                                 </aui-section>
                             </aui-dropdown-menu>

From 2da3bc4d2a14f3121fddde7cae5deacb72aace3a Mon Sep 17 00:00:00 2001
From: Roman K <romankupkovic1@gmail.com>
Date: Wed, 26 Jan 2022 15:08:28 +0100
Subject: [PATCH 9/9] delete prior commit, changes safed for new issue where
 bugs need to be addressed

---
 backend/src/main/resources/main_page.vm | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/backend/src/main/resources/main_page.vm b/backend/src/main/resources/main_page.vm
index 57e33d1..3072d00 100644
--- a/backend/src/main/resources/main_page.vm
+++ b/backend/src/main/resources/main_page.vm
@@ -290,12 +290,7 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                             <aui-dropdown-menu id="type-dropdown">
                                 <aui-section label="Type">
                                     #foreach( $type in $issueType )
-                                        <aui-item-checkbox interactive>
-                                            <span class="aui-icon aui-icon-small\">
-                                                <img src="$type.completeIconUrl" alt=\"Icon\" />
-                                            </span>&ensp;
-                                            <span>$type.name</span>
-                                        </aui-item-checkbox>
+                                        <aui-item-checkbox interactive><img src="$type.completeIconUrl"/><span>$type.name</span></aui-item-checkbox>
                                     #end
                                 </aui-section>
                             </aui-dropdown-menu>
@@ -420,12 +415,7 @@ $webResourceManager.requireResource("de.tuberlin.amos.gr2.backend:entrypoint-dyn
                             <aui-dropdown-menu id="status-dropdown">
                                 <aui-section label="Request Status">
                                 #foreach( $status in $statuses )
-                                    <aui-item-checkbox interactive>
-                                        <span class="aui-icon aui-icon-small\">
-                                            <img src="$status.completeIconUrl" alt=\"Icon\" />
-                                        </span>&ensp;
-                                        <span>$status.name</span>
-                                    </aui-item-checkbox>
+                                    <aui-item-checkbox interactive><img src="$status.completeIconUrl"/><span>$status.name</span></aui-item-checkbox>
                                 #end
                                 </aui-section>
                             </aui-dropdown-menu>