@cyberismo/assets 0.0.15 → 0.0.16

package/dist/schemas.d.ts

@@ -10,6 +10,7 @@
   details. You should have received a copy of the GNU Affero General Public
   License along with this program. If not, see <https://www.gnu.org/licenses/>.
 */
+export declare const SCHEMA_VERSION: number;
 export declare const schemas: ({
     $id: string;
     additionalProperties: boolean;
@@ -169,6 +170,11 @@ export declare const schemas: ({
             type: string;
             minLength: number;
         };
+        version: {
+            description: string;
+            minimum: number;
+            type: string;
+        };
         modules: {
             description: string;
             type: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyberismo/assets",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "description": "This package contains static resources",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/calculations/common/base.lp

@@ -19,6 +19,9 @@ templateCard(C) :- card(C), field(C, "container", "template").
 dataType(Card, "lastUpdated", "dateTime") :-
     field(Card, "lastUpdated", _).
 
+dataType(Connector, "lastSynchronised", "dateTime") :-
+    field(Connector, "lastSynchronised", _).
+
 % add workflow state category as a calculated field for Cards
 field(Card, "workflowStateCategory", Category) :-
     card(Card),

package/src/calculations/queries/tree.lp

@@ -1,6 +1,18 @@
 select("title";"statusIndicator";"progress";"rank";"cardType").
-result(Card) :- card(Card), not parent(Card, _), not hiddenInTreeView(Card).
+
+{{#if cardKey}}
+result({{cardKey}}).
+{{#if recursive}}
+% child below
+childResult({{cardKey}}, Card, "children") :- parent(Card, {{cardKey}}), not hiddenInTreeView(Card).
+childResult(Parent, Card, "children") :- childResult(_, Parent, "children"), parent(Card, Parent), not hiddenInTreeView(Card).
+{{/if}}
+
+{{else}}
+result(Card) :- projectCard(Card), not parent(Card, _), not hiddenInTreeView(Card).
 childResult(Parent, Card, "children") :- card(Card), parent(Card, Parent), not hiddenInTreeView(Card).
+{{/if}}
+
 order(Level, "children", 1, "rank", "ASC") :-
     level(Level).
 

package/src/hub/moduleList.json

@@ -30,5 +30,6 @@
       "location": "https://github.com/CyberismoCom/module-secure-development-essentials.git",
       "documentationLocation": "https://github.com/CyberismoCom/module-secure-development-essentials/blob/main/README.adoc"
     }
-  ]
+  ],
+  "version": 1
 }

package/src/schema/cardsConfigSchema.json

@@ -3,6 +3,10 @@
   "additionalProperties": false,
   "description": "General configuration settings for the card tree.",
   "properties": {
+    "schemaVersion": {
+      "type": "number",
+      "description": "Version of the schema used by this project"
+    },
     "cardKeyPrefix": {
       "type": "string",
       "description": "The prefix or the fist component of the card key. For example, ABC",

package/src/schema/hubSchema.json

@@ -13,6 +13,11 @@
       "type": "string",
       "minLength": 1
     },
+    "version": {
+      "description": "Version of the hub data",
+      "minimum": 1,
+      "type": "number"
+    },
     "modules": {
       "description": "List of modules that are available in the hub",
       "type": "array",
@@ -52,7 +57,7 @@
       }
     }
   },
-  "required": ["displayName", "description"],
+  "required": ["description", "displayName", "version"],
   "title": "Hub",
   "type": "object"
 }

package/src/schema/version.json

@@ -0,0 +1,3 @@
+{
+  "schemaVersion": 1
+}

package/src/schemas.ts

@@ -38,6 +38,9 @@ import vegaMacroSchema from './schema/macros/vegaMacroSchema.json' with { type:
 import workflowSchema from './schema/resources/workflowSchema.json' with { type: 'json' };
 import xrefMacroSchema from './schema/macros/xrefMacroSchema.json' with { type: 'json' };
 import cardTreeDirectorySchema from './schema/cardTreeDirectorySchema.json' with { type: 'json' };
+import version from './schema/version.json' with { type: 'json' };
+
+export const SCHEMA_VERSION = version.schemaVersion;
 
 export const schemas = [
   calculationSchema,