From 45c2b25cab418f0fd8c2ba3a89a5ef39f324ccf7 Mon Sep 17 00:00:00 2001
From: Thomas Junk <thomas.junk@intevation.de>
Date: Fri, 1 Sep 2023 11:54:16 +0200
Subject: [PATCH] refactor: reorganizing components

---
 src/lib/singleview/{components => }/Droparea.svelte    |  4 ++--
 src/lib/singleview/SingleView.svelte                   | 10 +++++-----
 .../singleview/{components => general}/General.svelte  |  2 +-
 .../singleview/{docmodel => general}/docmodel.test.ts  |  4 ++--
 src/lib/singleview/{docmodel => general}/docmodel.ts   |  9 +++++++--
 .../singleview/{docmodel => general}/docmodeltypes.ts  |  2 ++
 .../ProductVulnerabilities.svelte                      |  2 +-
 .../vulnerabilities/Vulnerabilities.svelte             |  0
 src/lib/store.ts                                       |  2 +-
 9 files changed, 21 insertions(+), 14 deletions(-)
 rename src/lib/singleview/{components => }/Droparea.svelte (93%)
 rename src/lib/singleview/{components => general}/General.svelte (97%)
 rename src/lib/singleview/{docmodel => general}/docmodel.test.ts (99%)
 rename src/lib/singleview/{docmodel => general}/docmodel.ts (93%)
 rename src/lib/singleview/{docmodel => general}/docmodeltypes.ts (97%)
 rename src/lib/singleview/{components => productvulnerabilities}/ProductVulnerabilities.svelte (96%)
 rename src/lib/singleview/{components => }/vulnerabilities/Vulnerabilities.svelte (100%)

diff --git a/src/lib/singleview/components/Droparea.svelte b/src/lib/singleview/Droparea.svelte
similarity index 93%
rename from src/lib/singleview/components/Droparea.svelte
rename to src/lib/singleview/Droparea.svelte
index d4e01f1..216bebe 100644
--- a/src/lib/singleview/components/Droparea.svelte
+++ b/src/lib/singleview/Droparea.svelte
@@ -9,8 +9,8 @@
 -->
 <script lang="ts">
   import { appStore } from "$lib/store";
-  import { convertToDocModel } from "$lib/singleview/docmodel/docmodel";
-  import { generateProductVulnerabilities } from "../productvulnerabilities/productvulnerabilities";
+  import { convertToDocModel } from "$lib/singleview/general/docmodel";
+  import { generateProductVulnerabilities } from "./productvulnerabilities/productvulnerabilities";
 
   let hover: boolean = false;
   let valid: boolean | null = null;
diff --git a/src/lib/singleview/SingleView.svelte b/src/lib/singleview/SingleView.svelte
index 1ee002b..0818c98 100644
--- a/src/lib/singleview/SingleView.svelte
+++ b/src/lib/singleview/SingleView.svelte
@@ -10,11 +10,11 @@
 <script lang="ts">
   import { appStore } from "$lib/store";
   import Collapsible from "$lib/Collapsible.svelte";
-  import General from "$lib/singleview/components/General.svelte";
-  import Droparea from "$lib/singleview/components/Droparea.svelte";
-  import ProductVulnerabilities from "$lib/singleview/components/ProductVulnerabilities.svelte";
-  import Vulnerabilities from "./components/vulnerabilities/Vulnerabilities.svelte";
-  import { CSAFDocProps, DocumentCategory } from "./docmodel/docmodeltypes";
+  import General from "$lib/singleview/general/General.svelte";
+  import Droparea from "$lib/singleview/Droparea.svelte";
+  import ProductVulnerabilities from "$lib/singleview/productvulnerabilities/ProductVulnerabilities.svelte";
+  import Vulnerabilities from "./vulnerabilities/Vulnerabilities.svelte";
+  import { CSAFDocProps, DocumentCategory } from "./general/docmodeltypes";
   $: isDocumentASecurityAdvisory =
     $appStore.doc &&
     $appStore.doc[CSAFDocProps.CATEGORY] === DocumentCategory.CSAF_SECURITY_ADVISORY;
diff --git a/src/lib/singleview/components/General.svelte b/src/lib/singleview/general/General.svelte
similarity index 97%
rename from src/lib/singleview/components/General.svelte
rename to src/lib/singleview/general/General.svelte
index 6b0b2e6..e3aad92 100644
--- a/src/lib/singleview/components/General.svelte
+++ b/src/lib/singleview/general/General.svelte
@@ -8,7 +8,7 @@
  Software-Engineering: 2023 Intevation GmbH <https://intevation.de
 -->
 <script lang="ts">
-  import { Status, TLP } from "$lib/singleview/docmodel/docmodeltypes";
+  import { Status, TLP } from "$lib/singleview/general/docmodeltypes";
   import { appStore } from "$lib/store";
   let tlpStyle: string = "";
   $: trackingVersion = $appStore.doc?.trackingVersion;
diff --git a/src/lib/singleview/docmodel/docmodel.test.ts b/src/lib/singleview/general/docmodel.test.ts
similarity index 99%
rename from src/lib/singleview/docmodel/docmodel.test.ts
rename to src/lib/singleview/general/docmodel.test.ts
index 80fc2a7..2549220 100644
--- a/src/lib/singleview/docmodel/docmodel.test.ts
+++ b/src/lib/singleview/general/docmodel.test.ts
@@ -7,7 +7,7 @@
 // Software-Engineering: 2023 Intevation GmbH <https://intevation.de>
 
 import { describe, it, expect } from "vitest";
