@cyberismo/assets 0.0.11 → 0.0.12

package/src/calculations/common/queryLanguage.lp

@@ -132,18 +132,21 @@ childResult(Key, (Key, Field, Value), Field) :-
 resultField((Key, Field, Value), "value", Value, "shortText") :-
     childResult(Key, (Key, Field, Value), Field),
     field(Key, Field, Value),
+    not resultField(Key, Field, Value, "list"),
     dataType(Key, Field, "list").
 
 resultField((Key, Field, Value), "index", Index, "integer") :-
     childResult(Key, (Key, Field, Value), Field),
     field(Key, Field, Value),
     dataType(Key, Field, "list"),
+    not resultField(Key, Field, Value, "list"),
     field((Field, Value), "index", Index).
 
 resultField((Key, Field, Value), "displayName", EnumDisplayValue, "shortText") :-
     childResult(Key, (Key, Field, Value), Field),
     field(Key, Field, Value),
     dataType(Key, Field, "list"),
+    not resultField(Key, Field, Value, "list"),
     field((Field, Value), "enumDisplayValue", EnumDisplayValue).
 
 % enum
@@ -159,11 +162,12 @@ resultField((Key, Field), "value", Value, "shortText") :-
 
 resultField((Key, Field), "index", Index, "integer") :-
     childObject(Key, (Key, Field), Field),
-    resultField(Key, Field, _, _),
+    resultField(Key, Field, Value, _),
     field((Field, Value), "index", Index).
 
 resultField((Key, Field), "displayValue", EnumDisplayValue, "shortText") :-
     childObject(Key, (Key, Field), Field),
+    resultField(Key, Field, Value, _),
     field((Field, Value), "enumDisplayValue", EnumDisplayValue).
 
 
@@ -175,18 +179,21 @@ childObject(Key, (Key, Field), Field) :-
 resultField((Key, Field), "value", Value, "shortText") :-
     childObject(Key, (Key, Field), Field),
     field(Key, Field, Value),
+    not resultField(Key, Field, Value, "enum"),
     dataType(Key, Field, "enum").
 
 resultField((Key, Field), "index", Index, "integer") :-
     childObject(Key, (Key, Field), Field),
     field(Key, Field, Value),
     dataType(Key, Field, "enum"),
+    not resultField(Key, Field, Value, "enum"),
     field((Field, Value), "index", Index).
 
 resultField((Key, Field), "displayValue", EnumDisplayValue, "shortText") :-
     childObject(Key, (Key, Field), Field),
     field(Key, Field, Value),
     dataType(Key, Field, "enum"),
+    not resultField(Key, Field, Value, "enum"),
     field((Field, Value), "enumDisplayValue", EnumDisplayValue).
 
 % Allow specifying up to 3 fields at the same time

package/src/exportPdfReport/index.adoc.hbs

@@ -18,12 +18,31 @@ toc::[]
      "levelOffset": "{{this.levelOffset}}",
      "title": "only"
   {{/include}}
