From 50d0f7f82d363e938f5985e8e0f390b43ffc2390 Mon Sep 17 00:00:00 2001 From: okpc579 Date: Fri, 13 Dec 2024 01:54:00 +0000 Subject: [PATCH 1/4] admin duplicate role --- .../templates/sidecar/managements/admin.html | 49 ++++++++++++++----- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/src/main/resources/templates/sidecar/managements/admin.html b/src/main/resources/templates/sidecar/managements/admin.html index 8c1585f..0c600a5 100644 --- a/src/main/resources/templates/sidecar/managements/admin.html +++ b/src/main/resources/templates/sidecar/managements/admin.html @@ -95,23 +95,49 @@ draw(data){ + var tmpUsers = []; if(user.offset == 0) user.allItemCount = data.itemMetaData.allItemCount; if(data.httpStatusCode == 200){ if(data.items.length > 0){ for(var i=0; i<= data.items.length -1; i++){ var users = data.items[i]; - var html = - ``+ - `${users.userId}`+ - `${convertUserTypeString(users.userType)}`+ - `${users.roleSetCode}`+ - `${users.created}`+ - ``; - - func.appendHtml(document.querySelector('.listTable'), html, 'tbody'); - - }; + if (!tmpUsers.includes(users.userId)){ + var html = + ``+ + `${users.userId}`+ + `${convertUserTypeString(users.userType)}`+ + `${users.roleSetCode}`+ + `${users.created}`+ + ``; + + func.appendHtml(document.querySelector('.listTable'), html, 'tbody'); + tmpUsers.push(users.userId); + }else{ + //var tempClass = "." + users.userId; + var tempId = "tr" + users.userId; + + var duplicationAuthIdTr = document.getElementById(tempId); + //var duplicationAuthIdTd = document.querySelector(tempClass); + //console.log(duplicationAuthIdTd); + //duplicationAuthIdTd.setAttribute("rowspan", Number(duplicationAuthIdTd.getAttribute("rowspan"))+1 ); + console.log() + duplicationAuthIdTr.firstChild.setAttribute("rowspan", Number(duplicationAuthIdTr.firstChild.getAttribute("rowspan"))+1 ); + + var html = + `${convertUserTypeString(users.userType)}`+ + `${users.roleSetCode}`+ + `${users.created}`; + + //duplicationAuthIdTd.append(document.createElement(html)); + let div = document.createElement("tr"); + div.innerHTML = html; + duplicationAuthIdTr.after(div); + //func.appendHtml(duplicationAuthIdTr, html, 'tbody'); + + } + + }; } else { @@ -167,3 +193,4 @@ + From 7e049fb479b1a553c45b58e51af143a4edadace3 Mon Sep 17 00:00:00 2001 From: okpc579 Date: Fri, 13 Dec 2024 01:54:44 +0000 Subject: [PATCH 2/4] keycloak version update - application.yml --- src/main/resources/application.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ce7ce27..06ebf9e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -17,16 +17,16 @@ private: keycloak: oauth: info: - uri: ${KEYCLOAK_URI}/auth/realms/${KEYCLOAK_CP_REALM}/protocol/openid-connect/userinfo + uri: ${KEYCLOAK_URI}/realms/${KEYCLOAK_CP_REALM}/protocol/openid-connect/userinfo token: check: - uri: ${KEYCLOAK_URI}/auth/realms/${KEYCLOAK_CP_REALM}/protocol/openid-connect/token/introspect + uri: ${KEYCLOAK_URI}/realms/${KEYCLOAK_CP_REALM}/protocol/openid-connect/token/introspect access: - uri: ${KEYCLOAK_URI}/auth/realms/${KEYCLOAK_CP_REALM}/protocol/openid-connect/token + uri: ${KEYCLOAK_URI}/realms/${KEYCLOAK_CP_REALM}/protocol/openid-connect/token logout: - url: ${KEYCLOAK_URI}/auth/realms/${KEYCLOAK_CP_REALM}/protocol/openid-connect/logout + url: ${KEYCLOAK_URI}/realms/${KEYCLOAK_CP_REALM}/protocol/openid-connect/logout authorization: - uri: ${KEYCLOAK_URI}/auth/realms/${KEYCLOAK_CP_REALM}/protocol/openid-connect/auth + uri: ${KEYCLOAK_URI}/realms/${KEYCLOAK_CP_REALM}/protocol/openid-connect/auth client: id: ${KEYCLOAK_CP_CLIENT_ID} secret: ${KEYCLOAK_CP_CLIENT_SECRET} From 14d608f583a1fadfb55a115e2705558382347074 Mon Sep 17 00:00:00 2001 From: Ruby Date: Fri, 20 Dec 2024 13:35:49 +0900 Subject: [PATCH 3/4] apps no data bug fix --- src/main/resources/static/js/sidecar.js | 5 ++++- .../templates/sidecar/workloads/apps.html | 19 +++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/resources/static/js/sidecar.js b/src/main/resources/static/js/sidecar.js index d89a574..e8f1a7f 100644 --- a/src/main/resources/static/js/sidecar.js +++ b/src/main/resources/static/js/sidecar.js @@ -58,7 +58,10 @@ const funcsc = { }else { document.querySelector('.orgTop').innerText = MSG_NO_ORGS; document.querySelector('.spaceTop').innerText = MSG_NO_SPACES; - return; + if (document.querySelector('.apps')){ + func.nameLoad(); + return; + } } }; diff --git a/src/main/resources/templates/sidecar/workloads/apps.html b/src/main/resources/templates/sidecar/workloads/apps.html index 5b42419..35765ae 100644 --- a/src/main/resources/templates/sidecar/workloads/apps.html +++ b/src/main/resources/templates/sidecar/workloads/apps.html @@ -9,7 +9,7 @@
-
+

List

 @@ -68,7 +68,22 @@

List

apps.preLoad(); }, preLoad(){ - apps.domains(); + if(sessionStorage.getItem('org_guid')){ + apps.domains(); + } + else{ + var html = `No Data.`; + func.appendHtml( + document.querySelector(".listTable"), + html, + "tbody", + ); + if (document.getElementById("loading")) { + document + .getElementById("wrap") + .removeChild(document.getElementById("loading")); + } + } }, domains() { funcsc.loadDataSidecar( From 554ae552a94225c6ccffab0209e0094b5606b154 Mon Sep 17 00:00:00 2001 From: Ruby Date: Fri, 20 Dec 2024 13:36:15 +0900 Subject: [PATCH 4/4] instance cpu % fix --- .../templates/sidecar/workloads/appsDetailsInstances.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/sidecar/workloads/appsDetailsInstances.html b/src/main/resources/templates/sidecar/workloads/appsDetailsInstances.html index 02532b9..e756508 100644 --- a/src/main/resources/templates/sidecar/workloads/appsDetailsInstances.html +++ b/src/main/resources/templates/sidecar/workloads/appsDetailsInstances.html @@ -96,7 +96,7 @@ var trId = "tr" + i; var initmem = instances[i].usage.mem/1024/1024; var mem = Math.floor(initmem); - var cpu = instances[i].usage.cpu; + var cpu = Math.round(instances[i].usage.cpu*1000)/10 if (cpu == null){ cpu = 0; }