From 876684fa37e084a7f69c5b1012e00617fdb616bf Mon Sep 17 00:00:00 2001 From: Joseph Replin Date: Thu, 14 Nov 2024 17:10:41 -0600 Subject: [PATCH 1/4] Update properties.schema --- properties.schema | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/properties.schema b/properties.schema index f1d564c..052dd52 100644 --- a/properties.schema +++ b/properties.schema @@ -307,31 +307,31 @@ "inputType": "Checkbox", "validators": [], "help": "Determines whether the notification can be cancelled/closed." - } - } - }, - "_closeCoursePrompt": { - "type": "object", - "required": false, - "title": "Close course prompt", - "properties": { - "_isEnabled": { - "type": "boolean", - "required": false, - "default": true, - "title": "Enable close course prompt?", - "inputType": "Checkbox", - "validators": [], - "help": "Determines whether a button prompt to close the course window (only possible if the course was launched in a popup window) is included." }, - "_closeErrorOnSuccess": { - "type": "string", + "_closePrompt": { + "type": "object", "required": false, - "default": "OK", - "title": "Button label", - "inputType": "Text", - "validators": [], - "translatable": true + "title": "Close notification prompt", + "properties": { + "_isEnabled": { + "type": "boolean", + "required": false, + "default": true, + "title": "Enable close notification button?", + "inputType": "Checkbox", + "validators": [], + "help": "Determines whether a button prompt to close the notification is included." + }, + "label": { + "type": "string", + "required": false, + "default": "OK", + "title": "Button label", + "inputType": "Text", + "validators": [], + "translatable": true + } + } } } } From 4075edd3a21235be5aa000005a735b128748a7ac Mon Sep 17 00:00:00 2001 From: Joseph Replin Date: Thu, 14 Nov 2024 17:15:19 -0600 Subject: [PATCH 2/4] Update course.schema.json --- schema/course.schema.json | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/schema/course.schema.json b/schema/course.schema.json index bd6096b..2f3a0e6 100644 --- a/schema/course.schema.json +++ b/schema/course.schema.json @@ -207,22 +207,24 @@ "description": "Determines whether the notification can be cancelled/closed.", "default": false }, - "_closeCoursePrompt": { - "type": "object", - "title": "Close course prompt", - "default": {}, - "properties": { - "_isEnabled": { - "type": "boolean", - "title": "Enable close course prompt?", - "description": "Determines whether a button prompt to close the course window (only possible if the course was launched in a popup window) is included.", - "default": true - }, - "_closeErrorOnSuccess": { - "type": "string", - "title": "Button label", - "description": "", - "default": "OK" + "properties": { + "_closePrompt": { + "type": "object", + "title": "Close notification prompt", + "default": {}, + "properties": { + "_isEnabled": { + "type": "boolean", + "title": "Enable close notification button?", + "description": "Determines whether a button prompt to close the notification is included.", + "default": false + }, + "label": { + "type": "string", + "title": "Button label", + "description": "Text that appears on the button.", + "default": "Close" + } } } } @@ -249,7 +251,7 @@ "label": { "type": "string", "title": "Button label", - "description": "", + "description": "Text that appears on the button.", "default": "Retry" } } @@ -268,7 +270,7 @@ "label": { "type": "string", "title": "Button label", - "description": "", + "description": "Text that appears on the button.", "default": "Close" } } From 7ce0b48c6fe8adf72d79b028426af20098fcba62 Mon Sep 17 00:00:00 2001 From: Joseph Replin Date: Thu, 14 Nov 2024 17:15:33 -0600 Subject: [PATCH 3/4] Update properties.schema --- properties.schema | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/properties.schema b/properties.schema index 052dd52..e6dc786 100644 --- a/properties.schema +++ b/properties.schema @@ -104,7 +104,8 @@ "title": "Button label", "inputType": "Text", "validators": [], - "translatable": true + "translatable": true, + "help": "Text that appears on the button." } } } @@ -329,7 +330,8 @@ "title": "Button label", "inputType": "Text", "validators": [], - "translatable": true + "translatable": true, + "help": "Text that appears on the button." } } } @@ -367,7 +369,8 @@ "title": "Button label", "inputType": "Text", "validators": [], - "translatable": true + "translatable": true, + "help": "Text that appears on the button." } } }, @@ -392,7 +395,8 @@ "title": "Button label", "inputType": "Text", "validators": [], - "translatable": true + "translatable": true, + "help": "Text that appears on the button." } } } @@ -469,7 +473,8 @@ "title": "Button label", "inputType": "Text", "validators": [], - "translatable": true + "translatable": true, + "help": "Text that appears on the button." } } } @@ -546,7 +551,8 @@ "title": "Button label", "inputType": "Text", "validators": [], - "translatable": true + "translatable": true, + "help": "Text that appears on the button." } } } From dc1aa1f020876314459729e310265b9cd9adaa7b Mon Sep 17 00:00:00 2001 From: joe-allen-89 <85872286+joe-allen-89@users.noreply.github.com> Date: Wed, 27 Nov 2024 15:55:29 +0000 Subject: [PATCH 4/4] Fixes for v1 schemas --- schema/course.schema.json | 181 +++++++++++++++++++++----------------- 1 file changed, 98 insertions(+), 83 deletions(-) diff --git a/schema/course.schema.json b/schema/course.schema.json index 2f3a0e6..d120064 100644 --- a/schema/course.schema.json +++ b/schema/course.schema.json @@ -134,96 +134,111 @@ } }, "_intermediate": { - "_classes": { - "type": "string", - "title": "Custom classes", - "description": "CSS class name to be applied to the popup. The class must be predefined in one of the LESS files. Separate multiple classes with a space." - }, - "title": { - "type": "string", - "title": "Title", - "description": "The text used as the popup title.", - "default": "Connection error" - }, - "body": { - "type": "string", - "title": "Body", - "description": "The text used to inform/instruct users about the error.", - "default": "It looks like we still weren’t able to establish a connection. Please check your connections and select Retry.

If the problem persists, please close the course and relaunch the activity." - }, - "_isCancellable": { - "type": "boolean", - "title": "Is able to be cancelled?", - "description": "Determines whether the notification can be cancelled/closed.", - "default": false + "type": "object", + "title": "Intermediate", + "default": {}, + "properties": { + "_classes": { + "type": "string", + "title": "Custom classes", + "description": "CSS class name to be applied to the popup. The class must be predefined in one of the LESS files. Separate multiple classes with a space." + }, + "title": { + "type": "string", + "title": "Title", + "description": "The text used as the popup title.", + "default": "Connection error" + }, + "body": { + "type": "string", + "title": "Body", + "description": "The text used to inform/instruct users about the error.", + "default": "It looks like we still weren’t able to establish a connection. Please check your connections and select Retry.

If the problem persists, please close the course and relaunch the activity." + }, + "_isCancellable": { + "type": "boolean", + "title": "Is able to be cancelled?", + "description": "Determines whether the notification can be cancelled/closed.", + "default": false + } } }, "_final": { - "_classes": { - "type": "string", - "title": "Custom classes", - "description": "CSS class name to be applied to the popup. The class must be predefined in one of the LESS files. Separate multiple classes with a space." - }, - "title": { - "type": "string", - "title": "Title", - "description": "The text used as the popup title.", - "default": "Connection Failure" - }, - "body": { - "type": "string", - "title": "Body", - "description": "The text used to inform/instruct users about the error.", - "default": "Unfortunately, we were unable to re-establish a connection. Your recent progress will not be saved.

Please close the course and try again at a later time." - }, - "_isCancellable": { - "type": "boolean", - "title": "Is able to be cancelled?", - "description": "Determines whether the notification can be cancelled/closed.", - "default": false + "type": "object", + "title": "Final", + "default": {}, + "properties": { + "_classes": { + "type": "string", + "title": "Custom classes", + "description": "CSS class name to be applied to the popup. The class must be predefined in one of the LESS files. Separate multiple classes with a space." + }, + "title": { + "type": "string", + "title": "Title", + "description": "The text used as the popup title.", + "default": "Connection Failure" + }, + "body": { + "type": "string", + "title": "Body", + "description": "The text used to inform/instruct users about the error.", + "default": "Unfortunately, we were unable to re-establish a connection. Your recent progress will not be saved.

Please close the course and try again at a later time." + }, + "_isCancellable": { + "type": "boolean", + "title": "Is able to be cancelled?", + "description": "Determines whether the notification can be cancelled/closed.", + "default": false + } } }, "_success": { - "_classes": { - "type": "string", - "title": "Custom classes", - "description": "CSS class name to be applied to the popup. The class must be predefined in one of the LESS files. Separate multiple classes with a space." - }, - "title": { - "type": "string", - "title": "Title", - "description": "The text used as the popup title.", - "default": "Connection Success" - }, - "body": { - "type": "string", - "title": "Body", - "description": "The text used to inform/instruct users about the error.", - "default": "Your connection was re-established, and your progress has been saved. Select OK to continue." - }, - "_isCancellable": { - "type": "boolean", - "title": "Is able to be cancelled?", - "description": "Determines whether the notification can be cancelled/closed.", - "default": false - }, + "type": "object", + "title": "Success", + "default": {}, "properties": { - "_closePrompt": { - "type": "object", - "title": "Close notification prompt", - "default": {}, - "properties": { - "_isEnabled": { - "type": "boolean", - "title": "Enable close notification button?", - "description": "Determines whether a button prompt to close the notification is included.", - "default": false - }, - "label": { - "type": "string", - "title": "Button label", - "description": "Text that appears on the button.", - "default": "Close" + "_classes": { + "type": "string", + "title": "Custom classes", + "description": "CSS class name to be applied to the popup. The class must be predefined in one of the LESS files. Separate multiple classes with a space." + }, + "title": { + "type": "string", + "title": "Title", + "description": "The text used as the popup title.", + "default": "Connection Success" + }, + "body": { + "type": "string", + "title": "Body", + "description": "The text used to inform/instruct users about the error.", + "default": "Your connection was re-established, and your progress has been saved. Select OK to continue." + }, + "_isCancellable": { + "type": "boolean", + "title": "Is able to be cancelled?", + "description": "Determines whether the notification can be cancelled/closed.", + "default": false + }, + "properties": { + "_closePrompt": { + "type": "object", + "title": "Close notification prompt", + "default": {}, + "properties": { + "_isEnabled": { + "type": "boolean", + "title": "Enable close notification button?", + "description": "Determines whether a button prompt to close the notification is included.", + "default": false + }, + "label": { + "type": "string", + "title": "Button label", + "description": "Text that appears on the button.", + "default": "Close" + } } } }