-[horizontal]
-  {{#each this}}
-  {{#if (isCustomField @key)}}
-  {{@key}}:: {{formatValue this}}
-  {{/if}}
-  {{/each}}
+[cols="1,4",frame=none,grid=none]
+|===
+| Card key | {{this.key}}
+| Card type | {{#if this.cardTypeDisplayName}}{{this.cardTypeDisplayName}}{{else}}{{this.cardType}}{{/if}}
+| Last modified | {{this.lastUpdated}}
+{{#if this.labels}}
+| Labels | {{#each this.labels}}{{this}}{{#unless @last}}, {{/unless}}{{/each}}
+{{/if}}
+{{#each this.fields}}
+| {{fieldDisplayName}} | {{formatValue value}}
+{{/each}}
+|===
+{empty} +
+{{#if this.links}}
+[discrete]  
+==== Linked cards
+
+[cols="1,4",frame=none,grid=none]
+|===
+{{#each this.links}}
+| {{displayName}} | xref:{{this.key}}[{{this.title}}]{{#if this.linkDescription}} - {{this.linkDescription}}{{/if}}
+{{/each}}
+|===
+{{/if}}
+{empty} +
 {{#include}}
     "cardKey": "{{this.key}}",
     "levelOffset": "{{this.levelOffset}}",

package/src/exportPdfReport/query.lp.hbs

@@ -40,8 +40,118 @@ treePath(Card, FullPath) :-
 % Sort by tree path (lexicographic ordering will give us depth-first)
 order(1, "results", 1, "treePath", "ASC").
 
-selectAll.
-
 % Map level to levelOffset and add tree path for sorting
 field(Card, "levelOffset", Level) :- cardLevel(Card, Level), result(Card).
 field(Card, "treePath", Path) :- treePath(Card, Path), result(Card).
+
+% Add fields structure similar to card query
+% a helper term for display names
+displayName(Card, (Card, Field), DisplayName) :-
+    field(Card, Field, _),
+    fieldType(Field),
+    field(Field, "displayName", DisplayName),
+    field(Card, "cardType", CardType),
+    not field((CardType, Field), "displayName", _).
+
+displayName(Card, (Card, Field), DisplayName) :-
+    field(Card, "cardType", CardType),
+    fieldType(Field),
+    field((CardType, Field), "displayName", DisplayName).
+
+% the second level includes metadata for the always visible and optionally visible fields
+field((Card, Field), "key", Field) :-
+    customField(CardType, Field),
+    field(Card, "cardType", CardType),
+    result(Card).
+
+resultField((Card, Field), "visibility", "always") :-
+    alwaysVisibleField(CardType, Field),
+    field(Card, "cardType", CardType),
+    result(Card).
+
+resultField((Card, Field), "visibility", "optional") :-
+    optionallyVisibleField(CardType, Field),
+    field(Card, "cardType", CardType),
+    result(Card).
+
+resultField((Card, Field), "index", Index) :-
+    alwaysVisibleField(CardType, Field),
+    field((CardType, Field), "index", Index),
+    field(Card, "cardType", CardType),
+    result(Card).
+
+resultField((Card, Field), "index", Index) :-
+    optionallyVisibleField(CardType, Field),
+    field((CardType, Field), "index", Index),
+    field(Card, "cardType", CardType),
+    result(Card).
+
+resultField((Card, Field), "fieldDisplayName", DisplayName, "shortText") :-
+    childResult(Card, (Card, Field), "fields"),
+    result(Card),
+    displayName(Card, (Card, Field), DisplayName).
+
+resultField((Card, Field), "fieldDescription", Description, "shortText") :-
+    childResult(Card, (Card, Field), "fields"),
+    result(Card),
+    field(Field, "description", Description).
+
+% add value
+dataType((Card, Field), "value", DataType) :-
+    childResult(Card, (Card, Field), "fields"),
+    result(Card),
+    field(Card, Field, Value),
+    dataType(Card, Field, DataType).
+
+% add value
+field((Card, Field), "value", Value) :-
+    childResult(Card, (Card, Field), "fields"),
+    field(Card, Field, Value).
+
+resultField(((Card, Field), "value"), "displayValue", EnumDisplayValue, "shortText") :-
+    childResult(Card, (Card, Field), "fields"),
+    dataType(Card, Field, "enum"),
+    field((Card, Field), "value", Value),
+    field((Field, Value), "enumDisplayValue", EnumDisplayValue).
+
+resultField(((Card, Field), "value", Value), "displayValue", EnumDisplayValue, "shortText") :-
+    childResult(Card, (Card, Field), "fields"),
+    dataType(Card, Field, "list"),
+    field(Card, Field, Value),
+    field((Field, Value), "enumDisplayValue", EnumDisplayValue).
+
+% add cardTypeDisplayName
+resultField(Card, "cardTypeDisplayName", DisplayName, "shortText") :-
+    result(Card),
+    field(Card, "cardType", CardType),
+    field(CardType, "displayName", DisplayName).
+
+% select only non-custom fields
+select(1, "cardType").
+select(1, "cardTypeDisplayName").
+select(1, "key").
+select(1, "lastUpdated").
+select(1, "links").
+select(1, "labels").
+select(1, "levelOffset").
+select(1, "treePath").
+
+% Fields
+select(2, "fields", "key").
+select(2, "fields", "value").
+
+childResultCollection(Card, "fields") :-
+    result(Card).
+
+childResult(Card, (Card, Field), "fields") :-
+    alwaysVisibleField(CardType, Field),
+    field(Card, "cardType", CardType),
+    result(Card).
+
+childResult(Card, (Card, Field), "fields") :-
+    optionallyVisibleField(CardType, Field),
+    field(Card, "cardType", CardType),
+    result(Card).
+
+order(2, "fields", 1, "visibility", "ASC").
+order(2, "fields", 2, "index", "ASC").

package/src/hub/moduleList.json

@@ -0,0 +1,34 @@
+{
+  "description": "Cyberismo default hub",
+  "displayName": "Cyberismo default hub",
+  "modules": [
+    {
+      "name": "base",
+      "displayName": "Base module",
+      "category": "essentials",
+      "location": "git@github.com:CyberismoCom/module-base.git",
+      "documentationLocation": "https://github.com/CyberismoCom/module-base/blob/main/README.adoc"
+    },
+    {
+      "name": "eucra",
+      "displayName": "Cyberismo EU Cyber Resilience Act",
+      "category": "essentials",
+      "location": "git@github.com:CyberismoCom/module-eu-cra.git",
+      "documentationLocation": "https://github.com/CyberismoCom/module-eu-cra/blob/main/README.adoc"
+    },
+    {
+      "name": "ismsa",
+      "displayName": "ISMS Essentials",
+      "category": "essentials",
+      "location": "git@github.com:CyberismoCom/module-isms-essentials.git",
+      "documentationLocation": "https://github.com/CyberismoCom/module-isms-essentials/blob/main/README.adoc"
+    },
+    {
+      "name": "secdeva",
+      "displayName": "Secure development essentials",
+      "category": "essentials",
+      "location": "git@github.com:CyberismoCom/module-secure-development-essentials.git",
+      "documentationLocation": "https://github.com/CyberismoCom/module-secure-development-essentials/blob/main/README.adoc"
+    }
+  ]
+}

package/src/schema/cardBaseSchema.json

@@ -1,9 +1,7 @@
 {
-  "title": "Card",
   "$id": "cardBaseSchema",
-  "description": "Cards represent different types of tickets, issues and documents. All cards must be valid against this parent schema.",
-  "type": "object",
   "additionalProperties": true,
+  "description": "Cards represent different types of tickets, issues and documents. All cards must be valid against this parent schema.",
   "properties": {
     "cardType": {
       "type": "string",
@@ -72,5 +70,7 @@
       "description": "Card key from which this card has been instantiated"
     }
   },
-  "required": ["title", "cardType", "workflowState", "rank"]
+  "required": ["title", "cardType", "workflowState", "rank"],
+  "title": "Card",
+  "type": "object"
 }

package/src/schema/cardTreeDirectorySchema.json

@@ -1,182 +1,4 @@
 {
-  "title": "Card directory tree schema",
-  "$id": "cardTreeDirectorySchema",
-  "description": "This schema represents the directory structure of a card tree, using the format of https://github.com/jpoehnelt/directory-schema-validator",
-  "type": "object",
-  "properties": {
-    "directories": {
-      "type": "object",
-      "properties": {
-        ".cards": {
-          "description": "Configuration for the card tree",
-          "type": "object",
-          "properties": {
-            "files": {
-              "type": "object",
-              "additionalProperties": false
-            },
-            "directories": {
-              "type": "object",
-              "additionalProperties": false,
-              "properties": {
-                "modules": {
-                  "$ref": "#/$defs/cardModuleSchema"
-                },
-                "local": {
-                  "type": "object",
-                  "properties": {
-                    "files": {
-                      "type": "object",
-                      "additionalProperties": false,
-                      "properties": {
-                        ".schema": {},
-                        "cardsConfig.json": {}
-                      },
-                      "required": [".schema", "cardsConfig.json"]
-                    },
-                    "directories": {
-                      "type": "object",
-                      "additionalProperties": false,
-                      "properties": {
-                        "calculations": {
-                          "$ref": "#/$defs/calculationResourceSchema"
-                        },
-                        "cardTypes": {
-                          "$ref": "#/$defs/cardTypeResourceSchema"
-                        },
-                        "fieldTypes": {
-                          "$ref": "#/$defs/fieldTypeResourceSchema"
-                        },
-                        "graphViews": {
-                          "$ref": "#/$defs/graphViewResourceSchema"
-                        },
-                        "graphModels": {
-                          "$ref": "#/$defs/graphModelResourceSchema"
-                        },
-                        "linkTypes": {
-                          "$ref": "#/$defs/linkTypeResourceSchema"
-                        },
-                        "reports": {
-                          "$ref": "#/$defs/reportResourceSchema"
-                        },
-                        "templates": {
-                          "$ref": "#/$defs/templatesResourceSchema"
-                        },
-                        "workflows": {
-                          "$ref": "#/$defs/workflowResourceSchema"
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "required": ["local"]
-            }
-          }
-        },
-        "cardRoot": {
-          "description": "The contents of the card tree. Each subdirectory contains a top level card. The name of the directory is the card key.",
-          "type": "object",
-          "properties": {
-            "files": {
-              "type": "object",
-              "additionalProperties": false,
-              "properties": {
-                ".gitkeep": {},
-                ".schema": {}
-              }
-            },
-            "directories": {
-              "type": "object",
-              "additionalProperties": false,
-              "patternProperties": {
-                "^[a-z]+_[0-9a-z]+$": {
-                  "$ref": "#/$defs/cardDirectorySchema#"
-                }
-              }
-            }
-          }
-        },
-        ".calc": {
-          "description": "Temporary files for calculations.",
-          "type": "object",
-          "properties": {
-            "directories": {
-              "type": "object",
-              "properties": {
-                "resources": {
-                  "description": "Schema of the .calc resource folder",
-                  "type": "object",
-                  "properties": {
-                    "files": {
-                      "type": "object",
-                      "additionalProperties": false,
-                      "patternProperties": {
-                        "^.+\\.lp$": {
-                          "type": "object"
-                        }
-                      }
-                    }
-                  }
-                },
-                "cards": {
-                  "description": "Directory that contains separate logic program files for each card",
-                  "type": "object",
-                  "properties": {
-                    "files": {
-                      "type": "object",
-                      "additionalProperties": false,
-                      "patternProperties": {
-                        "^.+\\.lp$": {
-                          "type": "object"
-                        }
-                      }
-                    }
-                  }
-                }
-              },
-              "additionalProperties": false
-            },
-            "files": {
-              "type": "object",
-              "properties": {
-                "base.lp": {
-                  "description": "A logic program that contains basic common definitions that are the same in all cards projects",
-                  "type": "object"
-                },
-                "calculations.lp": {
-                  "description": "A logic program that only includes all the logic programs from modules, including the calculations from the local content",
-                  "type": "object"
-                },
-                "cardTree.lp": {
-                  "description": "A logic program that only includes all the card-specific logic programs",
-                  "type": "object"
-                },
-                "resourceImports.lp": {
-                  "description": "A logic program that only includes all the logic programs generated from resources",
-                  "type": "object"
-                },
-                "main.lp": {
-                  "description": "The main logic program",
-                  "type": "object"
-                },
-                "modules.lp": {
-                  "description": "",
-                  "type": "object"
-                },
-                "queryLanguage.lp": {
-                  "description": "A logic program that defines the Cyberismo query language",
-                  "type": "object"
-                }
-              },
-              "additionalProperties": true
-            }
-          }
-        }
-      },
-      "required": [".cards", "cardRoot"]
-    }
-  },
   "$defs": {
     "cardModuleSchema": {
       "description": "The schema for modules. Each module is in a named directory containing 'cardTypes', 'templates' and 'workflows'. ",
@@ -659,5 +481,183 @@
         }
       ]
     }
-  }
+  },
+  "$id": "cardTreeDirectorySchema",
+  "description": "This schema represents the directory structure of a card tree, using the format of https://github.com/jpoehnelt/directory-schema-validator",
+  "properties": {
+    "directories": {
+      "type": "object",
+      "properties": {
+        ".cards": {
+          "description": "Configuration for the card tree",
+          "type": "object",
+          "properties": {
+            "files": {
+              "type": "object",
+              "additionalProperties": false
+            },
+            "directories": {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "modules": {
+                  "$ref": "#/$defs/cardModuleSchema"
+                },
+                "local": {
+                  "type": "object",
+                  "properties": {
+                    "files": {
+                      "type": "object",
+                      "additionalProperties": false,
+                      "properties": {
+                        ".schema": {},
+                        "cardsConfig.json": {}
+                      },
+                      "required": [".schema", "cardsConfig.json"]
+                    },
+                    "directories": {
+                      "type": "object",
+                      "additionalProperties": false,
+                      "properties": {
+                        "calculations": {
+                          "$ref": "#/$defs/calculationResourceSchema"
+                        },
+                        "cardTypes": {
+                          "$ref": "#/$defs/cardTypeResourceSchema"
+                        },
+                        "fieldTypes": {
+                          "$ref": "#/$defs/fieldTypeResourceSchema"
+                        },
+                        "graphViews": {
+                          "$ref": "#/$defs/graphViewResourceSchema"
+                        },
+                        "graphModels": {
+                          "$ref": "#/$defs/graphModelResourceSchema"
+                        },
+                        "linkTypes": {
+                          "$ref": "#/$defs/linkTypeResourceSchema"
+                        },
+                        "reports": {
+                          "$ref": "#/$defs/reportResourceSchema"
+                        },
+                        "templates": {
+                          "$ref": "#/$defs/templatesResourceSchema"
+                        },
+                        "workflows": {
+                          "$ref": "#/$defs/workflowResourceSchema"
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              "required": ["local"]
+            }
+          }
+        },
+        "cardRoot": {
+          "description": "The contents of the card tree. Each subdirectory contains a top level card. The name of the directory is the card key.",
+          "type": "object",
+          "properties": {
+            "files": {
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                ".gitkeep": {},
+                ".schema": {}
+              }
+            },
+            "directories": {
+              "type": "object",
+              "additionalProperties": false,
+              "patternProperties": {
+                "^[a-z]+_[0-9a-z]+$": {
+                  "$ref": "#/$defs/cardDirectorySchema#"
+                }
+              }
+            }
+          }
+        },
+        ".calc": {
+          "description": "Temporary files for calculations.",
+          "type": "object",
+          "properties": {
+            "directories": {
+              "type": "object",
+              "properties": {
+                "resources": {
+                  "description": "Schema of the .calc resource folder",
+                  "type": "object",
+                  "properties": {
+                    "files": {
+                      "type": "object",
+                      "additionalProperties": false,
+                      "patternProperties": {
+                        "^.+\\.lp$": {
+                          "type": "object"
+                        }
+                      }
+                    }
+                  }
+                },
+                "cards": {
+                  "description": "Directory that contains separate logic program files for each card",
+                  "type": "object",
+                  "properties": {
+                    "files": {
+                      "type": "object",
+                      "additionalProperties": false,
+                      "patternProperties": {
+                        "^.+\\.lp$": {
+                          "type": "object"
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              "additionalProperties": false
+            },
+            "files": {
+              "type": "object",
+              "properties": {
+                "base.lp": {
+                  "description": "A logic program that contains basic common definitions that are the same in all cards projects",
+                  "type": "object"
+                },
+                "calculations.lp": {
+                  "description": "A logic program that only includes all the logic programs from modules, including the calculations from the local content",
+                  "type": "object"
+                },
+                "cardTree.lp": {
+                  "description": "A logic program that only includes all the card-specific logic programs",
+                  "type": "object"
+                },
+                "resourceImports.lp": {
+                  "description": "A logic program that only includes all the logic programs generated from resources",
+                  "type": "object"
+                },
+                "main.lp": {
+                  "description": "The main logic program",
+                  "type": "object"
+                },
+                "modules.lp": {
+                  "description": "",
+                  "type": "object"
+                },
+                "queryLanguage.lp": {
+                  "description": "A logic program that defines the Cyberismo query language",
+                  "type": "object"
+                }
+              },
+              "additionalProperties": true
+            }
+          }
+        }
+      },
+      "required": [".cards", "cardRoot"]
+    }
+  },
+  "title": "Card directory tree schema",
+  "type": "object"
 }

package/src/schema/cardsConfigSchema.json

@@ -1,9 +1,7 @@
 {
-  "title": "CardsConfig",
   "$id": "cardsConfigSchema",
-  "description": "General configuration settings for the card tree.",
-  "type": "object",
   "additionalProperties": false,
+  "description": "General configuration settings for the card tree.",
   "properties": {
     "cardKeyPrefix": {
       "type": "string",
@@ -18,6 +16,18 @@
       "minLength": 1,
       "pattern": "^[A-Za-z ._-]+$"
     },
+    "hubs": {
+      "description": "List of hubs from where to fetch module information",
+      "type": "array",
+      "items": {
+        "type": "object",
+        "properties": {
+          "location": {
+            "type": "string"
+          }
+        }
+      }
+    },
     "modules": {
       "description": "List of modules that have been included in the project",
       "type": "array",
@@ -45,5 +55,7 @@
       }
     }
   },
-  "required": ["cardKeyPrefix"]
+  "required": ["cardKeyPrefix"],
+  "title": "CardsConfig",
+  "type": "object"
 }