Org Validation layout page support #165
Conversation
| @@ -56,6 +56,7 @@ describe('layout-schema.json hookup', () => { | |||
| pages: [ | |||
| { | |||
| title: '', | |||
| type: 'Configuration', | |||
There was a problem hiding this comment.
Needed to add this to a bunch of the existing test layout.json's since it's now required.
| ]); | ||
| this.lintLayoutCheckNavigationObjects(doc, layout); |
There was a problem hiding this comment.
This one's not actually async, so we don't really need it in the list of async ones.
| private async lintLayoutCheckNavigationObjects(doc: Document, layoutJson: JsonNode): Promise<void> { | ||
| private async lintLayoutValidationPages(templateInfo: JsonNode, doc: Document, layoutJson: JsonNode) { | ||
| // function to read all the templateRequirement tags from the readiness file | ||
| const readinessTags = caching(async () => { |
There was a problem hiding this comment.
This gives us a lazy load of the tags and caches the result, so that way it'll only do the read if there's a validation page with a group with tags.
| ).map(tag => tag.value as string) | ||
| ); | ||
| }); | ||
| const fuzzyMatcher = caching((tags: Set<string>) => fuzzySearcher(tags)); |
There was a problem hiding this comment.
Same here -- this will only gen the fuzzySearcher if there's an error on a tag.
| }, | ||
| "header": { |
There was a problem hiding this comment.
I moved header down to the definitions in the schema so it can referenced for validation page and for the single/2column layouts
| @@ -46,135 +53,105 @@ | |||
| "$ref": "#/definitions/backgroundImage", | |||
| "description": "Image to display in the background of this page. It should be a horizontal image and it will be fixed at the bottom of the page." | |||
| }, | |||
| "layout": { | |||
There was a problem hiding this comment.
These json-schema diffs are a little hard to read, it's probably easier to view the resulting file directly (via the ... button in github).
| @@ -10,7 +10,7 @@ | |||
| "properties": { | |||
| "values": { | |||
| "description": "Default values for variables when computing readiness. Any values passed into the readiness check call will override these.", | |||
| "type": ["null", "object"], | |||
| "type": ["object", "null"], | |||
There was a problem hiding this comment.
These changes to the readiness schema are unrelated -- I just noticed missing default code-completions on some of the field values while testing things out.
In this case here, having null first means you won't get the default {} code completion from the vscode json editor (it'll just have null as an option); flipping it makes it give you both.
| @@ -34,7 +34,8 @@ | |||
| "${Readiness.sobjectCount > Variables.minimumCount}", | |||
| "${Readiness.datasetRowCount >= Constants.minNumRows}", | |||
| "${Readiness.apexResult.name == 'requiredName'}" | |||
| ] | |||
| ], | |||
| "defaultSnippets": [{ "label": "\"\"", "body": "${0}" }] | |||
There was a problem hiding this comment.
If you have examples on a field, vscode won't include the default code-completion (e.g. "" for a string type like this one). Doing the defaultSnippet will.
| /** Create a function that will cache the result of the underlying function on the first call, and | ||
| * return that result from there out. | ||
| */ | ||
| export function caching<A extends any[], R, T>(fn: (this: T, ...arg: A) => R): (this: T, ...arg: A) => R { |
There was a problem hiding this comment.
I've found myself wanting something like this, so I added it.
| @@ -95,7 +95,8 @@ function newVscodeAjv(options?: AjvOptions): Ajv { | |||
| 'deprecationMessage', | |||
| 'doNotSuggest', | |||
| 'enumDescriptions', | |||
| 'patternErrorMessage' | |||
| 'patternErrorMessage', | |||
| 'errorMessage' | |||
There was a problem hiding this comment.
errorMessage is a vscode-specific extension to json-schema, so we have to tell ajv about it for the tests.
What does this PR do?
typefieldtagslining up w/ readinesstemplateRequirementtagsincludeUnmatchedbeing true in a pageWhat issues does this PR fix or reference?
Fixes @W-13900414