Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
web-ui
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
WEBGDE-Components
web-ui
Commits
3d38cbf0
Commit
3d38cbf0
authored
Aug 24, 2023
by
Leonard Ambros II
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix on checking XML
parent
deae6ebf
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
39 deletions
+16
-39
getElement.js
WebGde/WebContent/WebGde-Widgets/BPO/getElement.js
+11
-34
config.js
WebGde/WebContent/WebGde-Widgets/config.js
+4
-4
web-ui
web-ui
+1
-1
No files found.
WebGde/WebContent/WebGde-Widgets/BPO/getElement.js
View file @
3d38cbf0
...
@@ -78,7 +78,6 @@ export class BPO {
...
@@ -78,7 +78,6 @@ export class BPO {
//processing all assigned workload first
//processing all assigned workload first
if
(
elements
){
if
(
elements
){
<<<<<<<
WebGde
/
WebContent
/
WebGde
-
Widgets
/
BPO
/
getElement
.
js
for
(
const
element
of
elements
)
{
for
(
const
element
of
elements
)
{
console
.
log
(
"Checking element : "
+
element
.
elementId
);
console
.
log
(
"Checking element : "
+
element
.
elementId
);
console
.
log
(
"Element status : "
+
element
.
status
);
console
.
log
(
"Element status : "
+
element
.
status
);
...
@@ -94,10 +93,10 @@ if(elements){
...
@@ -94,10 +93,10 @@ if(elements){
const
xml
=
await
this
.
isXMLExisting
(
retElement
.
element
);
const
xml
=
await
this
.
isXMLExisting
(
retElement
.
element
);
console
.
log
(
xml
);
console
.
log
(
xml
);
if
(
xml
.
isExisting
)
{
//
if (xml.isExisting) {
const
xmlString
=
await
xml
.
data
.
join
(
''
).
replace
(
'
\
t'
,
''
);
//
const xmlString = await xml.data.join('').replace('\t', '');
const
lastImage
=
this
.
getXmlLastImage
(
xmlString
);
//
const lastImage = this.getXmlLastImage(xmlString);
console
.
log
(
"lastImage "
+
lastImage
);
//
console.log("lastImage " + lastImage);
let
dir
=
await
lst
.
data
;
let
dir
=
await
lst
.
data
;
// if(lastImage){
// if(lastImage){
...
@@ -115,37 +114,15 @@ if(elements){
...
@@ -115,37 +114,15 @@ if(elements){
sessionStorage
.
setItem
(
"element_id"
,
retElement
.
element
.
elementId
);
sessionStorage
.
setItem
(
"element_id"
,
retElement
.
element
.
elementId
);
sessionStorage
.
setItem
(
"element_file_loc"
,
retElement
.
element
.
fileLocation
);
sessionStorage
.
setItem
(
"element_file_loc"
,
retElement
.
element
.
fileLocation
);
return
true
;
return
true
;
}
else
{
// } else {
console
.
log
(
"XML does not exist"
);
// console.log("XML does not exist");
await
this
.
returnElement
(
retElement
.
element
.
elementId
);
// await this.returnElement(retElement.element.elementId);
}
=======
if
(
lst
.
isExisting
)
{
const
xml
=
await
this
.
isXMLExisting
(
retElement
.
element
);
if
(
xml
.
isExisting
)
{
const
xmlString
=
await
xml
.
data
.
join
(
''
).
replace
(
'
\
t'
,
''
);
const
lastImage
=
this
.
getXmlLastImage
(
xmlString
);
//console.log("lastImage " + lastImage);
let
dir
=
await
lst
.
data
;
// if(lastImage){
// const index = dir.indexOf(lastImage);
// console.log(index);
// if (index > -1) { // only splice array when item is found
// dir.splice(0, index +1); // 2nd parameter means remove one item only
// }
// if(dir.length === 0){
// continue;
// }
// }
// }
sessionStorage
.
setItem
(
"dir_files"
,
JSON
.
stringify
(
dir
));
sessionStorage
.
setItem
(
"element_id"
,
retElement
.
element
.
elementId
);
sessionStorage
.
setItem
(
"element_file_loc"
,
retElement
.
element
.
fileLocation
);
return
true
;
>>>>>>>
WebGde
/
WebContent
/
WebGde
-
Widgets
/
BPO
/
getElement
.
js
}
else
{
}
else
{
// await this.returnElement(retElement.element.elementId);
// await this.returnElement(retElement.element.elementId);
await
this
.
transferElement
(
element
.
elementId
);
await
this
.
transferElement
(
element
.
elementId
);
...
...
WebGde/WebContent/WebGde-Widgets/config.js
View file @
3d38cbf0
...
@@ -38,14 +38,14 @@ export const HIGH_LIGHT_SCHEMA = "./WebGde-Widgets/sample_schema/dbSchema_anno.
...
@@ -38,14 +38,14 @@ export const HIGH_LIGHT_SCHEMA = "./WebGde-Widgets/sample_schema/dbSchema_anno.
export
const
ROOT_FOLDER
=
"/WebGde-Widgets"
;
export
const
ROOT_FOLDER
=
"/WebGde-Widgets"
;
//this determines if the images will be retrieved from the gfs
//this determines if the images will be retrieved from the gfs
export
const
DOMAIN
=
"http://
54.175.1.206
:8080"
export
const
DOMAIN
=
"http://
44.201.248.43
:8080"
export
const
CONTEXTROOT
=
"gfs-explorer-ws"
export
const
CONTEXTROOT
=
"gfs-explorer-ws"
// export const GFS_URL = "http://54.174.197.197:8080" + "/WebGde/svc/gfs-rest"
// export const GFS_URL = "http://54.174.197.197:8080" + "/WebGde/svc/gfs-rest"
export
const
GFS_URL
=
"http://
54.175.1.206
:8080"
+
"/WebGdeDev/svc/gfs-rest"
export
const
GFS_URL
=
"http://
44.201.248.43
:8080"
+
"/WebGdeDev/svc/gfs-rest"
export
const
FOLDER_URL
=
DOMAIN
+
"/"
+
CONTEXTROOT
+
"/svc/gfs-rest/get-folder?parentPath=/Users/"
export
const
FOLDER_URL
=
DOMAIN
+
"/"
+
CONTEXTROOT
+
"/svc/gfs-rest/get-folder?parentPath=/Users/"
export
const
DOWNLOAD_URL
=
DOMAIN
+
"/"
+
CONTEXTROOT
+
"/svc/gfs-rest/get-download-link"
export
const
DOWNLOAD_URL
=
DOMAIN
+
"/"
+
CONTEXTROOT
+
"/svc/gfs-rest/get-download-link"
export
const
IS_RETRIEVE_FROM_GFS
=
"N"
export
const
IS_RETRIEVE_FROM_GFS
=
"N"
export
const
LOCAL_URL
=
"http://
54.175.1.206
:8080"
+
"/WebGdeDev/svc/gfs-rest"
export
const
LOCAL_URL
=
"http://
44.201.248.43
:8080"
+
"/WebGdeDev/svc/gfs-rest"
export
const
INVALID_KEYS
=
"F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12,PrintScreen,ScrollLock,Pause,PageUp,PageDown,Insert,Delete,Control"
export
const
INVALID_KEYS
=
"F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12,PrintScreen,ScrollLock,Pause,PageUp,PageDown,Insert,Delete,Control"
...
@@ -53,7 +53,7 @@ export const INVALID_KEYS = "F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12,PrintScreen
...
@@ -53,7 +53,7 @@ export const INVALID_KEYS = "F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12,PrintScreen
export
const
IS_RETRIEVE_FROM_BPO
=
"Y"
export
const
IS_RETRIEVE_FROM_BPO
=
"Y"
// export const BPO_URL = "http://35.171.20.94:8080/bpo-sqa/"
// export const BPO_URL = "http://35.171.20.94:8080/bpo-sqa/"
// export const CURRENT_NODE = "Web GDE"
// export const CURRENT_NODE = "Web GDE"
export
const
BPO_URL
=
"http://
54.175.1.206
:8080/bpo/"
export
const
BPO_URL
=
"http://
44.201.248.43
:8080/bpo/"
export
const
CURRENT_NODE
=
"Web_GDE_DEV"
export
const
CURRENT_NODE
=
"Web_GDE_DEV"
export
const
ENCODING_PASS
=
"PASS1"
export
const
ENCODING_PASS
=
"PASS1"
export
const
NEXT_NODE
=
"Complete"
export
const
NEXT_NODE
=
"Complete"
...
...
web-ui
@
017fc068
Subproject commit
e1d2656666fdf55c508e2a29ee82d5b903a861ac
Subproject commit
017fc0681026200533b1e61c0c015670c8ec2170
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment