From 86443251a90c7d8b1b93131bd40c32ea5b5be46e Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Sat, 27 Feb 2021 00:04:43 -0500
Subject: [PATCH 01/18] Add processing gif for Broken Url Report
---
.../system/create/assets/images/processing.gif | Bin 0 -> 6694 bytes
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 scripts/system/create/assets/images/processing.gif
diff --git a/scripts/system/create/assets/images/processing.gif b/scripts/system/create/assets/images/processing.gif
new file mode 100644
index 0000000000000000000000000000000000000000..94d1486b0a3f6b44ebbc795b17e656572a0e6641
GIT binary patch
literal 6694
zcmY+I`#;nD|Ht36vpH;w&Dl09=TnGOu3?)ggor{$)G9KOOGukJ%_$+tsiBa>96~v5
z%dy1hBt;GtovtXAuCDUEb$zbS;rsdnUO&8UkLUe$e>|O>={8$~3_n{U#*8=_vPbl%;Z_SGi%>|{DIV+
zNgUK%){X}$v}?upzFg$~u4Uv?hL*SCa3P9hv$<3a>>*csfB-X7Pg6-|RR%uvV9)a(
zZWYdFjC6MdpOM_u)5+|=8e7GG_I~JKj$JCNG}~Sa9|9m@PM5RRRPo{*_07v9mWJ(e
N5THW7>Wc=p{U7)BRm=bY
literal 0
HcmV?d00001
From 9b5a1b82e18f2810e837310307ce294048526511 Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Sat, 27 Feb 2021 00:30:17 -0500
Subject: [PATCH 02/18] Add Broken Url Report
---
scripts/system/create/edit.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/system/create/edit.js b/scripts/system/create/edit.js
index 9bd0147002..023021f5cc 100644
--- a/scripts/system/create/edit.js
+++ b/scripts/system/create/edit.js
@@ -35,7 +35,8 @@ Script.include([
"../libraries/gridTool.js",
"entityList/entityList.js",
"entitySelectionTool/entitySelectionTool.js",
- "audioFeedback/audioFeedback.js"
+ "audioFeedback/audioFeedback.js",
+ "modules/brokenUrlReport.js"
]);
var CreateWindow = Script.require('./modules/createWindow.js');
From 2fd648f881b6263282f355657972e6b96634748e Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Sat, 27 Feb 2021 00:31:02 -0500
Subject: [PATCH 03/18] Add Broken Url Report
---
scripts/system/create/entityList/entityList.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/scripts/system/create/entityList/entityList.js b/scripts/system/create/entityList/entityList.js
index 5119d7d3da..0059c589d3 100644
--- a/scripts/system/create/entityList/entityList.js
+++ b/scripts/system/create/entityList/entityList.js
@@ -413,12 +413,14 @@ EntityListTool = function(shouldUseEditTabletApp) {
alignGridToSelection();
} else if (data.type === 'alignGridToAvatar') {
alignGridToAvatar();
+ } else if (data.type === 'brokenUrlReport') {
+ brokenUrlReport(selectionManager.selections);
} else if (data.type === 'toggleGridVisibility') {
toggleGridVisibility();
} else if (data.type === 'toggleSnapToGrid') {
- that.toggleSnapToGrid();
+ that.toggleSnapToGrid();
}
-
+
};
webView.webEventReceived.connect(onWebEventReceived);
From 4836fa8c61bca245055ca97711c8ffcd0017f4bb Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Sat, 27 Feb 2021 00:31:29 -0500
Subject: [PATCH 04/18] Add Broken Url Report
---
scripts/system/create/entityList/html/entityList.html | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/scripts/system/create/entityList/html/entityList.html b/scripts/system/create/entityList/html/entityList.html
index e054ca121b..398dd34c70 100644
--- a/scripts/system/create/entityList/html/entityList.html
+++ b/scripts/system/create/entityList/html/entityList.html
@@ -308,6 +308,13 @@
+
+
+
From 608fe21045bd0ebbb2d003c836fe5c512187adbe Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Sat, 27 Feb 2021 00:32:05 -0500
Subject: [PATCH 05/18] Add Broken Url Report
---
scripts/system/create/entityList/html/js/entityList.js | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/scripts/system/create/entityList/html/js/entityList.js b/scripts/system/create/entityList/html/js/entityList.js
index d21e65d47d..00600bd88a 100644
--- a/scripts/system/create/entityList/html/js/entityList.js
+++ b/scripts/system/create/entityList/html/js/entityList.js
@@ -273,6 +273,7 @@ let elEntityTable,
elSnapToGridActivatorCaption,
elAlignGridToSelection,
elAlignGridToAvatar,
+ elBrokenUrlReport,
elFilterTypeMultiselectBox,
elFilterTypeText,
elFilterTypeOptions,
@@ -359,7 +360,8 @@ function loaded() {
elSnapToGridActivator = document.getElementById("snapToGridActivator");
elSnapToGridActivatorCaption = document.getElementById("snapToGridActivatorCaption");
elAlignGridToSelection = document.getElementById("alignGridToSelection");
- elAlignGridToAvatar = document.getElementById("alignGridToAvatar");
+ elAlignGridToAvatar = document.getElementById("alignGridToAvatar");
+ elBrokenUrlReport = document.getElementById("brokenUrlReport");
elFilterTypeMultiselectBox = document.getElementById("filter-type-multiselect-box");
elFilterTypeText = document.getElementById("filter-type-text");
elFilterTypeOptions = document.getElementById("filter-type-options");
@@ -597,7 +599,11 @@ function loaded() {
elAlignGridToAvatar.onclick = function () {
EventBridge.emitWebEvent(JSON.stringify({ type: "alignGridToAvatar" }));
closeAllEntityListMenu();
- };
+ };
+ elBrokenUrlReport.onclick = function () {
+ EventBridge.emitWebEvent(JSON.stringify({ type: "brokenUrlReport" }));
+ closeAllEntityListMenu();
+ };
elToggleSpaceMode.onclick = function() {
EventBridge.emitWebEvent(JSON.stringify({ type: "toggleSpaceMode" }));
};
From 6e3ab1707958f9d5ed1212a0008fbdeb768d30d5 Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Sat, 27 Feb 2021 00:34:51 -0500
Subject: [PATCH 06/18] Add Broken Url Report functionality
---
.../create/modules/brokenUrlReport.html | 68 +++++++++++++++++++
1 file changed, 68 insertions(+)
create mode 100644 scripts/system/create/modules/brokenUrlReport.html
diff --git a/scripts/system/create/modules/brokenUrlReport.html b/scripts/system/create/modules/brokenUrlReport.html
new file mode 100644
index 0000000000..4c80f9cfb9
--- /dev/null
+++ b/scripts/system/create/modules/brokenUrlReport.html
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ Testing in progress...
+
+
+
Broken Url Report
" + brokenUrlReportUrlList.length + " URL tested.
NO ISSUE HAS BEEN FOUND.
";
+ brokenUrlReportContent = brokenUrlReportContent + "
This report ignores URL from the Asset Server (atp://), local drive paths or any string not starting by 'http'.Broken Url Report
\n";
+ brokenUrlReportContent = brokenUrlReportContent + " \n";
+ brokenUrlReportContent = brokenUrlReportContent + "
\n";
+ brokenUrlReportContent = brokenUrlReportContent + "\n";
+ brokenUrlReportContent = brokenUrlReportContent + " \n";
+ brokenUrlReportContent = brokenUrlReportContent + " \n";
+ brokenUrlReportContent = brokenUrlReportContent + " Entity \n";
+ brokenUrlReportContent = brokenUrlReportContent + " Broken Url \n";
+ brokenUrlReportContent = brokenUrlReportContent + " \n";
+ brokenUrlReportContent = brokenUrlReportContent + " \n";
+ for (var i = 0; i < brokenUrlReportInvalideUrlList.length; i++ ){
+ brokenUrlReportContent = brokenUrlReportContent + " No \n";
+ brokenUrlReportContent = brokenUrlReportContent + " Type \n";
+ brokenUrlReportContent = brokenUrlReportContent + " Name & ID \n";
+ brokenUrlReportContent = brokenUrlReportContent + " Property \n";
+ brokenUrlReportContent = brokenUrlReportContent + " Status \n";
+ brokenUrlReportContent = brokenUrlReportContent + " Current URL \n";
+ brokenUrlReportContent = brokenUrlReportContent + " \n";
+ brokenUrlReportContent = brokenUrlReportContent + " \n";
+ }
+ brokenUrlReportContent = brokenUrlReportContent + " " + (i + 1) + " \n";
+ brokenUrlReportContent = brokenUrlReportContent + " " + brokenUrlReportInvalideUrlList[i].type + " \n";
+ brokenUrlReportContent = brokenUrlReportContent + " " + brokenUrlReportInvalideUrlList[i].name + " \n";
+ brokenUrlReportContent = brokenUrlReportContent + "
" + brokenUrlReportInvalideUrlList[i].id + "" + brokenUrlReportInvalideUrlList[i].urlType + " \n";
+ brokenUrlReportContent = brokenUrlReportContent + " " + brokenUrlReportInvalideUrlList[i].validity + " \n";
+ brokenUrlReportContent = brokenUrlReportContent + " " + brokenUrlReportInvalideUrlList[i].url + " \n";
+ brokenUrlReportContent = brokenUrlReportContent + "
" + brokenUrlReportUrlList.length + " URL tested.
";
+ brokenUrlReportContent = brokenUrlReportContent + "
This report ignores URL from the Asset Server (atp://), local drive paths or any string not starting by 'http'.\n";
brokenUrlReportContent = brokenUrlReportContent + "
\n";
brokenUrlReportContent = brokenUrlReportContent + " \n";
brokenUrlReportContent = brokenUrlReportContent + " \n";
- brokenUrlReportContent = brokenUrlReportContent + " Entity \n";
+ brokenUrlReportContent = brokenUrlReportContent + " Entity \n";
brokenUrlReportContent = brokenUrlReportContent + " Broken Url \n";
brokenUrlReportContent = brokenUrlReportContent + " \n";
brokenUrlReportContent = brokenUrlReportContent + " \n";
}
@@ -356,14 +358,29 @@ function brokenUrlReport(entityIds) {
return;
}
}
+ if (brokenUrlReportOverlayWebWindow !== undefined) {
+ brokenUrlReportOverlayWebWindow.close();
+ }
brokenUrlReportOverlayWebWindow = new OverlayWebWindow({
title: "Broken Url Report",
source: Script.resolvePath("brokenUrlReport.html"),
width: 1000,
height: 600
- });
+ });
brokenUrlReportContent = "";
brokenUrlReportRequestUrlValidityCheck(brokenUrlReportProcessedUrlNo);
}
}
+
+ brokenUrlReportOverlayWebWindow.webEventReceived.connect(function (message) {
+ try {
+ var data = JSON.parse(message);
+ } catch(e) {
+ print("brokenUrlReport.js: Error parsing JSON");
+ return;
+ }
+ if (data.action === "select") {
+ selectionManager.setSelections([data.entityID], this);
+ }
+ });
}
From 090cd176e0480b6e78f0d44dff2b731c091c490b Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Mon, 1 Mar 2021 23:41:38 -0500
Subject: [PATCH 11/18] Display the error text instead of only the no
---
scripts/system/create/modules/brokenUrlReport.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/scripts/system/create/modules/brokenUrlReport.js b/scripts/system/create/modules/brokenUrlReport.js
index 3ae6dbadee..b6747305fd 100644
--- a/scripts/system/create/modules/brokenUrlReport.js
+++ b/scripts/system/create/modules/brokenUrlReport.js
@@ -30,7 +30,11 @@ function brokenUrlReportRequestUrlValidityCheck(no) {
function brokenUrlReportGetResponseStatus() {
if (brokenUrlReportHttpRequest.status === 0 || brokenUrlReportHttpRequest.status > 299) {
- brokenUrlReportUrlList[brokenUrlReportProcessedUrlNo].validity = brokenUrlReportHttpRequest.status;
+ if (brokenUrlReportHttpRequest.status === 0) {
+ brokenUrlReportUrlList[brokenUrlReportProcessedUrlNo].validity = "0 - URL not well-formed";
+ } else {
+ brokenUrlReportUrlList[brokenUrlReportProcessedUrlNo].validity = brokenUrlReportHttpRequest.status + " - " + brokenUrlReportHttpRequest.statusText;
+ }
brokenUrlReportInvalideUrlList.push(brokenUrlReportUrlList[brokenUrlReportProcessedUrlNo]);
}
brokenUrlReportHttpRequest.requestComplete.disconnect(brokenUrlReportGetResponseStatus);
From b65d31c477b2fb6e775a377cc4e70efdbe5761ec Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Sun, 21 Mar 2021 22:49:10 -0400
Subject: [PATCH 12/18] Broken Url Report - adjustments
Broken Url Report - adjustments
---
scripts/system/create/edit.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/system/create/edit.js b/scripts/system/create/edit.js
index 023021f5cc..ed9763875d 100644
--- a/scripts/system/create/edit.js
+++ b/scripts/system/create/edit.js
@@ -36,7 +36,7 @@ Script.include([
"entityList/entityList.js",
"entitySelectionTool/entitySelectionTool.js",
"audioFeedback/audioFeedback.js",
- "modules/brokenUrlReport.js"
+ "modules/brokenURLReport.js"
]);
var CreateWindow = Script.require('./modules/createWindow.js');
From d51337c98fe9d0e414e9f093f7b14162a81f0708 Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Sun, 21 Mar 2021 22:49:58 -0400
Subject: [PATCH 13/18] Broken Url Report - adjustments
Broken Url Report - adjustments
---
scripts/system/create/entityList/entityList.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/system/create/entityList/entityList.js b/scripts/system/create/entityList/entityList.js
index 0059c589d3..02cd9a14ca 100644
--- a/scripts/system/create/entityList/entityList.js
+++ b/scripts/system/create/entityList/entityList.js
@@ -413,8 +413,8 @@ EntityListTool = function(shouldUseEditTabletApp) {
alignGridToSelection();
} else if (data.type === 'alignGridToAvatar') {
alignGridToAvatar();
- } else if (data.type === 'brokenUrlReport') {
- brokenUrlReport(selectionManager.selections);
+ } else if (data.type === 'brokenURLReport') {
+ brokenURLReport(selectionManager.selections);
} else if (data.type === 'toggleGridVisibility') {
toggleGridVisibility();
} else if (data.type === 'toggleSnapToGrid') {
From ffdf1960bb23d3037dbbd85e00450b7b05d3a79b Mon Sep 17 00:00:00 2001
From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com>
Date: Sun, 21 Mar 2021 22:50:53 -0400
Subject: [PATCH 14/18] Broken Url Report - adjustments
Broken Url Report - adjustments
---
scripts/system/create/entityList/html/entityList.html | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/system/create/entityList/html/entityList.html b/scripts/system/create/entityList/html/entityList.html
index 398dd34c70..75b172e201 100644
--- a/scripts/system/create/entityList/html/entityList.html
+++ b/scripts/system/create/entityList/html/entityList.html
@@ -310,12 +310,12 @@
-
No \n";
brokenUrlReportContent = brokenUrlReportContent + " Type \n";
brokenUrlReportContent = brokenUrlReportContent + " Name & ID \n";
+ brokenUrlReportContent = brokenUrlReportContent + " \n";
brokenUrlReportContent = brokenUrlReportContent + " Property \n";
brokenUrlReportContent = brokenUrlReportContent + " Status \n";
brokenUrlReportContent = brokenUrlReportContent + " Current URL \n";
@@ -76,8 +77,9 @@ function brokenUrlReportGenerateFormatedReport(brokenUrlReportInvalideUrlList) {
brokenUrlReportContent = brokenUrlReportContent + " " + (i + 1) + " \n";
brokenUrlReportContent = brokenUrlReportContent + " " + brokenUrlReportInvalideUrlList[i].type + " \n";
brokenUrlReportContent = brokenUrlReportContent + " " + brokenUrlReportInvalideUrlList[i].name + " \n";
+ brokenUrlReportContent = brokenUrlReportContent + "
" + brokenUrlReportInvalideUrlList[i].id + "✎ \n";
brokenUrlReportContent = brokenUrlReportContent + " " + brokenUrlReportInvalideUrlList[i].urlType + " \n";
- brokenUrlReportContent = brokenUrlReportContent + " " + brokenUrlReportInvalideUrlList[i].validity + " \n";
+ brokenUrlReportContent = brokenUrlReportContent + " " + brokenUrlReportInvalideUrlList[i].validity + " \n";
brokenUrlReportContent = brokenUrlReportContent + " " + brokenUrlReportInvalideUrlList[i].url + " \n";
brokenUrlReportContent = brokenUrlReportContent + "
From 0797e2668b523ef40b58a610c4752b02857ca53d Mon Sep 17 00:00:00 2001 From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com> Date: Sun, 21 Mar 2021 22:51:26 -0400 Subject: [PATCH 15/18] Broken Url Report - adjustments Broken Url Report - adjustments --- scripts/system/create/entityList/html/js/entityList.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/system/create/entityList/html/js/entityList.js b/scripts/system/create/entityList/html/js/entityList.js index 00600bd88a..e3526296d9 100644 --- a/scripts/system/create/entityList/html/js/entityList.js +++ b/scripts/system/create/entityList/html/js/entityList.js @@ -273,7 +273,7 @@ let elEntityTable, elSnapToGridActivatorCaption, elAlignGridToSelection, elAlignGridToAvatar, - elBrokenUrlReport, + elBrokenURLReport, elFilterTypeMultiselectBox, elFilterTypeText, elFilterTypeOptions, @@ -361,7 +361,7 @@ function loaded() { elSnapToGridActivatorCaption = document.getElementById("snapToGridActivatorCaption"); elAlignGridToSelection = document.getElementById("alignGridToSelection"); elAlignGridToAvatar = document.getElementById("alignGridToAvatar"); - elBrokenUrlReport = document.getElementById("brokenUrlReport"); + elBrokenURLReport = document.getElementById("brokenURLReport"); elFilterTypeMultiselectBox = document.getElementById("filter-type-multiselect-box"); elFilterTypeText = document.getElementById("filter-type-text"); elFilterTypeOptions = document.getElementById("filter-type-options"); @@ -600,8 +600,8 @@ function loaded() { EventBridge.emitWebEvent(JSON.stringify({ type: "alignGridToAvatar" })); closeAllEntityListMenu(); }; - elBrokenUrlReport.onclick = function () { - EventBridge.emitWebEvent(JSON.stringify({ type: "brokenUrlReport" })); + elBrokenURLReport.onclick = function () { + EventBridge.emitWebEvent(JSON.stringify({ type: "brokenURLReport" })); closeAllEntityListMenu(); }; elToggleSpaceMode.onclick = function() { From a9fadfa6540036464926d3f5901c37a527fa6042 Mon Sep 17 00:00:00 2001 From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com> Date: Sun, 21 Mar 2021 22:52:25 -0400 Subject: [PATCH 16/18] Broken Url Report - adjustments Broken Url Report - adjustments --- .../create/modules/brokenURLReport.html | 102 +++++ .../system/create/modules/brokenURLReport.js | 393 ++++++++++++++++++ 2 files changed, 495 insertions(+) create mode 100644 scripts/system/create/modules/brokenURLReport.html create mode 100644 scripts/system/create/modules/brokenURLReport.js diff --git a/scripts/system/create/modules/brokenURLReport.html b/scripts/system/create/modules/brokenURLReport.html new file mode 100644 index 0000000000..17ab908f0c --- /dev/null +++ b/scripts/system/create/modules/brokenURLReport.html @@ -0,0 +1,102 @@ + + + +
+ + + +
+ +