Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Checking for @type being an array #599

Merged
merged 4 commits into from
Oct 7, 2024
Merged

Checking for @type being an array #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4b3dde
fix: add checks for at type being an array
egekorkan Oct 2, 2024
f424ddb
fix: add parantheses
egekorkan Oct 2, 2024
c72b8af
fix: refactor document type detection
egekorkan Oct 2, 2024
2ccf0d4
fix: add document checker function call to console
egekorkan Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 31 additions & 29 deletions packages/web/src/scripts/console.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { visualize } from './visualize'
import { validationView, validationTab } from './validation'
import { convertTDYamlToJson } from '../../../core/dist/web-bundle.min.js'
import { detectProtocolSchemes } from '@thingweb/td-utils/dist/web-bundle.min.js'
import { generateOAP, generateAAP, addDefaultsUtil, validate, generateAAS, resetValidationStatus } from './util'
import { generateOAP, generateAAP, addDefaultsUtil, validate, generateAAS, resetValidationStatus, checkDocumentType } from './util'
import { editorList, getEditorData } from './editor'
import { textIcon } from './main.js'

Expand Down Expand Up @@ -143,76 +143,78 @@ visualizationOptions.forEach(option => {
let td = JSON.parse(editorValue)
hideConsoleError()

if ((td["@type"] === "tm:ThingModel" && option.id === "open-api-tab") || (td["@type"] === "tm:ThingModel" && option.id === "async-api-tab") || (td["@type"] === "tm:ThingModel" && option.id === "defaults-tab") || (td["@type"] === "tm:ThingModel" && option.id === "aas-tab")) {
showConsoleError("This function is only allowed for Thing Descriptions!")
if (
(checkDocumentType(td) === "tm" && option.id === "open-api-tab") ||
(checkDocumentType(td) === "tm" && option.id === "async-api-tab") ||
(checkDocumentType(td) === "tm" && option.id === "defaults-tab") ||
(checkDocumentType(td) === "tm" && option.id === "aas-tab")
) {
showConsoleError("This function is only allowed for Thing Descriptions!");
} else {
switch (option.id) {
case "open-api-tab": {

if (fileType === "yaml") {
openApiJsonBtn.disabled = false
openApiYamlBtn.disabled = true
openApiJsonBtn.disabled = false;
openApiYamlBtn.disabled = true;
} else {
openApiJsonBtn.disabled = true
openApiYamlBtn.disabled = false
openApiJsonBtn.disabled = true;
openApiYamlBtn.disabled = false;
}

enableAPIConversionWithProtocol(editorInstance)
enableAPIConversionWithProtocol(editorInstance);

break;
}
case "async-api-tab": {
if (fileType === "yaml") {
asyncApiJsonBtn.disabled = false
asyncApiYamlBtn.disabled = true
asyncApiJsonBtn.disabled = false;
asyncApiYamlBtn.disabled = true;
} else {
asyncApiJsonBtn.disabled = true
asyncApiYamlBtn.disabled = false
asyncApiJsonBtn.disabled = true;
asyncApiYamlBtn.disabled = false;
}

enableAPIConversionWithProtocol(editorInstance)
enableAPIConversionWithProtocol(editorInstance);

break;
}
case "aas-tab": {

generateAAS(fileType, editorInstance)
AASView.classList.remove("hidden")
generateAAS(fileType, editorInstance);
AASView.classList.remove("hidden");

break;
}
case "defaults-tab": {
if (fileType === "yaml") {
defaultsJsonBtn.disabled = false
defaultsYamlBtn.disabled = true
defaultsJsonBtn.disabled = false;
defaultsYamlBtn.disabled = true;
} else {
defaultsJsonBtn.disabled = true
defaultsYamlBtn.disabled = false
defaultsJsonBtn.disabled = true;
defaultsYamlBtn.disabled = false;
}

addDefaultsUtil(editorInstance)
defaultsAddBtn.disabled = true
defaultsView.classList.remove("hidden")
addDefaultsUtil(editorInstance);
defaultsAddBtn.disabled = true;
defaultsView.classList.remove("hidden");

break;
}
case "visualize-tab": {
visualize(td)
visualize(td);

break;
}
case "validation-tab": {
validationView.classList.remove("hidden")
const editorData = getEditorData(editorInstance)
validate(editorData[1], editorValue)
validationView.classList.remove("hidden");
const editorData = getEditorData(editorInstance);
validate(editorData[1], editorValue);

break;
}
default: {
break;
}
}

}

}
Expand Down
Loading
Loading