From 86f73e63cc6b5f9adf68fc7c0478ef7e15b7e4e7 Mon Sep 17 00:00:00 2001 From: fenghuajia <17610303377@163.com> Date: Fri, 14 Jun 2019 18:25:55 +0800 Subject: [PATCH 1/3] add group, hide user management in aad schema(2) --- src/webportal/config/webpack.common.js | 2 - src/webportal/server/config/index.js | 4 - .../src/app/layout/layout.component.ejs | 12 +- .../src/app/layout/layout.component.js | 8 +- src/webportal/src/app/vc/vc.component.ejs | 196 ++++++------------ src/webportal/src/app/vc/vc.component.js | 52 +---- src/webportal/src/app/vc/vc.component.scss | 23 +- 7 files changed, 91 insertions(+), 206 deletions(-) diff --git a/src/webportal/config/webpack.common.js b/src/webportal/config/webpack.common.js index 14c2e68a69..593a947583 100644 --- a/src/webportal/config/webpack.common.js +++ b/src/webportal/config/webpack.common.js @@ -29,7 +29,6 @@ const helpers = require('./helpers'); const title = 'Platform for AI'; const version = require('../package.json').version; -const authnMethod = require('../server/config/index.js').authnMethod; const FABRIC_DIR = [ path.resolve(__dirname, '../src/app/job/job-view/fabric'), path.resolve(__dirname, '../src/app/home'), @@ -41,7 +40,6 @@ function generateHtml(opt) { return new HtmlWebpackPlugin(Object.assign({ title: title, version: version, - authnMethod: authnMethod, template: './src/app/layout/layout.component.ejs', minify: { collapseWhitespace: true, diff --git a/src/webportal/server/config/index.js b/src/webportal/server/config/index.js index d6d2a14499..7c563b9e6f 100644 --- a/src/webportal/server/config/index.js +++ b/src/webportal/server/config/index.js @@ -28,7 +28,6 @@ let config = { env: process.env.NODE_ENV, logLevel: process.env.LOG_LEVEL, serverPort: process.env.SERVER_PORT, - authnMethod: process.env.AUTHN_METHOD, }; // define config schema @@ -44,9 +43,6 @@ const configSchema = Joi.object().keys({ .min(8000) .max(65535) .default(9286), - authnMethod: Joi.string() - .allow(['basic', 'OIDC']) - .default('basic'), }).required(); const {error, value} = Joi.validate(config, configSchema); diff --git a/src/webportal/src/app/layout/layout.component.ejs b/src/webportal/src/app/layout/layout.component.ejs index 12a06abfc5..b8ac262d5e 100644 --- a/src/webportal/src/app/layout/layout.component.ejs +++ b/src/webportal/src/app/layout/layout.component.ejs @@ -93,13 +93,11 @@ •    K8s Dashboard - <% if (htmlWebpackPlugin.options.authnMethod !== 'OIDC') { %> -
  • - - •    User Management - -
    • - <% } %> +
  • + + •    User Management + +
  • diff --git a/src/webportal/src/app/layout/layout.component.js b/src/webportal/src/app/layout/layout.component.js index 3c1d0edeb4..be32ee31d4 100644 --- a/src/webportal/src/app/layout/layout.component.js +++ b/src/webportal/src/app/layout/layout.component.js @@ -28,7 +28,7 @@ const userAuthComponent = require('../user/user-auth/user-auth.component.js'); const userLogoutComponent = require('../user/user-logout/user-logout.component.js'); const userLoginNavComponent = require('../user/user-login/user-login-nav.component.ejs'); const pluginComponent = require('./plugins.component.ejs'); - +const authnMethod = require('../config/webportal.config.js').authnMethod; const userLoginNavHtml = userLoginNavComponent({cookies}); @@ -42,6 +42,12 @@ if (!userAuthComponent.checkAdmin()) { $('#sidebar-menu--cluster-view').hide(); } +if (authnMethod === 'OIDC') { + document.getElementById('sidebar-menu--cluster-view--user-management').style.display = 'none'; +} else { + document.getElementById('sidebar-menu--cluster-view--user-management').style.display = 'block'; +} + if (Array.isArray(window.PAI_PLUGINS) && window.PAI_PLUGINS.length > 0) { $('.sidebar-menu').append(pluginComponent({plugins: window.PAI_PLUGINS})); } diff --git a/src/webportal/src/app/vc/vc.component.ejs b/src/webportal/src/app/vc/vc.component.ejs index 27d25fb115..0c90535991 100644 --- a/src/webportal/src/app/vc/vc.component.ejs +++ b/src/webportal/src/app/vc/vc.component.ejs @@ -1,139 +1,71 @@
    <%= breadcrumb({ breadcrumbTitle: "Virtual Clusters" }) %>
    +
    -
    - -
    -
    -
    -
    -
    Shared VCs share the physical cluster's GPU, CPU and Memory resources by percentage. It provides cluster the flexibility to allocate resources in different nodes in a transparent manner. We support users to add new shared VC from WebUI, the new shared VC's capacity will be allocated from the current default shared VC.
    - <% if (isAdmin === 'true') { %> - - <% } %> - - - - - - - - - - - - - - - - - <% for (let vcName in data) { %> - <% if (specifiedVc && vcName !== specifiedVc) continue; %> - <% if (data[vcName]['dedicated'] === false) { %> - - - - - - - - - - - - - <% } %> - <% } %> - -
    NameCapacityBonusUtilizationMemoryCPUsGPUsActive JobsStateActions
    - <%= vcName %> - - <%= formatNumber(data[vcName]['capacity'], 2) %> % - - <%= data[vcName]['capacity'] < data[vcName]['maxCapacity'] || data[vcName]['maxCapacity'] === 100 ? 'enabled' : 'disabled' %> - - <%= formatNumber(data[vcName]['capacity'] === 0 ? 0 : data[vcName]['usedCapacity'] / data[vcName]['capacity'] * 100, 2) %> % - - <%= Math.floor(data[vcName]['resourcesUsed']['memory']) %> / <%= Math.floor(data[vcName]['resourcesTotal']['memory']) %> MB - - <%= Math.floor(data[vcName]['resourcesUsed']['vCores']) %> / <%= Math.floor(data[vcName]['resourcesTotal']['vCores']) %> - - <%= Math.floor(data[vcName]['resourcesUsed']['GPUs']) %> / <%= Math.floor(data[vcName]['resourcesTotal']['GPUs']) %> - - <%= data[vcName]['numJobs'] %> - - <%= convertState(vcName, data[vcName]['status']) %> - - View Jobs -   |   - Go to Yarn Page - <% if (isAdmin === 'true') { %> -   |   - Delete -   |   - Edit - <% } %> -
    -
    -
    -
    -
    -
    Dedicated VCs are designed for jobs need dedicated compute resource, a dedicated VC is binding to 1 or more physical nodes. When creating a dedicated VC, currently only supported in cmdline tool, we will allocate the nodes from the Shared VC pool and isolate these node(s) for jobs submitting to this new created dedicated VC only. Once the dedicated VC is created, shared VCs are no longer allowed to use compute resources on this dedicated VC.
    - - - - - - - - - - - - - - - <% for (let vcName in data) { %> - <% if (specifiedVc && vcName !== specifiedVc) continue; %> - <% if (data[vcName]['dedicated'] === true) { %> - - - - - - - - - - - <% } %> +
    +
    + <% if (isAdmin === 'true') { %> + + <% } %> +
    NameUtilizationMemoryCPUsGPUsActive JobsStateActions
    - <%= vcName %> - - <%= formatNumber(data[vcName]['capacity'] === 0 ? 0 : data[vcName]['usedCapacity'] / data[vcName]['capacity'] * 100, 2) %> % - - <%= Math.floor(data[vcName]['resourcesUsed']['memory']) %> / <%= Math.floor(data[vcName]['resourcesTotal']['memory']) %> MB - - <%= Math.floor(data[vcName]['resourcesUsed']['vCores']) %> / <%= Math.floor(data[vcName]['resourcesTotal']['vCores']) %> - - <%= Math.floor(data[vcName]['resourcesUsed']['GPUs']) %> / <%= Math.floor(data[vcName]['resourcesTotal']['GPUs']) %> - - <%= data[vcName]['numJobs'] %> - - <%= convertState(vcName, data[vcName]['status']) %> - - View Jobs -   |   - Go to Yarn Page -
    + + + + + + + + + + + + + + + <% for (let vcName in data) { %> + <% if (specifiedVc && vcName !== specifiedVc) continue; %> + + + + + + + + + + -
    NameCapacityUtilizationMemoryCPUsGPUsActive JobsStatusActions
    + <%= vcName %> + + <%= formatNumber(data[vcName]['capacity'], 2) %> % + + <%= formatNumber(data[vcName]['capacity'] === 0 ? 0 : data[vcName]['usedCapacity'] / data[vcName]['capacity'] * 100, 2) %> % + + <%= data[vcName]['resourcesUsed']['memory'] %> MB + + <%= data[vcName]['resourcesUsed']['vCores'] %> + + <%= data[vcName]['resourcesUsed']['GPUs'] %> + + <%= data[vcName]['numJobs'] %> + + <%= convertState(vcName, data[vcName]['status']) %> + + View Jobs +   |   + Go to Yarn Page + <% if (isAdmin === 'true') { %> +   |   + Delete +   |   + Edit <% } %> -
    -
    -
    + + + <% } %> + + +
    <%= modal({'vcDefault': data.default}) %> -
    + \ No newline at end of file diff --git a/src/webportal/src/app/vc/vc.component.js b/src/webportal/src/app/vc/vc.component.js index 5855e7a2c4..6a604d2fdd 100644 --- a/src/webportal/src/app/vc/vc.component.js +++ b/src/webportal/src/app/vc/vc.component.js @@ -1,22 +1,3 @@ -// Copyright (c) Microsoft Corporation -// All rights reserved. -// -// MIT License -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated -// documentation files (the "Software"), to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and -// to permit persons to whom the Software is furnished to do so, subject to the following conditions: -// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING -// BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -// - require('bootstrap/js/modal.js'); require('datatables.net/js/jquery.dataTables.js'); require('datatables.net-bs/js/dataTables.bootstrap.js'); @@ -33,8 +14,7 @@ const webportalConfig = require('../config/webportal.config.js'); const userAuth = require('../user/user-auth/user-auth.component'); // -let commonTable = null; -let dedicateTable = null; +let table = null; let isAdmin = cookies.get('admin'); // @@ -54,14 +34,7 @@ const loadData = (specifiedVc) => { modal: vcModelComponent, }); $('#content-wrapper').html(vcHtml); - commonTable = $('#common-table').dataTable({ - scrollY: (($(window).height() - 265)) + 'px', - lengthMenu: [[20, 50, 100, -1], [20, 50, 100, 'All']], - columnDefs: [ - {type: 'natural', targets: [0, 1, 2, 3, 4, 5, 6]}, - ], - }).api(); - dedicateTable = $('#dedicated-table').dataTable({ + table = $('#vc-table').dataTable({ scrollY: (($(window).height() - 265)) + 'px', lengthMenu: [[20, 50, 100, -1], [20, 50, 100, 'All']], columnDefs: [ @@ -87,13 +60,9 @@ const formatNumber = (x, precision) => { const resizeContentWrapper = () => { $('#content-wrapper').css({'height': $(window).height() + 'px'}); - $('#sharedvc .dataTables_scrollBody').css('height', (($(window).height() - (isAdmin === 'true' ? 410 : 366))) + 'px'); - $('#dedicatedvc .dataTables_scrollBody').css('height', (($(window).height() - 386)) + 'px'); - if (commonTable != null) { - commonTable.columns.adjust().draw(); - } - if (dedicateTable != null) { - dedicateTable.columns.adjust().draw(); + if (table != null) { + $('.dataTables_scrollBody').css('height', (($(window).height() - (isAdmin === 'true' ? 335 : 265))) + 'px'); + table.columns.adjust().draw(); } }; @@ -281,11 +250,11 @@ const addGroup = () => { return false; } $.ajax({ - url: `${webportalConfig.restServerUri}/api/v2/user/create/`, + url: `${webportalConfig.restServerUri}/api/v2/group/create`, data: JSON.stringify({ 'groupname': vcName, - 'description': `This group of the same name is created by creating a Virtual Cluster named ${vcName}`, - 'externalName': `No extensions yet`, + 'description': ``, + 'externalName': ``, }), headers: { Authorization: `Bearer ${token}`, @@ -340,9 +309,6 @@ $(document).ready(() => { window.onresize = function(envent) { resizeContentWrapper(); }; - $(document).on('click', '.nav li', () => { - resizeContentWrapper(); - }); resizeContentWrapper(); loadData(url.parse(window.location.href, true).query['vcName']); @@ -357,4 +323,4 @@ $(document).ready(() => { let capacity = $('input[name="capacityEdit"]').val(); editVcItemPut(name, capacity); }); -}); +}); \ No newline at end of file diff --git a/src/webportal/src/app/vc/vc.component.scss b/src/webportal/src/app/vc/vc.component.scss index d4ac8167ee..fd1244e2f0 100644 --- a/src/webportal/src/app/vc/vc.component.scss +++ b/src/webportal/src/app/vc/vc.component.scss @@ -16,6 +16,10 @@ color: silver; } +.add-vc-btn{ + margin: 10px 0 20px 0; +} + ul, li{ margin: 0; padding: 0; @@ -65,7 +69,7 @@ ul, li{ } } } -#common-table, #dedicated-table { +#vc-table{ .state-vc{ display: inline-block; padding: .2em .6em .3em; @@ -90,10 +94,6 @@ ul, li{ background: #d2d6de; color: #444; } - .state-stopping { - background: #d2d6de; - color: #444; - } .item-btn{ cursor: pointer; } @@ -101,15 +101,4 @@ ul, li{ color: #c0c0c0; cursor: default; } -} -.discription-dedvc { - margin-bottom: 10px; -} -.message-text { - background-color: rgb(244, 244, 244); - padding: 5px; - margin-bottom: 10px; -} -.dataTables_wrapper { - margin-top: 20px; -} +} \ No newline at end of file From eef9bbbb065b6f5045d128aa8e9150ac0b7a337f Mon Sep 17 00:00:00 2001 From: fenghuajia <17610303377@163.com> Date: Fri, 14 Jun 2019 18:46:40 +0800 Subject: [PATCH 2/3] add group, hide user management in aad schema.3 --- src/webportal/src/app/vc/vc.component.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webportal/src/app/vc/vc.component.js b/src/webportal/src/app/vc/vc.component.js index 6a604d2fdd..2c9f01abc4 100644 --- a/src/webportal/src/app/vc/vc.component.js +++ b/src/webportal/src/app/vc/vc.component.js @@ -323,4 +323,4 @@ $(document).ready(() => { let capacity = $('input[name="capacityEdit"]').val(); editVcItemPut(name, capacity); }); -}); \ No newline at end of file +}); From 1498cad11cc64df54c4e90a11e0cb22c4d7635c2 Mon Sep 17 00:00:00 2001 From: fenghuajia <17610303377@163.com> Date: Fri, 14 Jun 2019 18:47:57 +0800 Subject: [PATCH 3/3] add group, hide user management in aad schema.4 --- src/webportal/server/config/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webportal/server/config/index.js b/src/webportal/server/config/index.js index 7c563b9e6f..5293aeccdb 100644 --- a/src/webportal/server/config/index.js +++ b/src/webportal/server/config/index.js @@ -52,4 +52,4 @@ if (error) { config = value; // module exports -module.exports = config; \ No newline at end of file +module.exports = config;