Merge pull request #24 from K-PaaS/packaging

[sidecar-portal-ui] cp 1.6.0 support
K-PaaS · Dec 20, 2024 · 4072b85 · 4072b85
2 parents 786758a + 554ae55
commit 4072b85
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 20 deletions.
diff --git 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}

diff --git 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/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 =
-                                    `<tr><td class="left">`+
-                                    `<a href="javascript:;" data-name="${users.userAuthId}">${users.userId}</td>`+
-                                    `<td class="left">${convertUserTypeString(users.userType)}</td>`+
-                                    `<td class="left">${users.roleSetCode}</td>`+
-                                    `<td class="left">${users.created}</td>`+
-                                    `</tr>`;
-
-                                func.appendHtml(document.querySelector('.listTable'), html, 'tbody');
-
-                            };
+                                if (!tmpUsers.includes(users.userId)){
+                                    var html =
+                                        `<tr id="tr${users.userId}"><td class="left ${users.userId}" rowspan="1">`+
+                                        `<a href="javascript:;" data-name="${users.userAuthId}">${users.userId}</td>`+
+                                        `<td class="left">${convertUserTypeString(users.userType)}</td>`+
+                                        `<td class="left">${users.roleSetCode}</td>`+
+                                        `<td class="left">${users.created}</td>`+
+                                        `</tr>`;
+
+                                    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 =
+                                        `<td class="left">${convertUserTypeString(users.userType)}</td>`+
+                                        `<td class="left">${users.roleSetCode}</td>`+
+                                        `<td class="left">${users.created}</td>`;
+
+                                    //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 @@
     </script>
 </th:block>
 </html>
+
diff --git a/src/main/resources/templates/sidecar/workloads/apps.html b/src/main/resources/templates/sidecar/workloads/apps.html
@@ -9,7 +9,7 @@
             </ul>
         </article>
         <article class="base">
-            <div class="notice">
+            <div class="notice apps">
                 <h3>List</h3>
                 <a href="javascript:" class="create-button addApp" th:text="#{M0223}"></a>
                 <!--<a href="javascript:" class="create-button addApp" th:text="#{M0223}"></a>-->
@@ -68,7 +68,22 @@ <h3>List</h3>
                     apps.preLoad();
                 },
                 preLoad(){
-                    apps.domains();
+                    if(sessionStorage.getItem('org_guid')){
+                        apps.domains();
+                    }
+                    else{
+                        var html = `<tr><td colspan="6">No Data.</td></tr>`;
+                        func.appendHtml(
+                            document.querySelector(".listTable"),
+                            html,
+                            "tbody",
+                        );
+                        if (document.getElementById("loading")) {
+                            document
+                                .getElementById("wrap")
+                                .removeChild(document.getElementById("loading"));
+                        }
+                    }
                 },
                 domains() {
                     funcsc.loadDataSidecar(

diff --git 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;
                             }