From 85a3793722d0a2e1afe4ce5e3f60240f93e89ba2 Mon Sep 17 00:00:00 2001
From: Angelika Schneider <angelika.schneider@aisec.fraunhofer.de>
Date: Wed, 5 Apr 2023 14:02:43 +0200
Subject: [PATCH 01/13] Revert sveltejs/kit update

---
 package-lock.json | 50 +++++++++++++++++++++++------------------------
 package.json      |  2 +-
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2192267..7c3994a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
       "license": "Apache-2.0",
       "dependencies": {
         "@sveltejs/adapter-node": "^1.0.0",
-        "@sveltejs/kit": "^1.15.1",
+        "@sveltejs/kit": "^1.7.1",
         "svelte": "^3.56.0"
       },
       "devDependencies": {
@@ -702,24 +702,24 @@
       }
     },
     "node_modules/@sveltejs/kit": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.15.1.tgz",
-      "integrity": "sha512-Wexy3N+COoClTuRawVJRbLoH5HFxNrXG3uoHt/Yd5IGx8WAcJM9Nj/CcBLw/tjCR9uDDYMnx27HxuPy3YIYQUA==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.7.1.tgz",
+      "integrity": "sha512-epaQCaZ/D3Qr/SgrRKHv+MpM6rz8JdaXSjOjas8t7PbDJl88KpqYWUvsmyuJQn/yNNGar23kENyy4NueNnjIKQ==",
       "hasInstallScript": true,
       "dependencies": {
         "@sveltejs/vite-plugin-svelte": "^2.0.0",
         "@types/cookie": "^0.5.1",
         "cookie": "^0.5.0",
-        "devalue": "^4.3.0",
+        "devalue": "^4.2.3",
         "esm-env": "^1.0.0",
         "kleur": "^4.1.5",
-        "magic-string": "^0.30.0",
+        "magic-string": "^0.29.0",
         "mime": "^3.0.0",
         "sade": "^1.8.1",
         "set-cookie-parser": "^2.5.1",
         "sirv": "^2.0.2",
         "tiny-glob": "^0.2.9",
-        "undici": "5.20.0"
+        "undici": "5.19.1"
       },
       "bin": {
         "svelte-kit": "svelte-kit.js"
@@ -764,9 +764,9 @@
       }
     },
     "node_modules/@sveltejs/kit/node_modules/magic-string": {
-      "version": "0.30.0",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
-      "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
+      "version": "0.29.0",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.29.0.tgz",
+      "integrity": "sha512-WcfidHrDjMY+eLjlU+8OvwREqHwpgCeKVBUpQ3OhYYuvfaYCUgcbuBzappNzZvg/v8onU3oQj+BYpkOJe9Iw4Q==",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.4.13"
       },
@@ -3122,9 +3122,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "5.20.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.20.0.tgz",
-      "integrity": "sha512-J3j60dYzuo6Eevbawwp1sdg16k5Tf768bxYK4TUJRH7cBM4kFCbf3mOnM/0E3vQYXvpxITbbWmBafaDbxLDz3g==",
+      "version": "5.19.1",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.19.1.tgz",
+      "integrity": "sha512-YiZ61LPIgY73E7syxCDxxa3LV2yl3sN8spnIuTct60boiiRaE1J8mNWHO8Im2Zi/sFrPusjLlmRPrsyraSqX6A==",
       "dependencies": {
         "busboy": "^1.6.0"
       },
@@ -3597,23 +3597,23 @@
       }
     },
     "@sveltejs/kit": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.15.1.tgz",