-import { convertToDocModel } from "$lib/singleview/docmodel/docmodel";
+import { convertToDocModel } from "$lib/singleview/general/docmodel";
 import {
   EMPTY,
   Status,
@@ -15,7 +15,7 @@ import {
   type DocModel,
   type DocModelKey,
   TLP
-} from "$lib/singleview/docmodel/docmodeltypes";
+} from "$lib/singleview/general/docmodeltypes";
 
 const allEmpty = (docModel: DocModel, properties: DocModelKey[]) => {
   properties.forEach((p) => {
diff --git a/src/lib/singleview/docmodel/docmodel.ts b/src/lib/singleview/general/docmodel.ts
similarity index 93%
rename from src/lib/singleview/docmodel/docmodel.ts
rename to src/lib/singleview/general/docmodel.ts
index 72bfa9f..38ec8a4 100644
--- a/src/lib/singleview/docmodel/docmodel.ts
+++ b/src/lib/singleview/general/docmodel.ts
@@ -13,7 +13,7 @@ import {
   EMPTY,
   CSAFDocProps,
   type Publisher
-} from "$lib/singleview/docmodel/docmodeltypes";
+} from "$lib/singleview/general/docmodeltypes";
 
 const checkDocumentPresent = (csafDoc: any): boolean => {
   return csafDoc.hasOwnProperty(CSAFDocProps.DOCUMENT);
@@ -43,6 +43,10 @@ const checkVulnerabilities = (csafDoc: any): boolean => {
   return csafDoc.hasOwnProperty(CSAFDocProps.VULNERABILITIES);
 };
 
+const checkRevisionHistoryPresent = (csafDoc: any): boolean => {
+  return checkTrackingPresent(csafDoc) && csafDoc.document.tracking[CSAFDocProps.REVISIONHISTORY];
+};
+
 const getTitle = (csafDoc: any): string => {
   if (!checkDocumentPresent(csafDoc)) return EMPTY;
   return csafDoc.document[CSAFDocProps.TITLE] || EMPTY;
@@ -155,7 +159,8 @@ const convertToDocModel = (csafDoc: any): DocModel => {
     isDistributionPresent: checkDistributionPresent(csafDoc),
     isTLPPresent: checkTLPPresent(csafDoc),
     isPublisherPresent: checkPublisher(csafDoc),
-    isVulnerabilitiesPresent: checkVulnerabilities(csafDoc)
+    isVulnerabilitiesPresent: checkVulnerabilities(csafDoc),
+    isRevisionHistoryPresent: checkRevisionHistoryPresent(csafDoc)
   };
   return docModel;
 };
diff --git a/src/lib/singleview/docmodel/docmodeltypes.ts b/src/lib/singleview/general/docmodeltypes.ts
similarity index 97%
rename from src/lib/singleview/docmodel/docmodeltypes.ts
rename to src/lib/singleview/general/docmodeltypes.ts
index 238772d..5e3a682 100644
--- a/src/lib/singleview/docmodel/docmodeltypes.ts
+++ b/src/lib/singleview/general/docmodeltypes.ts
@@ -63,6 +63,7 @@ export type Publisher = {
 
 export type RevisionHistoryEntry = {
   date: string;
+  legacyVersion?: string;
   number: number;
   summary: string;
 };
@@ -88,6 +89,7 @@ export type DocModel = {
   isTLPPresent: boolean;
   isPublisherPresent: boolean;
   isVulnerabilitiesPresent: boolean;
+  isRevisionHistoryPresent: boolean;
 };
 
 export type DocModelKey = keyof DocModel;
diff --git a/src/lib/singleview/components/ProductVulnerabilities.svelte b/src/lib/singleview/productvulnerabilities/ProductVulnerabilities.svelte
similarity index 96%
rename from src/lib/singleview/components/ProductVulnerabilities.svelte
rename to src/lib/singleview/productvulnerabilities/ProductVulnerabilities.svelte
index b16ef98..5755352 100644
--- a/src/lib/singleview/components/ProductVulnerabilities.svelte
+++ b/src/lib/singleview/productvulnerabilities/ProductVulnerabilities.svelte
@@ -10,7 +10,7 @@
 
 <script lang="ts">
   import { appStore } from "$lib/store";
-  import { ProductStatusSymbol } from "../productvulnerabilities/productvulnerabilitiestypes";
+  import { ProductStatusSymbol } from "./productvulnerabilitiestypes";
   let headerColumns: string[] = [];
   let productLines: string[][];
   $: if ($appStore.doc) {
diff --git a/src/lib/singleview/components/vulnerabilities/Vulnerabilities.svelte b/src/lib/singleview/vulnerabilities/Vulnerabilities.svelte
similarity index 100%
rename from src/lib/singleview/components/vulnerabilities/Vulnerabilities.svelte
rename to src/lib/singleview/vulnerabilities/Vulnerabilities.svelte
diff --git a/src/lib/store.ts b/src/lib/store.ts
index 0fe4ba6..c4d39e4 100644
--- a/src/lib/store.ts
+++ b/src/lib/store.ts
@@ -7,7 +7,7 @@
 // Software-Engineering: 2023 Intevation GmbH <https://intevation.de>
 
 import { writable } from "svelte/store";
-import type { DocModel } from "./singleview/docmodel/docmodeltypes";
+import type { DocModel } from "./singleview/general/docmodeltypes";
 
 type AppStore = {
   doc: DocModel | null;