@cyberismo/assets 0.0.12 → 0.0.14

package/dist/schemas.d.ts

@@ -40196,22 +40196,26 @@ export declare const parentSchema: {
         calculationResourceSchema: {
             type: string;
             properties: {
+                additionalProperties: boolean;
                 directories: {
                     type: string;
                     additionalProperties: boolean;
-                };
-                files: {
-                    type: string;
-                    $comment: string;
-                    additionalProperties: boolean;
                     patternProperties: {
-                        "^.+\\.lp$": {
+                        ".+": {
                             type: string;
+                            properties: {
+                                files: {
+                                    type: string;
+                                    properties: {
+                                        "calculation.lp": {
+                                            type: string;
+                                        };
+                                    };
+                                    required: string[];
+                                };
+                            };
                         };
                     };
-                    properties: {
-                        ".gitkeep": {};
-                    };
                 };
             };
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyberismo/assets",
-  "version": "0.0.12",
+  "version": "0.0.14",
   "description": "This package contains static resources",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,10 +20,11 @@
   },
   "files": [
     "dist",
-    "src"
+    "src",
+    "THIRD-PARTY.txt"
   ],
   "scripts": {
-    "build": "shx rm -rf dist && shx mkdir -p dist &&  shx cp THIRD-PARTY.txt dist/ && pnpm script:schemas && node scripts/build.js && tsc && shx cp -r src/static dist/",
+    "build": "shx rm -rf dist && shx mkdir -p dist && pnpm script:schemas && node scripts/build.js && tsc && shx cp -r src/static dist/",
     "dev": "pnpm build && chokidar 'src/**/*' -i 'src/schemas.ts' -c 'pnpm build'",
     "script:schemas": "node scripts/generateSchemaImports && prettier --write src/schemas.ts"
   }

package/src/exportPdfReport/index.adoc.hbs

@@ -41,8 +41,47 @@ toc::[]
 | {{displayName}} | xref:{{this.key}}[{{this.title}}]{{#if this.linkDescription}} - {{this.linkDescription}}{{/if}}
 {{/each}}
 |===
+{empty} +
 {{/if}}
+{{#if this.notifications}}
+[discrete]  
+==== Notifications
+
+[cols="1,2,3",options="header",frame=none,grid=rows]
+|===
+| Category | Title | Message
+{{#each this.notifications}}
+| {{category}} | {{title}} | {{message}}
+{{/each}}
+|===
 {empty} +
+{{/if}}
+{{#if this.policyChecks.successes}}
+[discrete]  
+==== Passed policy checks
+
+[cols="1,3",options="header",frame=none,grid=rows]
+|===
+| Category | Title
+{{#each this.policyChecks.successes}}
+| {{category}} | {{title}}
+{{/each}}
+|===
+{empty} +
+{{/if}}
+{{#if this.policyChecks.failures}}
+[discrete]  
+==== Failed policy checks
+
+[cols="1,2,3",options="header",frame=none,grid=rows]
+|===
+| Category | Title | Details
+{{#each this.policyChecks.failures}}
+| {{category}} | {{title}} | {{errorMessage}}{{#if fieldName}} ({{fieldName}}){{/if}}
+{{/each}}
+|===
+{empty} +
+{{/if}}
 {{#include}}
     "cardKey": "{{this.key}}",
     "levelOffset": "{{this.levelOffset}}",

package/src/exportPdfReport/query.lp.hbs

@@ -132,6 +132,8 @@ select(1, "cardTypeDisplayName").
 select(1, "key").
 select(1, "lastUpdated").
 select(1, "links").
+select(1, "notifications").
+select(1, "policyChecks").
 select(1, "labels").
 select(1, "levelOffset").
 select(1, "treePath").

package/src/hub/moduleList.json

@@ -6,28 +6,28 @@
       "name": "base",
       "displayName": "Base module",
       "category": "essentials",
-      "location": "git@github.com:CyberismoCom/module-base.git",
+      "location": "https://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",
+      "location": "https://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",
+      "location": "https://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",
+      "location": "https://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

@@ -5,9 +5,9 @@
   "properties": {
     "cardType": {
       "type": "string",
-      "minLength": 1,
+      "minLength": 7,
       "description": "The name of the card type",
-      "pattern": "^[A-Za-z]*/?[A-Za-z]*/?[A-Za-z-_]+$"
+      "pattern": "^[A-Za-z0-9/._-]+$"
     },
     "title": {
       "type": "string",

package/src/schema/cardTreeDirectorySchema.json

@@ -122,21 +122,25 @@
     "calculationResourceSchema": {
       "type": "object",
       "properties": {
+        "additionalProperties": false,
         "directories": {
           "type": "object",
-          "additionalProperties": false
-        },
-        "files": {
-          "type": "object",
-          "$comment": "Each file must be a logic program file",
           "additionalProperties": false,
           "patternProperties": {
-            "^.+\\.lp$": {
-              "type": "object"
+            ".+": {
+              "type": "object",
+              "properties": {
+                "files": {
+                  "type": "object",
+                  "properties": {
+                    "calculation.lp": {
+                      "type": "object"
+                    }
+                  },
+                  "required": ["calculation.lp"]
+                }
+              }
             }
-          },
-          "properties": {
-            ".gitkeep": {}
           }
         }
       }

package/src/schema/csvSchema.json

@@ -12,7 +12,7 @@
       },
       "template": {
         "type": "string",
-        "minLength": 1,
+        "minLength": 7,
         "description": "the name of the template for creating the card. Notice that the template must have exactly one card"
       },
       "description": {

package/src/schema/macros/includeMacroSchema.json

@@ -11,12 +11,12 @@
       "description": "Optional offset to adjust the heading levels of the included content. Should be a number as string (e.g., '+1', '+2' or '-1')."
     },
     "title": {
-      "type": "enum",
+      "type": "string",
       "description": "Whether to include the title of the card in the included content. If 'only' is selected, the title will be the only content included.",
       "enum": ["include", "exclude", "only"]
     },
     "pageTitles": {
-      "type": "enum",
+      "type": "string",
       "description": "If discrete, page titles will be included as discrete headings(read asciidoctor docs for more info). If normal, page titles will be included as normal headings.",
       "enum": ["normal", "discrete"]
     }

package/src/schema/resources/calculationSchema.json

@@ -0,0 +1,28 @@
+{
+  "$id": "calculationSchema",
+  "additionalProperties": false,
+  "description": "A calculation object provides logic programming rules and metadata for calculations",
+  "properties": {
+    "name": {
+      "description": "The name of this calculation",
+      "type": "string",
+      "minLength": 1,
+      "pattern": "^[A-Za-z0-9/._-]+$"
+    },
+    "displayName": {
+      "description": "The name of the calculation as it should be displayed in the user interface",
+      "type": "string"
+    },
+    "description": {
+      "description": "A description of the calculation and its purpose",
+      "type": "string"
+    },
+    "calculation": {
+      "description": "The logic programming content for this calculation",
+      "type": "string"
+    }
+  },
+  "required": ["name"],
+  "title": "Calculation",
+  "type": "object"
+}

package/src/schema/resources/cardTypeSchema.json

@@ -6,8 +6,8 @@
     "name": {
       "description": "The name of the card type",
       "type": "string",
-      "minLength": 1,
-      "pattern": "^[A-Za-z0-9]*/?[A-Za-z]*/?[A-Za-z-_]+[.json]*$"
+      "minLength": 7,
+      "pattern": "^[A-Za-z0-9/._-]+$"
     },
     "description": {
       "description": "A description that describes the card type",
@@ -20,8 +20,8 @@
     "workflow": {
       "description": "The name of the workflow",
       "type": "string",
-      "minLength": 1,
-      "pattern": "^[A-Za-z0-9]*/?[A-Za-z0-9]*/?[A-Za-z-_]+[.json]*$"
+      "minLength": 7,
+      "pattern": "^[A-Za-z0-9/._-]+$"
     },
     "customFields": {
       "type": "array",

package/src/schema/resources/fieldTypeSchema.json

@@ -6,7 +6,8 @@
     "name": {
       "type": "string",
       "description": "The technical name by which the field is referred to in JSON files.",
-      "pattern": "^[A-Za-z0-9/._-]+$"
+      "pattern": "^[A-Za-z0-9/._-]+$",
+      "minLength": 7
     },
     "displayName": {
       "type": "string",

package/src/schema/resources/graphModelSchema.json

@@ -6,7 +6,7 @@
     "name": {
       "description": "The name of this graph model",
       "type": "string",
-      "minLength": 1,
+      "minLength": 7,
       "pattern": "^[A-Za-z0-9/._-]+$"
     },
     "displayName": {
@@ -22,7 +22,7 @@
       "type": "string"
     }
   },
-  "required": ["displayName", "name", "displayName"],
+  "required": ["displayName", "name"],
   "title": "GraphModel",
   "type": "object"
 }

package/src/schema/resources/graphViewSchema.json

@@ -5,9 +5,9 @@
   "properties": {
     "name": {
       "description": "The name of this graph view",
-      "type": "string",
-      "minLength": 1,
-      "pattern": "^[A-Za-z0-9/._-]+$"
+      "minLength": 7,
+      "pattern": "^[A-Za-z0-9/._-]+$",
+      "type": "string"
     },
     "displayName": {
       "description": "The name of the graph view as it should be displayed in the user interface. For example, 'Workflow view'.",
@@ -22,7 +22,7 @@
       "type": "string"
     }
   },
-  "required": ["displayName", "name", "displayName"],
+  "required": ["displayName", "name"],
   "title": "GraphView",
   "type": "object"
 }

package/src/schema/resources/linkTypeSchema.json

@@ -12,9 +12,10 @@
       "type": "string"
     },
     "name": {
-      "type": "string",
       "description": "The technical name by which the field is referred to in JSON files.",
-      "pattern": "^[A-Za-z0-9/._-]+$"
+      "minLength": 7,
+      "pattern": "^[A-Za-z0-9/._-]+$",
+      "type": "string"
     },
     "outboundDisplayName": {
       "type": "string",

package/src/schema/resources/reportSchema.json

@@ -5,9 +5,9 @@
   "properties": {
     "name": {
       "description": "The name of this report",
-      "type": "string",
-      "minLength": 1,
-      "pattern": "^[A-Za-z0-9/._-]+$"
+      "minLength": 7,
+      "pattern": "^[A-Za-z0-9/._-]+$",
+      "type": "string"
     },
     "displayName": {
       "description": "The name of the report as it should be displayed in the user interface. For example, 'Children list'.",

package/src/schema/resources/templateSchema.json

@@ -5,9 +5,9 @@
   "properties": {
     "name": {
       "description": "The name of this template",
-      "type": "string",
-      "minLength": 1,
-      "pattern": "^[A-Za-z0-9/._-]+$"
+      "minLength": 7,
+      "pattern": "^[A-Za-z0-9/._-]+$",
+      "type": "string"
     },
     "displayName": {
       "description": "The name of the template as it should be displayed in the user interface. For example, 'Decision'.",

package/src/schema/resources/workflowSchema.json

@@ -13,9 +13,9 @@
     },
     "name": {
       "description": "The name of this workflow",
-      "type": "string",
-      "minLength": 1,
-      "pattern": "^[A-Za-z0-9/._-]+$"
+      "minLength": 7,
+      "pattern": "^[A-Za-z0-9/._-]+$",
+      "type": "string"
     },
     "states": {
       "description": "The states of the workflow",

package/src/schemas.ts

@@ -12,6 +12,7 @@
 */
 
 /* THIS IS AN AUTOGENERATED FILE, DO NOT EDIT IT MANUALLY */
+import calculationSchema from './schema/resources/calculationSchema.json' with { type: 'json' };
 import cardBaseSchema from './schema/cardBaseSchema.json' with { type: 'json' };
 import cardsConfigSchema from './schema/cardsConfigSchema.json' with { type: 'json' };
 import cardTypeSchema from './schema/resources/cardTypeSchema.json' with { type: 'json' };
@@ -39,6 +40,7 @@ import xrefMacroSchema from './schema/macros/xrefMacroSchema.json' with { type:
 import cardTreeDirectorySchema from './schema/cardTreeDirectorySchema.json' with { type: 'json' };
 
 export const schemas = [
+  calculationSchema,
   cardBaseSchema,
   cardsConfigSchema,
   cardTypeSchema,