Merge pull request finos#1391 from lbulanti-ms/issue-1346

issue-1346 - Moving adr models into shared folder

Author: aidanm3341

calm-hub-ui/src/hub/components/adr-renderer/AdrRenderer.tsx

@@ -8,8 +8,8 @@ import {
     DisplayLinks,
     GetDate,
     StyleTitle,
+    DisplayAdrStatus,
 } from '../../helper-functions/adr/adr-helper-function.js';
-import { DisplayAdrStatus } from '../../../model/adr/adr-status/adrStatus.js';
 import './AdrRenderer.css';
 
 interface AdrRendererProps {

calm-hub-ui/src/hub/helper-functions/adr/adr-helper-function.tsx

@@ -3,6 +3,7 @@ import { Link } from '../../../model/adr/link.js';
 import Markdown from 'react-markdown';
 import './adr-helper-function.css';
 import { Decision } from '../../../model/adr/decision.js';
+import { AdrStatus } from '../../../model/adr/adr-status/adrStatus.js';
 
 export function StyleTitle(props: { title: string }) {
     return (
@@ -115,3 +116,41 @@ export function DisplayChosenOption(props: { decisionOutcome: Decision }) {
         </div>
     );
 }
+
+function capitaliseFirstLetter(adrStatus: string) {
+    return adrStatus.charAt(0).toUpperCase() + adrStatus.slice(1);
+}
+
+export function DisplayAdrStatus(props: { adrStatus: AdrStatus }) {
+    let adrStatusStyling =
+        'inline rounded-full text-center text-s ps-3 pe-3 ms-3 relative bottom-1 font-bold border-solid border-2';
+    const adrStatusString = capitaliseFirstLetter(props.adrStatus);
+
+    switch (props.adrStatus) {
+        case 'draft': {
+            adrStatusStyling = adrStatusStyling + ' border-orange-500 text-orange-500';
+            break;
+        }
+        case 'proposed': {
+            adrStatusStyling = adrStatusStyling + ' border-teal-500 text-teal-500';
+            break;
+        }
+        case 'accepted': {
+            adrStatusStyling = adrStatusStyling + ' border-lime-500 text-lime-500';
+            break;
+        }
+        case 'superseded': {
+            adrStatusStyling = adrStatusStyling + ' border-violet-500 text-violet-500';
+            break;
+        }
+        case 'rejected': {
+            adrStatusStyling = adrStatusStyling + ' border-red-500 text-red-500';
+            break;
+        }
+        case 'deprecated': {
+            adrStatusStyling = adrStatusStyling + ' border-slate-500 text-slate-500';
+        }
+    }
+
+    return <div className={adrStatusStyling}>{adrStatusString}</div>;
+}

…/model/adr/adr-status/adrStatus.test.tsx …ctions/adr/adr-helper-functions.test.tsxcalm-hub-ui/src/model/adr/adr-status/adrStatus.test.tsx renamed to calm-hub-ui/src/hub/helper-functions/adr/adr-helper-functions.test.tsx calm-hub-ui/src/model/adr/adr-status/adrStatus.test.tsx renamed to calm-hub-ui/src/hub/helper-functions/adr/adr-helper-functions.test.tsx

@@ -1,39 +1,39 @@
 import { describe, expect, it } from 'vitest';
-import { AdrStatus, DisplayAdrStatus } from './adrStatus.js';
-
+import { DisplayAdrStatus } from './adr-helper-function.js';
+import { CalmAdrStatus } from '@finos/calm-shared/src/types/adr-types.js';
 describe('ADR Status', () => {
     it('should return Draft with orange styling if ADR status is draft', () => {
-        const status: AdrStatus = 'draft';
+        const status: CalmAdrStatus = 'draft';
         expect(status.toString() === 'Draft');
         expect(DisplayAdrStatus({ adrStatus: status }).props.className).toContain('orange-500');
     });
 
     it('should return Proposed with teal styling if ADR status is proposed', () => {
-        const status: AdrStatus = 'proposed';
+        const status: CalmAdrStatus = 'proposed';
         expect(status.toString() === 'Proposed');
         expect(DisplayAdrStatus({ adrStatus: status }).props.className).toContain('teal-500');
     });
 
     it('should return Accepted with lime styling if ADR status is accepted', () => {
-        const status: AdrStatus = 'accepted';
+        const status: CalmAdrStatus = 'accepted';
         expect(status.toString() === 'Accepted');
         expect(DisplayAdrStatus({ adrStatus: status }).props.className).toContain('lime-500');
     });
 
     it('should return Superseded with violet styling if ADR status is superseded', () => {
-        const status: AdrStatus = 'superseded';
+        const status: CalmAdrStatus = 'superseded';
         expect(status.toString() === 'Superseded');
         expect(DisplayAdrStatus({ adrStatus: status }).props.className).toContain('violet-500');
     });
 
     it('should return Rejected with red styling if ADR status is rejected', () => {
-        const status: AdrStatus = 'rejected';
+        const status: CalmAdrStatus = 'rejected';
         expect(status.toString() === 'Rejected');
         expect(DisplayAdrStatus({ adrStatus: status }).props.className).toContain('red-500');
     });
 
     it('should return Deprecated with slate styling if ADR status is deprecated', () => {
-        const status: AdrStatus = 'deprecated';
+        const status: CalmAdrStatus = 'deprecated';
         expect(status.toString() === 'Deprecated');
         expect(DisplayAdrStatus({ adrStatus: status }).props.className).toContain('slate-500');
     });

calm-hub-ui/src/model/adr/adr-status/adrStatus.tsx

@@ -1,4 +1,4 @@
-import { AdrMeta } from "./adr/adr.meta.js";
+import { CalmAdrMeta } from "@finos/calm-shared/src/model/adr.js";
 
 export type Namespace = string;
 export type PatternID = string;
@@ -10,7 +10,7 @@ export type AdrID = string;
 export type Flow = string;
 export type Version = string;
 export type Revision = string;
-export type Adr = AdrMeta;
+export type Adr = CalmAdrMeta;
 export type CalmType =  'Architectures' | 'Patterns' | 'Flows' | 'ADRs';
 
 export type Data = {