From 59c269f0c467c4cf36dd882068587a7318ea069f Mon Sep 17 00:00:00 2001 From: robin Date: Sun, 23 Jul 2023 20:57:50 +0000 Subject: [PATCH] dashboard fixes --- schemas/api-config/collectionNavigation.json | 4 +- schemas/api-config/config.json | 3 ++ schemas/api-config/dashboard.json | 44 ++++++++++++++------ 3 files changed, 35 insertions(+), 16 deletions(-) diff --git a/schemas/api-config/collectionNavigation.json b/schemas/api-config/collectionNavigation.json index 0577be3..059fa74 100644 --- a/schemas/api-config/collectionNavigation.json +++ b/schemas/api-config/collectionNavigation.json @@ -71,9 +71,7 @@ }, "required": ["fields"] }, - "dashboard": { - "$ref": "dashboard.json#/properties/dashboard" - }, + "defaultSort": { "type": "object", "description": "default sort in admin ui lists", diff --git a/schemas/api-config/config.json b/schemas/api-config/config.json index a535354..2007fc4 100644 --- a/schemas/api-config/config.json +++ b/schemas/api-config/config.json @@ -19,6 +19,9 @@ "description": "meta object used for admin ui configuration", "additionalProperties": true, "properties": { + "dashboard": { + "$ref": "dashboard.json#/properties/dashboard" + }, "imageUrl": { "description": "project's teaser image url shown in admin ui", "oneOf": [ diff --git a/schemas/api-config/dashboard.json b/schemas/api-config/dashboard.json index f9bbb12..6c1ab46 100644 --- a/schemas/api-config/dashboard.json +++ b/schemas/api-config/dashboard.json @@ -21,8 +21,7 @@ "type": "array", "items": { "$ref": "#/definitions/minorItem" } } - }, - "required": ["majorItems"] + } } }, "required": ["dashboard"], @@ -40,6 +39,7 @@ "type": "object", "properties": { "type": { "type": "string", "enum": ["swiper"] }, + "class": { "type": "string" }, "css": { "type": "object", "properties": { @@ -68,6 +68,7 @@ "type": "object", "properties": { "type": { "type": "string", "enum": ["graph"] }, + "containerProps": { "$ref": "#/definitions/containerProps" }, "title": { "oneOf": [ { @@ -136,8 +137,7 @@ "properties": { "upper": { "type": "string" }, "lower": { "type": "string" } - }, - "required": ["upper", "lower"] + } }, "collection": { "type": "string" }, "subNavigation": { "type": "number" }, @@ -178,7 +178,7 @@ }, "field": { "type": "string" } }, - "required": ["graphName", "graphType"] + "required": ["graphName"] }, "table": { "type": "object", @@ -226,10 +226,16 @@ "apiParams": { "type": "object", "properties": { - "name": { "type": "string" }, - "value": { "type": "string" } + "offset": { "type": "number" }, + "limit": { "type": "number" }, + "sort": { "type": "string" }, + "filter": { + "type": "object", + "additionalProperties": true + }, + "projection": { "type": "string" }, + "count": { "type": "number", "enum": [1] } }, - "required": ["name", "value"], "additionalProperties": false }, "reference": { @@ -243,12 +249,21 @@ "properties": { "de": { "type": "string" }, "en": { "type": "string" } - }, - "required": ["de", "en"] + } }, { "type": "string" } ] - } + }, + "newPageRef": { "type": "boolean" }, + "collection": { "type": "string" }, + "style": { + "type": "object", + "properties": { + "upper": { "type": "string" }, + "lower": { "type": "string" } + } + }, + "subNavigation": { "type": "number" } }, "required": ["type", "title"], "additionalProperties": false @@ -260,11 +275,14 @@ "type": "string", "enum": ["graph", "table", "reference"] }, - "title": { "type": "string" } + "collection": { "type": "string" }, + "subNavigation": { "type": "number" }, + "newPageRef": { "type": "boolean" } }, - "required": ["type"], + "required": ["type", "collection", "subNavigation"], "additionalProperties": false }, + "containerProps": { "type": "object", "properties": {