From cb9cc0141682fb4079437e5d06d568525681e651 Mon Sep 17 00:00:00 2001 From: Ali Azmoodeh Date: Sun, 28 Aug 2022 11:21:19 +0430 Subject: [PATCH] new version 1.0.2 --- CHANGELOG/1.x/CHANGELOG.md | 9 +- lib/ui/components/tags/Dialog.js | 4 +- .../components/tags/tagSection/boxSection.js | 4 +- .../tags/tagSection/itemInSection.js | 2 +- lib/ui/public/script.js | 36 ++-- lib/validation/index.js | 15 +- package-lock.json | 4 +- package.json | 2 +- src/obj/ObjectValidation.js | 157 +++++++++--------- 9 files changed, 124 insertions(+), 109 deletions(-) diff --git a/CHANGELOG/1.x/CHANGELOG.md b/CHANGELOG/1.x/CHANGELOG.md index 3d86544..95ebf8a 100644 --- a/CHANGELOG/1.x/CHANGELOG.md +++ b/CHANGELOG/1.x/CHANGELOG.md @@ -16,4 +16,11 @@ Change Log * Fix bug in disable to show empty events table * Fix bug in default tag * Refactor code - * Changed css file \ No newline at end of file + * Changed css file + +## Version 1.0.2 + +2022-08-27 + + * Fix bug in show reference object and some validation for parameter, args and event tables + * Fix bug open and close dialog \ No newline at end of file diff --git a/lib/ui/components/tags/Dialog.js b/lib/ui/components/tags/Dialog.js index 300253f..bd775a6 100644 --- a/lib/ui/components/tags/Dialog.js +++ b/lib/ui/components/tags/Dialog.js @@ -22,7 +22,7 @@ module.exports.dialog = (id, isCommonAuth, data) => { if (isCommonAuth) { return '' + base + - '\n
\n' + + '\n
\n' + ' Close\n' + '
\n' + '
'; @@ -30,7 +30,7 @@ module.exports.dialog = (id, isCommonAuth, data) => { return '' + base + - '\n
\n' + + '\n
\n' + ' Close\n' + '
\n' + '
'; diff --git a/lib/ui/components/tags/tagSection/boxSection.js b/lib/ui/components/tags/tagSection/boxSection.js index 4a80849..fec4db7 100644 --- a/lib/ui/components/tags/tagSection/boxSection.js +++ b/lib/ui/components/tags/tagSection/boxSection.js @@ -14,11 +14,11 @@ module.exports.boxSection = (name, arrowId, haveDescription, isCommonAuth) => { if (isCommonAuth && !haveDescription) return base + baseDiv + - ' \n \n'; + ' \n \n'; if (isCommonAuth && haveDescription) return base + baseDiv + - ' \n \n'; + ' \n \n'; return base + baseDiv + '\n'; } \ No newline at end of file diff --git a/lib/ui/components/tags/tagSection/itemInSection.js b/lib/ui/components/tags/tagSection/itemInSection.js index 941168d..044f269 100644 --- a/lib/ui/components/tags/tagSection/itemInSection.js +++ b/lib/ui/components/tags/tagSection/itemInSection.js @@ -27,7 +27,7 @@ module.exports.itemInSection = (name, isLastItem, id, isUsedAuth, details) => { if (isUsedAuth) - base += ' \n'; + base += ' \n'; base += '\n'; diff --git a/lib/ui/public/script.js b/lib/ui/public/script.js index f2f31ee..1b5ccf8 100644 --- a/lib/ui/public/script.js +++ b/lib/ui/public/script.js @@ -62,30 +62,30 @@ function modelItemVerticalBackgroundVisibility(view) { viewVisibility(`table-model-${getId('div-vertical-item-model-', view.id)}`, 'table'); } +function closeDialog(id) { + let viewClickedId = id, + isClickedCommonAuthDialog = viewClickedId === 'closeCommonAuthDialog', + dialog = document.getElementById(`authDialog-${getId('closeAuthDialog-', viewClickedId)}`); + + + if (isClickedCommonAuthDialog) + dialog = document.getElementById('commonAuthDialog'); + -function dialog(id) { + dialog.close(); + document.body.style.overflow = 'auto'; +} + +function openDialog(id) { let viewClickedId = id, - openDialogView = document.getElementById(viewClickedId), - closeDialogView = document.getElementById(`closeAuthDialog-${getId('openAuthDialog-', viewClickedId)}`), dialog = document.getElementById(`authDialog-${getId('openAuthDialog-', viewClickedId)}`), isClickedCommonAuthDialog = viewClickedId === 'openCommonAuthDialog'; - if (isClickedCommonAuthDialog) { - openDialogView = document.getElementById('openCommonAuthDialog'); - closeDialogView = document.getElementById('closeCommonAuthDialog'); + if (isClickedCommonAuthDialog) dialog = document.getElementById('commonAuthDialog'); - } - let openDialog = () => { - document.body.style.overflow = 'hidden'; - dialog.showModal(); - }, - closeDialog = () => { - document.body.style.overflow = 'auto'; - dialog.close(); - }; - - openDialogView.addEventListener('click', openDialog); - closeDialogView.addEventListener('click', closeDialog); + + dialog.showModal(); + document.body.style.overflow = 'hidden'; } \ No newline at end of file diff --git a/lib/validation/index.js b/lib/validation/index.js index a2abbca..b1ebe64 100644 --- a/lib/validation/index.js +++ b/lib/validation/index.js @@ -139,7 +139,6 @@ function validationPathObject() { if (isValidTag) { initObject(description); pushInObject(tag, object, description); - return; } }); @@ -265,11 +264,15 @@ function parametersAndArgsObjectValidation(data, viewId) { function getNumberForListOfItem(arr) { - let arrayOfNumber = arr.filter((data) => { - return data; - }), - lengthOfItem = arrayOfNumber.length; - return lengthOfItem; + let arrayOBoolean = [], + lengthOfItem = () => arrayOBoolean.length; + + arr.forEach(item => { + if (item?.length !== 0 && item !== '' && (typeof item !== 'undefined' && item !== undefined && item !== 'undefined')) + arrayOBoolean.push(true); + }); + + return lengthOfItem(); } function searchInSecurityDefinitions(item) { diff --git a/package-lock.json b/package-lock.json index 0ba47c6..1511782 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "openrtp", - "version": "1.0.1", + "version": "1.0.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "openrtp", - "version": "1.0.1", + "version": "1.0.2", "license": "MIT", "dependencies": { "express": "^4.18.1", diff --git a/package.json b/package.json index a9a226c..0181946 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openrtp", - "version": "1.0.1", + "version": "1.0.2", "description": "Is a text-based software framework supported by an extensive ecosystem of tools that help developers design, build, document, and use programming relationships for socket.io.", "main": "index.js", "scripts": { diff --git a/src/obj/ObjectValidation.js b/src/obj/ObjectValidation.js index 6391517..c7c52ac 100644 --- a/src/obj/ObjectValidation.js +++ b/src/obj/ObjectValidation.js @@ -53,10 +53,10 @@ function paths() { let data = []; let pathsObject = yamlObject?.paths; if (isArray(pathsObject)) { - pathsObject.forEach(item => { - data.push(item); + pathsObject.forEach(object => { + jsonConfig('/', object); }); - return yamlObject.paths = makeObject('/', data); + return yamlObject.paths = makeObject('/', yamlObject.paths); } if (isJsonObject(pathsObject)) @@ -64,117 +64,122 @@ function paths() { let item = pathsObject[key]; item?.forEach(object => { - let tagsInsidePaths = object?.tags, - isTagsUsedInsidePaths = isTagsUsed(tagsInsidePaths); + jsonConfig(key, object); + }); - if (!isTagsUsedInsidePaths) { - data.push(makeObject(key, object)); - return; - } + } - if (isArray(tagsInsidePaths)) - tagsInsidePaths?.forEach(tagItem => { - addTagsIntoArray(tagItem, object, key); - }); +} - if (isString(tagsInsidePaths)) - addTagsIntoArray(tagsInsidePaths, object, key); +function jsonConfig(key, object) { + let tagsInsidePaths = object?.tags, + isTagsUsedInsidePaths = isTagsUsed(tagsInsidePaths); - let newParameterArr = []; - object?.parameters?.forEach(itemForParameter => { - let args = itemForParameter?.args; - let isUsedArgs = args !== undefined; + if (!isTagsUsedInsidePaths) + return; - if (isArray(itemForParameter?.$ref)) { - itemForParameter.$ref.forEach(item => { + if (isArray(tagsInsidePaths)) + tagsInsidePaths?.forEach(tagItem => { + addTagsIntoArray(tagItem, object, key); + }); - let isRefObject = isRefInComponent(item, COMPONENTS_FOR_PARAMETERS_OBJECT_NAME); - if (isRefObject) - newParameterArr = newParameterArr.concat(isRefObject); + if (isString(tagsInsidePaths)) + addTagsIntoArray(tagsInsidePaths, object, key); - }); - return; - } - let isRefObject = isRefInComponent(itemForParameter, COMPONENTS_FOR_PARAMETERS_OBJECT_NAME); - if (isRefObject) - newParameterArr = newParameterArr.concat(isRefObject); + let newParameterArr = []; + object?.parameters?.forEach(itemForParameter => { + let args = itemForParameter?.args; + let isUsedArgs = args !== undefined; - if (!isRef(itemForParameter)) - newParameterArr = newParameterArr.concat(itemForParameter); + if (isArray(itemForParameter?.$ref)) { + itemForParameter.$ref.forEach(item => { + let isRefObject = isRefInComponent(item, COMPONENTS_FOR_PARAMETERS_OBJECT_NAME); + if (isRefObject) + newParameterArr = newParameterArr.concat(isRefObject); - if (isUsedArgs) { - let argsData = []; - args?.forEach(argItem => { + }); + return; + } - if (!isRef(argItem)) { - argsData = argsData.concat(argItem); - } + let isRefObject = isRefInComponent(itemForParameter, COMPONENTS_FOR_PARAMETERS_OBJECT_NAME); + if (isRefObject) + newParameterArr = newParameterArr.concat(isRefObject); - if (isArray(argItem?.$ref)) { - argItem.$ref.forEach(item => { - let isRefObject = isRefInComponent(item, COMPONENTS_FOR_PARAMETERS_OBJECT_NAME); - if (isRefObject) - argsData = argsData.concat(isRefObject); + if (!isRef(itemForParameter)) + newParameterArr = newParameterArr.concat(itemForParameter); - }); - return; - } - let isRefObject = isRefInComponent(argItem, COMPONENTS_FOR_PARAMETERS_OBJECT_NAME); - if (isRefObject) - argsData = argsData.concat(isRefObject); + if (isUsedArgs) { + let argsData = []; + args?.forEach(argItem => { - }); - itemForParameter.args = argsData; - } + if (!isRef(argItem)) { + argsData = argsData.concat(argItem); + } + if (isArray(argItem?.$ref)) { + argItem.$ref.forEach(item => { - }); + let isRefObject = isRefInComponent(item, COMPONENTS_FOR_PARAMETERS_OBJECT_NAME); + if (isRefObject) + argsData = argsData.concat(isRefObject); - if (isDefined(object?.parameters)) { - object.parameters = newParameterArr; + }); + return; } - let newEventArr = []; + let isRefObject = isRefInComponent(argItem, COMPONENTS_FOR_PARAMETERS_OBJECT_NAME); + if (isRefObject) + argsData = argsData.concat(isRefObject); - object?.events?.forEach(eventObject => { - - if (isArray(eventObject?.$ref)) - eventObject.$ref.forEach(item => { - let isRefObject = isRefInComponent(item, COMPONENTS_FOR_EVENTS_OBJECT_NAME); - if (isRefObject) - newEventArr = newEventArr.concat(isRefObject); - }); + }); + itemForParameter.args = argsData; + } - if (isRef(eventObject) && isString(eventObject)) { - let isRefObject = isRefInComponent(eventObject, COMPONENTS_FOR_EVENTS_OBJECT_NAME); - if (isRefObject) { - newEventArr = newEventArr.concat(isRefObject); - } - } + }); - if (!isRef(eventObject)) - newEventArr = newEventArr.concat(eventObject); + if (isDefined(object?.parameters)) { + object.parameters = newParameterArr; + } - }); + let newEventArr = []; - if (isDefined(object?.events)) { - object.events = newEventArr; - } + object?.events?.forEach(eventObject => { + if (isArray(eventObject?.$ref)) + eventObject.$ref.forEach(item => { + let isRefObject = isRefInComponent(item, COMPONENTS_FOR_EVENTS_OBJECT_NAME); + if (isRefObject) + newEventArr = newEventArr.concat(isRefObject); }); + + if (isRef(eventObject) && isString(eventObject)) { + let isRefObject = isRefInComponent(eventObject, COMPONENTS_FOR_EVENTS_OBJECT_NAME); + if (isRefObject) { + newEventArr = newEventArr.concat(isRefObject); + } } + if (!isRef(eventObject)) + newEventArr = newEventArr.concat(eventObject); + + }); + + if (isDefined(object?.events)) { + object.events = newEventArr; + } + } + function getRefName(str) { return str?.split('/')[1]; }