-      "integrity": "sha512-Wexy3N+COoClTuRawVJRbLoH5HFxNrXG3uoHt/Yd5IGx8WAcJM9Nj/CcBLw/tjCR9uDDYMnx27HxuPy3YIYQUA==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-1.7.1.tgz",
+      "integrity": "sha512-epaQCaZ/D3Qr/SgrRKHv+MpM6rz8JdaXSjOjas8t7PbDJl88KpqYWUvsmyuJQn/yNNGar23kENyy4NueNnjIKQ==",
       "requires": {
         "@sveltejs/vite-plugin-svelte": "^2.0.0",
         "@types/cookie": "^0.5.1",
         "cookie": "^0.5.0",
-        "devalue": "^4.3.0",
+        "devalue": "^4.2.3",
         "esm-env": "^1.0.0",
         "kleur": "^4.1.5",
-        "magic-string": "^0.30.0",
+        "magic-string": "^0.29.0",
         "mime": "^3.0.0",
         "sade": "^1.8.1",
         "set-cookie-parser": "^2.5.1",
         "sirv": "^2.0.2",
         "tiny-glob": "^0.2.9",
-        "undici": "5.20.0"
+        "undici": "5.19.1"
       },
       "dependencies": {
         "@sveltejs/vite-plugin-svelte": {
@@ -3640,9 +3640,9 @@
           }
         },
         "magic-string": {
-          "version": "0.30.0",
-          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz",
-          "integrity": "sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==",
+          "version": "0.29.0",
+          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.29.0.tgz",
+          "integrity": "sha512-WcfidHrDjMY+eLjlU+8OvwREqHwpgCeKVBUpQ3OhYYuvfaYCUgcbuBzappNzZvg/v8onU3oQj+BYpkOJe9Iw4Q==",
           "requires": {
             "@jridgewell/sourcemap-codec": "^1.4.13"
           }
@@ -5103,9 +5103,9 @@
       "dev": true
     },
     "undici": {
-      "version": "5.20.0",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.20.0.tgz",
-      "integrity": "sha512-J3j60dYzuo6Eevbawwp1sdg16k5Tf768bxYK4TUJRH7cBM4kFCbf3mOnM/0E3vQYXvpxITbbWmBafaDbxLDz3g==",
+      "version": "5.19.1",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.19.1.tgz",
+      "integrity": "sha512-YiZ61LPIgY73E7syxCDxxa3LV2yl3sN8spnIuTct60boiiRaE1J8mNWHO8Im2Zi/sFrPusjLlmRPrsyraSqX6A==",
       "requires": {
         "busboy": "^1.6.0"
       }
diff --git a/package.json b/package.json
index 92fb64d..0778fcf 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@sveltejs/adapter-node": "^1.0.0",
-    "@sveltejs/kit": "^1.15.1",
+    "@sveltejs/kit": "^1.7.1",
     "svelte": "^3.56.0"
   },
   "devDependencies": {

From 8fa3188ce78c2c3e2a18d5e3c9bc1be553dce2ca Mon Sep 17 00:00:00 2001
From: "Kunz, Immanuel" <immanuel.kunz@aisec.fraunhofer.de>
Date: Tue, 6 Jun 2023 15:06:37 +0200
Subject: [PATCH 02/13] add icons

---
 src/lib/Navigation.svelte                     | 31 ++++++++++++++-----
 .../cloud/[...id]/assessment/+page.svelte     |  5 +--
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/lib/Navigation.svelte b/src/lib/Navigation.svelte
index f7f7e7a..933d67d 100644
--- a/src/lib/Navigation.svelte
+++ b/src/lib/Navigation.svelte
@@ -3,15 +3,12 @@ import {
 	Collapse,
 	Navbar,
 	NavbarToggler,
-	NavbarBrand,
 	Nav,
 	NavItem,
 	NavLink,
-	Dropdown,
-	DropdownToggle,
-	DropdownMenu,
-	DropdownItem
 } from 'sveltestrap';
+import Fa from 'svelte-fa'
+import { faCloud, faRuler, faFile, faCertificate } from '@fortawesome/free-solid-svg-icons'
 import { SvelteToast } from '@zerodevx/svelte-toast';
 import { base } from '$app/paths';
 import { page } from '$app/stores';
@@ -60,13 +57,33 @@ console.log($page.url);
 	<NavbarToggler on:click={() => (isOpen = !isOpen)} />
 	<Collapse {isOpen} navbar expand="md" on:update={handleUpdate}>
 		<Nav class="ms-auto" navbar>
-			{#each routes as route}
+			<!-- {#each routes as route}
 				<NavItem>
 					<NavLink active={$page.url.pathname.startsWith(route.url)} href="{base}{route.url}">
 						{route.name}
 					</NavLink>
 				</NavItem>
-			{/each}
+			{/each} -->
+			<NavItem>
+				<NavLink active={$page.url.pathname.startsWith("/cloud")} href="{base}{"/cloud"}">
+					<Fa icon={faCloud} /> Cloud Services
+				</NavLink>
+			</NavItem>
+			<NavItem>
+				<NavLink active={$page.url.pathname.startsWith("/metrics")} href="{base}{"/metrics"}">
+					<Fa icon={faRuler} /> Metrics
+				</NavLink>
+			</NavItem>
+			<NavItem>
+				<NavLink active={$page.url.pathname.startsWith("/catalogs")} href="{base}{"/catalogs"}">
+					<Fa icon={faFile} /> Catalogs
+				</NavLink>
+			</NavItem>
+			<NavItem>
+				<NavLink active={$page.url.pathname.startsWith("/certificates")} href="{base}{"/certificates"}">
+					<Fa icon={faCertificate} /> Certificates
+				</NavLink>
+			</NavItem>
 			<!--TODO: if logged in, don't show-->
 			{#if !loggedIn}
 			<NavItem>
diff --git a/src/routes/cloud/[...id]/assessment/+page.svelte b/src/routes/cloud/[...id]/assessment/+page.svelte
index 6a3bb24..6a80a63 100644
--- a/src/routes/cloud/[...id]/assessment/+page.svelte
+++ b/src/routes/cloud/[...id]/assessment/+page.svelte
@@ -32,10 +32,7 @@ let filterEndTimestamp: string | number | Date;
 $: filteredResults = results.filter((r) => {
 	let dateFilterStartTimestamp = new Date(filterStartTimestamp);
 	let dateFilterEndTimestamp = new Date(filterEndTimestamp);
-	console.log(filterStartTimestamp)
-	console.log(dateFilterStartTimestamp)
-	console.log(filterStartTimestamp)
-	console.log(dateFilterEndTimestamp)
+
 	return (
 		(filterCompliant != '' ? (r.compliant == (filterCompliant == 'true') ? true : false) : true) &&
 		(filterMetricCategory != ''

From 284be61b0c10a3965e5f5a2b1eab9641471075be Mon Sep 17 00:00:00 2001
From: "Kunz, Immanuel" <immanuel.kunz@aisec.fraunhofer.de>
Date: Tue, 6 Jun 2023 15:13:17 +0200
Subject: [PATCH 03/13] change button color, fix typo

---
 src/app.scss                            | 3 ++-
 src/lib/MetricConfigurationBlock.svelte | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app.scss b/src/app.scss
index 001b181..8ce0e5a 100644
--- a/src/app.scss
+++ b/src/app.scss
@@ -1,4 +1,5 @@
-$primary: #007FC3;
+// $primary: #007FC3;
+$primary: #0099a0;
 $min-contrast-ratio: 4;
 
 @import "bootstrap";
diff --git a/src/lib/MetricConfigurationBlock.svelte b/src/lib/MetricConfigurationBlock.svelte
index 32612e6..379bdc6 100644
--- a/src/lib/MetricConfigurationBlock.svelte
+++ b/src/lib/MetricConfigurationBlock.svelte
@@ -7,7 +7,7 @@
 </script>
 
 {#if config}
-	<Button color="primary" on:click={() => (isOpen = !isOpen)}>Show Cofiguration</Button>
+	<Button color="primary" on:click={() => (isOpen = !isOpen)}>Show Configuration</Button>
 	<Collapse {isOpen}>
 		<Card body class="mt-2">
 			<pre>Operator:     {config.operator}</pre>

From fccda9a9d2fe9da2adeddf0526453cbb4a840622 Mon Sep 17 00:00:00 2001
From: Angelika Schneider <angelika.schneider@aisec.fraunhofer.de>
Date: Wed, 14 Jun 2023 11:00:54 +0200
Subject: [PATCH 04/13] Update Catalog -> Catalogues

---
 src/routes/catalogs/+page.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/catalogs/+page.svelte b/src/routes/catalogs/+page.svelte
index 46042ba..864a76e 100644
--- a/src/routes/catalogs/+page.svelte
+++ b/src/routes/catalogs/+page.svelte
@@ -6,7 +6,7 @@ import type { PageData } from './$types';
 export let data: PageData;
 </script>
 
-<h3>Catalogs</h3>
+<h3>Catalogues</h3>
 {#if data.catalogs}
 	<Container class="mt-4 ms-0 me-0">
 		<Row cols={2} noGutters>

From f81ed4d392333543c9c3ab9608b1796331c34e3b Mon Sep 17 00:00:00 2001
From: Angelika Schneider <angelika.schneider@aisec.fraunhofer.de>
Date: Wed, 14 Jun 2023 11:17:26 +0200
Subject: [PATCH 05/13] Update Catalog -> Catalogues in top row

---
 src/lib/Navigation.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Navigation.svelte b/src/lib/Navigation.svelte
index f7f7e7a..fa783c9 100644
--- a/src/lib/Navigation.svelte
+++ b/src/lib/Navigation.svelte
@@ -41,7 +41,7 @@ let routes = [
 	},
 	{
 		url: '/catalogs',
-		name: 'Catalogs'
+		name: 'Catalogues'
 	},
 	{
 		url: '/certificates',

From 64a100e89d4a42e220f27bc289e610e186b8dca0 Mon Sep 17 00:00:00 2001
From: Angelika Schneider <angelika.schneider@aisec.fraunhofer.de>
Date: Wed, 14 Jun 2023 11:20:22 +0200
Subject: [PATCH 06/13] Switch Metrics and Assessment Tab in Cloud Service view

---
 src/routes/cloud/[...id]/+layout.svelte | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/routes/cloud/[...id]/+layout.svelte b/src/routes/cloud/[...id]/+layout.svelte
index 5c26053..530bd3b 100644
--- a/src/routes/cloud/[...id]/+layout.svelte
+++ b/src/routes/cloud/[...id]/+layout.svelte
@@ -39,13 +39,13 @@ $: metricActive = $page.route.id == '/cloud/[...id]/metrics';
 			>
 		</li>
 		<li class="nav-item">
-			<a class="nav-link" class:active={assessmentActive} href="/cloud/{data.service.id}/assessment"
-				><Fa icon={faCircleCheck} /> Assessment</a
+			<a class="nav-link" class:active={metricActive} href="/cloud/{data.service.id}/metrics"
+				><Fa icon={faCircleCheck} /> Metrics</a
 			>
 		</li>
 		<li class="nav-item">
-			<a class="nav-link" class:active={metricActive} href="/cloud/{data.service.id}/metrics"
-				><Fa icon={faCircleCheck} /> Metrics</a
+			<a class="nav-link" class:active={assessmentActive} href="/cloud/{data.service.id}/assessment"
+				><Fa icon={faCircleCheck} /> Assessment</a
 			>
 		</li>
 	</ul>

From a59a886bbfb827c133431b58eee2ce94b6d61d2c Mon Sep 17 00:00:00 2001
From: Angelika Schneider <angelika.schneider@aisec.fraunhofer.de>
Date: Wed, 14 Jun 2023 14:14:46 +0200
Subject: [PATCH 07/13] Add filter metric_category

---
 .../cloud/[...id]/assessment/+page.svelte     | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/routes/cloud/[...id]/assessment/+page.svelte b/src/routes/cloud/[...id]/assessment/+page.svelte
index 6a3bb24..4676367 100644
--- a/src/routes/cloud/[...id]/assessment/+page.svelte
+++ b/src/routes/cloud/[...id]/assessment/+page.svelte
@@ -12,7 +12,7 @@ import {
 	Row,
 	Table,
 } from 'sveltestrap';
-import { metrics } from '$lib/stores';
+import { metrics, controls } from '$lib/stores';
 import AssessmentResultRow from '$lib/components/AssessmentResultRow.svelte';
 
 export let data: import('./$types').PageData;
@@ -39,11 +39,11 @@ $: filteredResults = results.filter((r) => {
 	return (
 		(filterCompliant != '' ? (r.compliant == (filterCompliant == 'true') ? true : false) : true) &&
 		(filterMetricCategory != ''
-			? $metrics
-					.get(r.metricId)
-					?.category?.toLowerCase()
-					?.includes(filterMetricCategory?.toLowerCase())
-			: true) &&
+		? $metrics
+				.get(r.metricId)
+				?.category?.toLowerCase()
+				?.includes(filterMetricCategory?.toLowerCase())
+		: true) &&
 		(filterMetric != ''
 			? $metrics.get(r.metricId)?.name?.toLowerCase()?.includes(filterMetric?.toLowerCase())
 			: true) && 
@@ -58,6 +58,21 @@ $: filteredResults = results.filter((r) => {
 			: true)
 	);
 });
+
+// getListOfControlCategories returns a string list of all metric categories
+function getListOfControlCategories(): String[] {
+	let categoryList: string[] = [];
+
+	for (var val of $controls) {
+		if (categoryList.includes(val.categoryName) == false) {
+			categoryList.push(val.categoryName)
+		}
+	}
+
+	return categoryList
+}
+
+const categoryList = getListOfControlCategories()
 </script>
 
 <Card style="width: 800px" class="mt-2">
@@ -81,12 +96,12 @@ $: filteredResults = results.filter((r) => {
 					<Col>
 						<FormGroup>
 							<Label for="exampleEmail">Metric Category</Label>
-							<Input
-								type="text"
-								name="metric-category"
-								id="metricCateglory"
-								bind:value={filterMetricCategory}
-							/>
+							<Input type="select" name="select" id="metricCategory" bind:value={filterMetricCategory}>
+								<option />
+								{#each categoryList as value}
+									<option value={value}>{value}</option>
+								{/each}
+							</Input>
 						</FormGroup>
 					</Col>
 				</Row>

From 217bf577812d03970b5d62e2bfcec0877276b371 Mon Sep 17 00:00:00 2001
From: Angelika Schneider <angelika.schneider@aisec.fraunhofer.de>
Date: Wed, 14 Jun 2023 14:23:17 +0200
Subject: [PATCH 08/13] Add filter metric_ids

---
 .../cloud/[...id]/assessment/+page.svelte     | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/routes/cloud/[...id]/assessment/+page.svelte b/src/routes/cloud/[...id]/assessment/+page.svelte
index 4676367..45fda8e 100644
--- a/src/routes/cloud/[...id]/assessment/+page.svelte
+++ b/src/routes/cloud/[...id]/assessment/+page.svelte
@@ -72,7 +72,22 @@ function getListOfControlCategories(): String[] {
 	return categoryList
 }
 
+// getListOfMetrics returns a string list of all metric_ids
+function getListOfMetricIds(): String[] {
+	let metricsList: string[] = [];
+
+	for (var val of $metrics.values()) {
+		if (metricsList.includes(val.id) == false) {
+			metricsList.push(val.id)
+		}
+	}
+
+	return metricsList
+}
+
+
 const categoryList = getListOfControlCategories()
+const metricsList = getListOfMetricIds()
 </script>
 
 <Card style="width: 800px" class="mt-2">
@@ -96,7 +111,7 @@ const categoryList = getListOfControlCategories()
 					<Col>
 						<FormGroup>
 							<Label for="exampleEmail">Metric Category</Label>
-							<Input type="select" name="select" id="metricCategory" bind:value={filterMetricCategory}>
+							<Input type="select" name="metricCategory" id="metricCategory" bind:value={filterMetricCategory}>
 								<option />
 								{#each categoryList as value}
 									<option value={value}>{value}</option>
@@ -109,9 +124,20 @@ const categoryList = getListOfControlCategories()
 					<Col>
 						<FormGroup>
 							<Label for="exampleEmail">Metric</Label>
-							<Input type="text" name="metric" id="metric" bind:value={filterMetric} />
+							<Input type="select" name="metric" id="metric" bind:value={filterMetric}>
+								<option />
+								{#each metricsList as value}
+									<option value={value}>{value}</option>
+								{/each}
+							</Input>
 						</FormGroup>
 					</Col>
+					<!-- <Col>
+						<FormGroup>
+							<Label for="exampleEmail">Metric</Label>
+							<Input type="text" name="metric" id="metric" bind:value={filterMetric} />
+						</FormGroup>
+					</Col> -->
 					<Col>
 						<FormGroup>
 							<Label for="resourceType">Resource Type</Label>

From ab46a94602d8a1659b89b4a83fb0e9d8304b124e Mon Sep 17 00:00:00 2001
From: Angelika Schneider <angelika.schneider@aisec.fraunhofer.de>
Date: Wed, 14 Jun 2023 14:31:18 +0200
Subject: [PATCH 09/13] Add filter resource type drop-down

---
 .../cloud/[...id]/assessment/+page.svelte     | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/routes/cloud/[...id]/assessment/+page.svelte b/src/routes/cloud/[...id]/assessment/+page.svelte
index 45fda8e..20f2438 100644
--- a/src/routes/cloud/[...id]/assessment/+page.svelte
+++ b/src/routes/cloud/[...id]/assessment/+page.svelte
@@ -85,9 +85,27 @@ function getListOfMetricIds(): String[] {
 	return metricsList
 }
 
+// getListOfResources returns a string list of all resource names of the given assessment_results
+function getListOfResources(): String[] {
+	let resourceList: string[] = [];
+
+	for (var val of results) {
+		const types = val.resourceTypes
+		console.log("types: ", types)
+		for (var elem of types) {
+			console.log("type: ", elem)
+			if (resourceList.includes(elem) == false) {
+				resourceList.push(elem)
+			}
+		}
+	}
+
+	return resourceList
+}
 
 const categoryList = getListOfControlCategories()
 const metricsList = getListOfMetricIds()
+const resourceList = getListOfResources()
 </script>
 
 <Card style="width: 800px" class="mt-2">
@@ -132,16 +150,15 @@ const metricsList = getListOfMetricIds()
 							</Input>
 						</FormGroup>
 					</Col>
-					<!-- <Col>
-						<FormGroup>
-							<Label for="exampleEmail">Metric</Label>
-							<Input type="text" name="metric" id="metric" bind:value={filterMetric} />
-						</FormGroup>
-					</Col> -->
 					<Col>
 						<FormGroup>
-							<Label for="resourceType">Resource Type</Label>
-							<Input type="text" name="resourceType" id="resourceType" bind:value={filterResourceType} />
+							<Label for="exampleEmail">Resource Type</Label>
+							<Input type="select" name="resourceType" id="resourceType" bind:value={filterResourceType}>
+								<option />
+								{#each resourceList as value}
+									<option value={value}>{value}</option>
+								{/each}
+							</Input>
 						</FormGroup>
 					</Col>
 					<Col>

From 9f80a28ada7f79f92d2368a5a62b995c4900c7a9 Mon Sep 17 00:00:00 2001
From: Angelika Schneider <angelika.schneider@aisec.fraunhofer.de>
Date: Thu, 15 Jun 2023 10:47:58 +0200
Subject: [PATCH 10/13] Add metric_category to metrics view

---
 src/routes/cloud/[...id]/metrics/+page.svelte | 2 ++
 src/routes/metrics/+page.svelte               | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/routes/cloud/[...id]/metrics/+page.svelte b/src/routes/cloud/[...id]/metrics/+page.svelte
index f39799b..683a30f 100644
--- a/src/routes/cloud/[...id]/metrics/+page.svelte
+++ b/src/routes/cloud/[...id]/metrics/+page.svelte
@@ -18,6 +18,7 @@ The following metrics are configured for the Cloud Service.
 		<thead>
 			<tr>
 				<th>#</th>
+				<th>Category</th>
 				<th>Description</th>
 				<th>Implementation</th>
 				<th>Configuration</th>
@@ -27,6 +28,7 @@ The following metrics are configured for the Cloud Service.
 			{#each data.metrics as metric, i}
 				<tr>
 					<td>{metric.id}</td>
+					<td>{metric.category}</td>
 					<td>{metric.description}</td>
 					<td>
 						{#await getMetricImplementation(metric.id) then impl}
diff --git a/src/routes/metrics/+page.svelte b/src/routes/metrics/+page.svelte
index 60232bc..ecc43ef 100644
--- a/src/routes/metrics/+page.svelte
+++ b/src/routes/metrics/+page.svelte
@@ -16,6 +16,7 @@ The following metrics are configured in the Clouditor orchestrator.
 		<thead>
 			<tr>
 				<th>#</th>
+				<th>Category</th>
 				<th>Description</th>
 				<th>Implementation</th>
 			</tr>
@@ -24,6 +25,7 @@ The following metrics are configured in the Clouditor orchestrator.
 			{#each data.metrics as metric, i}
 				<tr>
 					<td>{metric.id}</td>
+					<td>{metric.category}</td>
 					<td>{metric.description}</td>
 					<td>
 						{#await getMetricImplementation(metric.id) then impl}

From f048f619cf5302eb476092ed30629aa56a00b0fa Mon Sep 17 00:00:00 2001
From: Angelika Schneider <angelika.schneider@aisec.fraunhofer.de>
Date: Thu, 15 Jun 2023 14:06:50 +0200
Subject: [PATCH 11/13] Show only sub_controls in controls_in_scope view

---
 .../[...id]/configuration/toe/+page.svelte    | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/routes/cloud/[...id]/configuration/toe/+page.svelte b/src/routes/cloud/[...id]/configuration/toe/+page.svelte
index cef3315..355f161 100644
--- a/src/routes/cloud/[...id]/configuration/toe/+page.svelte
+++ b/src/routes/cloud/[...id]/configuration/toe/+page.svelte
@@ -118,8 +118,28 @@ function getUsedCatalog(catalogID: string): Catalog {
 	return {} as any;
 }
 
+// Get only sub-controls from controls_in_scope
+// Note: That is not a really good approach and only can be used for the EUCS catalog, because we have no hierarchy in the controls_in_scope list.
+function getSubControls(): ControlInScope[][] {
+	const subControls: ControlInScope[][] = []
+	var i = 0
+
+	for (var scope of data.scopes) {
+		subControls[i] = []
+		for (var s of scope) {
+			if (s.controlId.includes(".")) {
+				subControls[i].push(s)
+			}
+		}
+		i++
+	}
+
+	return subControls
+}
+
 let open = false;
 const toggle = () => (open = !open);
+const subControls = getSubControls()
 </script>
 
 {#each data.targets as target, idx}
@@ -134,7 +154,7 @@ const toggle = () => (open = !open);
 			<Button color="primary" on:click={toggle}>Configure Controls in Scope</Button>
 			<Button color="danger" on:click={() => remove(target)}><Fa icon={faTrash} /></Button>
 			<ControlModal
-				scope={data.scopes[idx]}
+				scope={subControls[idx]}
 				{toggle}
 				{open}
 				{target}

From 75c17c46531138f57cb91c352a4ec145d0a9a09f Mon Sep 17 00:00:00 2001
From: Angelika Schneider <angelika.schneider@aisec.fraunhofer.de>
Date: Thu, 15 Jun 2023 14:39:21 +0200
Subject: [PATCH 12/13] Add cloud service tab descriptions

---
 src/routes/cloud/[...id]/+layout.svelte | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/routes/cloud/[...id]/+layout.svelte b/src/routes/cloud/[...id]/+layout.svelte
index 530bd3b..81e1bd0 100644
--- a/src/routes/cloud/[...id]/+layout.svelte
+++ b/src/routes/cloud/[...id]/+layout.svelte
@@ -21,29 +21,29 @@ $: metricActive = $page.route.id == '/cloud/[...id]/metrics';
 <div class="pt-3 pb-0 bg-light">
 	<ServiceTopBar service={data.service} />
 	<ul class="nav nav-tabs">
-		<li class="nav-item ps-2">
+		<li title= "Overview shows general information of the given Cloud Service." class="nav-item ps-2">
 			<a class="nav-link" class:active={overviewActive} href="/cloud/{data.service.id}"
 				><Fa icon={faTableColumns} /> Overview</a
 			>
 		</li>
-		<li class="nav-item">
+		<li title= "Configuration shows the name and description of the Cloud Service as well as the corresponding Target of Evaluation (ToE). The ToE can be configured for all available Catalogs." class="nav-item">
 			<a
 				class="nav-link"
 				class:active={configurationActive}
 				href="/cloud/{data.service.id}/configuration"><Fa icon={faGear} /> Configuration</a
 			>
 		</li>
-		<li class="nav-item">
+		<li title= "Discovery shows all discovered Cloud Resources for the given Cloud Service." class="nav-item">
 			<a class="nav-link" class:active={discoveryActive} href="/cloud/{data.service.id}/discovery"
 				><Fa icon={faBinoculars} /> Discovery</a
 			>
 		</li>
-		<li class="nav-item">
+		<li title= "Metrics shows all available metrics in the Orchestrator." class="nav-item">
 			<a class="nav-link" class:active={metricActive} href="/cloud/{data.service.id}/metrics"
 				><Fa icon={faCircleCheck} /> Metrics</a
 			>
 		</li>
-		<li class="nav-item">
+		<li title= "Assessment shows all assessment results for the given Cloud Service." class="nav-item">
 			<a class="nav-link" class:active={assessmentActive} href="/cloud/{data.service.id}/assessment"
 				><Fa icon={faCircleCheck} /> Assessment</a
 			>

From c62796d994e6446581aa2139022086271dcbaa59 Mon Sep 17 00:00:00 2001
From: Angelika Schneider <angelika.schneider@aisec.fraunhofer.de>
Date: Mon, 19 Jun 2023 16:32:57 +0200
Subject: [PATCH 13/13] Fix merge failures

---
 src/lib/Navigation.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Navigation.svelte b/src/lib/Navigation.svelte
index c04ecba..34dd9a3 100644
--- a/src/lib/Navigation.svelte
+++ b/src/lib/Navigation.svelte
@@ -76,7 +76,7 @@ console.log($page.url);
 			</NavItem>
 			<NavItem>
 				<NavLink active={$page.url.pathname.startsWith("/catalogs")} href="{base}{"/catalogs"}">
-					<Fa icon={faFile} /> Catalogs
+					<Fa icon={faFile} /> Catalogues
 				</NavLink>
 			</NavItem>
 			<NavItem>