Adds Typed Facts

services/api-db/docker-entrypoint-initdb.d/00-tables.sql

@@ -281,6 +281,7 @@ CREATE TABLE IF NOT EXISTS environment_fact (
   environment              int REFERENCES environment (id),
   name                     varchar(300) NOT NULL,
   value                    varchar(300) NOT NULL,
+  type                     ENUM('TEXT', 'URL') DEFAULT 'TEXT',
   source                   varchar(300) DEFAULT '',
   description              TEXT NULL    DEFAULT '',
   created                  timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,

services/api-db/docker-entrypoint-initdb.d/01-migrations.sql

@@ -1255,6 +1255,25 @@ CREATE OR REPLACE PROCEDURE
   END;
 $$
 
+
+CREATE OR REPLACE PROCEDURE
+  add_fact_type_to_environment_fact()
+
+  BEGIN
+    IF NOT EXISTS(
+      SELECT NULL
+      FROM INFORMATION_SCHEMA.COLUMNS
+      WHERE
+        table_name = 'environment_fact'
+        AND table_schema = 'infrastructure'
+        AND column_name = 'type'
+    ) THEN
+        ALTER TABLE `environment_fact`
+        ADD `type` ENUM('TEXT', 'URL') NOT NULL DEFAULT 'TEXT';
+    END IF;
+  END;
+$$
+
 DELIMITER ;
 
 -- If adding new procedures, add them to the bottom of this list
@@ -1314,6 +1333,7 @@ CALL add_min_max_to_billing_modifier();
 CALL add_content_type_to_project_notification();
 CALL convert_project_production_routes_to_text();
 CALL convert_project_standby_routes_to_text();
+CALL add_fact_type_to_environment_fact();
 
 -- Drop legacy SSH key procedures
 DROP PROCEDURE IF EXISTS CreateProjectSshKey;

services/api/src/resources/fact/resolvers.ts

@@ -43,7 +43,7 @@ export const addFact = async (
   root,
   {
     input: {
-      id, environment: environmentId, name, value, source, description
+      id, environment: environmentId, name, value, source, description, type
     },
   },
   { sqlClient, hasPermission },
@@ -64,7 +64,8 @@ export const addFact = async (
       name,
       value,
       source,
-      description
+      description,
+      type
     }),
   );
 
@@ -93,7 +94,7 @@ export const addFacts = async (
   });
 
   return await facts.map(async (fact) => {
-    const { environment, name, value, source, description } = fact;
+    const { environment, name, value, source, description, type } = fact;
 
     const {
       info: { insertId },
@@ -104,7 +105,8 @@ export const addFacts = async (
         name,
         value,
         source,
-        description
+        description,
+        type
       }),
     );
 

services/api/src/resources/fact/sql.ts

@@ -14,7 +14,8 @@ const standardFactReturn = {
     name: 'name',
     value: 'value',
     source: 'source',
-    description: 'description'
+    description: 'description',
+    type: 'type',
 };
 
 export const Sql /* : SqlObj */ = {
@@ -25,8 +26,8 @@ export const Sql /* : SqlObj */ = {
   }) => {
     return knex('environment_fact').select(standardFactReturn).where('environment', environmentId).toString();
   },
-  insertFact: ({ environment, name, value, source, description }) =>
-    knex('environment_fact').insert({environment, name, value, source, description}).toString(),
+  insertFact: ({ environment, name, value, source, description, type }) =>
+    knex('environment_fact').insert({environment, name, value, source, description, type}).toString(),
   deleteFact: (environment, name) =>
     knex('environment_fact')
       .where({

services/api/src/typeDefs.js

@@ -117,6 +117,11 @@ const typeDefs = gql`
     CRITICAL
   }
 
+  enum FactType {
+    TEXT
+    URL
+  }
+
   scalar SeverityScore
 
   type Problem {
@@ -202,6 +207,7 @@ const typeDefs = gql`
     value: String
     source: String
     description: String
+    type: FactType
   }
 
   input AddFactInput {
@@ -211,20 +217,22 @@ const typeDefs = gql`
     value: String!
     source: String!
     description: String!
+    type: FactType
   }
-  
+
   input AddFactsInput {
     facts: [AddFactInput]!
   }
-  
+
   input UpdateFactInputValue {
     environment: Int!
     name: String!
     value: String!
     source: String!
     description: String
+    type: FactType
   }
-  
+
   input UpdateFactInput {
     environment: Int!
     patch: UpdateFactInputValue!
@@ -234,7 +242,7 @@ const typeDefs = gql`
     environment: Int!
     name: String!
   }
-  
+
   input DeleteFactsFromSourceInput {
     environment: Int!
     source: String!

services/ui/src/components/Facts/index.js

@@ -76,7 +76,11 @@ const Facts = ({ facts }) => {
                                 <div className="description">{fact.description}</div>
                             </div>
                             <div className="col col-2">{fact.source}</div>
-                            <div className="col col-3">{fact.value}</div>
+                            { fact.type == "URL"
+                              ? <div className="col col-3"><a className="external-link" href={fact.value} target="_blank">{fact.value}</a></div>
+                              : <div className="col col-3">{fact.value}</div>
+                            }
+
                         </div>
                     );
                 })}
@@ -204,6 +208,12 @@ const Facts = ({ facts }) => {
                   font-style: italic;
                   font-size: 12px;
                 }
+
+                a.external-link {
+                  color: ${color.brightBlue};
+                  text-decoration: underline;
+                  font-style: italic;
+                }
               }
 
               .row-heading {

services/ui/src/lib/fragment/Fact.js

@@ -7,5 +7,6 @@ export default gql`
     value
     source
     description
+    type
   }
 `;