From be83e0c29b5a6efd99afc75de112a368be1b2904 Mon Sep 17 00:00:00 2001 From: Marco Cano Date: Mon, 11 Dec 2023 15:49:57 -0800 Subject: [PATCH] fix: :hammer: NDE portal added, modal missing prop, domainIncludes shape, editor new property duplication --- nuxt-app/assets/img/niaid/nde.svg | 23 + nuxt-app/components/EditDescription.vue | 1 + nuxt-app/components/global/AnyOf.vue | 1 + nuxt-app/components/global/OneOf.vue | 1 + nuxt-app/components/global/TypeSelector.vue | 8 +- nuxt-app/components/guide/Category.vue | 2 +- nuxt-app/components/guide/InputBox.vue | 24 +- nuxt-app/pages/dashboard/index.vue | 1 + nuxt-app/pages/guide/nde/[[guide_query]].vue | 29 + nuxt-app/pages/json-schema-viewer/index.vue | 6 +- nuxt-app/pages/markup-generator/index.vue | 12 +- nuxt-app/pages/portal/[portal_name]/index.vue | 4 + nuxt-app/store/modules/editor.js | 5 +- nuxt-app/store/modules/guide.js | 13 +- nuxt-app/store/modules/json_schema_viewer.js | 2 +- nuxt-app/store/modules/portals.js | 35 + schema-backup-120423.json | 70759 ++++++++++++++++ 17 files changed, 70901 insertions(+), 25 deletions(-) create mode 100644 nuxt-app/assets/img/niaid/nde.svg create mode 100644 nuxt-app/pages/guide/nde/[[guide_query]].vue create mode 100644 schema-backup-120423.json diff --git a/nuxt-app/assets/img/niaid/nde.svg b/nuxt-app/assets/img/niaid/nde.svg new file mode 100644 index 00000000..a54d7531 --- /dev/null +++ b/nuxt-app/assets/img/niaid/nde.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + diff --git a/nuxt-app/components/EditDescription.vue b/nuxt-app/components/EditDescription.vue index 98d5e559..519bf653 100644 --- a/nuxt-app/components/EditDescription.vue +++ b/nuxt-app/components/EditDescription.vue @@ -43,6 +43,7 @@ export default { return method; }, allowOutsideClick: () => !Swal.isLoading(), + backdrop: true }) .then((result) => { let payload = { diff --git a/nuxt-app/components/global/AnyOf.vue b/nuxt-app/components/global/AnyOf.vue index 182aec63..114c8afc 100644 --- a/nuxt-app/components/global/AnyOf.vue +++ b/nuxt-app/components/global/AnyOf.vue @@ -164,6 +164,7 @@ export default { }); }, allowOutsideClick: () => !self.$swal.isLoading(), + backdrop: true }) .then((result) => { if (result.value) { diff --git a/nuxt-app/components/global/OneOf.vue b/nuxt-app/components/global/OneOf.vue index e5929c7b..f17f3263 100644 --- a/nuxt-app/components/global/OneOf.vue +++ b/nuxt-app/components/global/OneOf.vue @@ -163,6 +163,7 @@ export default { }); }, allowOutsideClick: () => !self.$swal.isLoading(), + backdrop: true }) .then((result) => { if (result.value) { diff --git a/nuxt-app/components/global/TypeSelector.vue b/nuxt-app/components/global/TypeSelector.vue index bec1af36..44f8770d 100644 --- a/nuxt-app/components/global/TypeSelector.vue +++ b/nuxt-app/components/global/TypeSelector.vue @@ -385,7 +385,9 @@ export default { self.parsed_options[option["@type"]] = option; } else if (option && option["items"] && option["items"]["@type"]) { if (!self.parsed_options.hasOwnProperty(option["items"]["@type"])) { - self.parsed_options[option["items"]["@type"]] = option; + self.parsed_options[option["items"]["@type"]] = option?.items ? option.items : option; + }else{ + console.log('TypeSelector no option found for: ', self.main_name) } } else if (option && option["enum"]) { // use main prop name and replace underscore with space @@ -405,7 +407,7 @@ export default { self.info.hasOwnProperty("properties") && self.info.hasOwnProperty("@type") && self.info.hasOwnProperty("type") && - self.info.type == "object" + self.info?.type == "object" ) { // OBJECT TYPE FIELD self.parsed_options[self.info["@type"]] = self.info; @@ -492,6 +494,7 @@ export default { }); }, allowOutsideClick: () => !self.$swal.isLoading(), + backdrop: true }) .then((result) => { if (result.value) { @@ -740,6 +743,7 @@ export default { }, }, mounted: function () { + // console.log('TYPE SELECTOR : ' + this.main_name, this.info) this.parseOptions(); }, }; diff --git a/nuxt-app/components/guide/Category.vue b/nuxt-app/components/guide/Category.vue index c2ea0e1c..f75a14e3 100644 --- a/nuxt-app/components/guide/Category.vue +++ b/nuxt-app/components/guide/Category.vue @@ -1,6 +1,6 @@