Skip to content

Commit

Permalink
Merge pull request #43 from treegex/dev
Browse files Browse the repository at this point in the history 
new version 1.0.2
  • Loading branch information
@aliazmoodehvaldi
aliazmoodehvaldi authored Aug 28, 2022
2 parents 00afb60 + cb9cc01 commit e867dd0
Show file tree
Hide file tree
Showing 9 changed files with 124 additions and 109 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG/1.x/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
* 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
4 changes: 2 additions & 2 deletions lib/ui/components/tags/Dialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ module.exports.dialog = (id, isCommonAuth, data) => {

if (isCommonAuth) {
return '<dialog id="commonAuthDialog">' + base +
'\n<div class="close-btn" id="closeCommonAuthDialog">\n' +
'\n<div class="close-btn" onclick="closeDialog(this.id)" id="closeCommonAuthDialog">\n' +
' Close\n' +
'</div>\n' +
'</dialog>';
}


return '<dialog id="authDialog-' + id + '">' + base +
'\n<div class="close-btn" id="closeAuthDialog-' + id + '">\n' +
'\n<div class="close-btn" onclick="closeDialog(this.id)" id="closeAuthDialog-' + id + '">\n' +
' Close\n' +
'</div>\n' +
'</dialog>';
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/components/tags/tagSection/boxSection.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ module.exports.boxSection = (name, arrowId, haveDescription, isCommonAuth) => {

if (isCommonAuth && !haveDescription)
return base + baseDiv +
' <img class="common-auth img-auth" id="openCommonAuthDialog" onclick="dialog(this.id)" src="' + getIconsUrl() + 'auth.svg"/>\n </div>\n';
' <img class="common-auth img-auth" id="openCommonAuthDialog" onclick="openDialog(this.id)" src="' + getIconsUrl() + 'auth.svg"/>\n </div>\n';

if (isCommonAuth && haveDescription)
return base + baseDiv +
' <img class="common-auth right" id="openCommonAuthDialog" onclick="dialog(this.id)" src="' + getIconsUrl() + 'auth.svg"/>\n </div>\n';
' <img class="common-auth right" id="openCommonAuthDialog" onclick="openDialog(this.id)" src="' + getIconsUrl() + 'auth.svg"/>\n </div>\n';

return base + baseDiv + '</div>\n';
}
2 changes: 1 addition & 1 deletion lib/ui/components/tags/tagSection/itemInSection.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports.itemInSection = (name, isLastItem, id, isUsedAuth, details) => {


if (isUsedAuth)
base += ' <img class="resize-img-auth" id="openAuthDialog-' + id + '" onclick="dialog(this.id)" src="' + getIconsUrl() + 'auth.svg"/>\n';
base += ' <img class="resize-img-auth" id="openAuthDialog-' + id + '" onclick="openDialog(this.id)" src="' + getIconsUrl() + 'auth.svg"/>\n';

base += '</div>\n';

Expand Down
36 changes: 18 additions & 18 deletions lib/ui/public/script.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
}
15 changes: 9 additions & 6 deletions lib/validation/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ function validationPathObject() {
if (isValidTag) {
initObject(description);
pushInObject(tag, object, description);
return;
}

});
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
157 changes: 81 additions & 76 deletions src/obj/ObjectValidation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,128 +53,133 @@ 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))
for (let key in pathsObject) {
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];
}
Expand Down

0 comments on commit e867dd0

Please sign in to comment.