Skip to content

Commit

Permalink
fix bad conflict resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
CodyCBakerPhD authored Oct 2, 2023
1 parent 1b0cbac commit 717b3a3
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/renderer/src/stories/JSONSchemaForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -624,9 +624,9 @@ export class JSONSchemaForm extends LitElement {
}

// Clear old errors and warnings
this.#clearMessages(fullPath, "errors");
this.#clearMessages(fullPath, "warnings");
this.#clearMessages(fullPath, "info");
this.#clearMessages(localPath, "errors");
this.#clearMessages(localPath, "warnings");
this.#clearMessages(localPath, "info");

const isFunction = typeof valid === "function";
const isValid =
Expand All @@ -643,8 +643,8 @@ export class JSONSchemaForm extends LitElement {
this.checkStatus();

// Show aggregated errors and warnings (if any)
warnings.forEach((info) => this.#addMessage(fullPath, info, "warnings"));
info.forEach((info) => this.#addMessage(fullPath, info, "info"));
warnings.forEach((info) => this.#addMessage(localPath, info, "warnings"));
info.forEach((info) => this.#addMessage(localPath, info, "info"));

if (isValid && errors.length === 0) {
element.classList.remove("invalid");
Expand Down

0 comments on commit 717b3a3

Please sign in to comment.