From a5cdbadc4aa033eff0dbf0e8008a66f8763c9e5e Mon Sep 17 00:00:00 2001 From: ChangHyun Lee Date: Thu, 30 Mar 2017 17:01:32 +0900 Subject: [PATCH] [TIC-Web] fix the limited number of process in mic and fix the config loading error - fix the limited number of process in mic - fix the config loading Change-Id: Ic4a46cb735d4871c0cb9b488ef739798aceeaa07 Signed-off-by: ChangHyun Lee --- controller/mic.js | 3 +- public/src/js/main.js | 8 ++-- public/src/js/model/JobModel.js | 2 - public/src/js/page/job.js | 94 +++++++++++++++++++---------------------- public/src/js/page/package.js | 23 +++------- public/src/js/util.js | 8 +--- 6 files changed, 57 insertions(+), 81 deletions(-) diff --git a/controller/mic.js b/controller/mic.js index cd4b5a5..c06e5e7 100644 --- a/controller/mic.js +++ b/controller/mic.js @@ -18,7 +18,6 @@ var AppConfig = require('../config.json'); var logger = JL('mic.js'); var PROCESS_CNT_MAX = 1; -var PROCESS_CNT_MIN = 0; var Mic = {}; @@ -35,7 +34,7 @@ var processMgr = []; var user; Mic.isAvailable = function isAvailable() { - if (processMgr.length > PROCESS_CNT_MIN && processMgr.length <= PROCESS_CNT_MAX) { + if (processMgr.length < PROCESS_CNT_MAX) { return true; } return false; diff --git a/public/src/js/main.js b/public/src/js/main.js index e93705d..b76c870 100644 --- a/public/src/js/main.js +++ b/public/src/js/main.js @@ -3,22 +3,22 @@ define([ 'bootstrap', 'bootstrap-treeview', 'js/util', - 'js/page/login', 'js/page/package', - 'js/page/settings', 'js/page/job', 'js/page/image', + 'js/page/settings', + 'js/page/login', 'js/logger' ], function ( $, bootstrap, bootstrapTreeview, Util, - Login, Package, - Settings, Job, Image, + Settings, + Login, Logger ) { 'use strict'; diff --git a/public/src/js/model/JobModel.js b/public/src/js/model/JobModel.js index ecc2473..ee337a5 100644 --- a/public/src/js/model/JobModel.js +++ b/public/src/js/model/JobModel.js @@ -20,8 +20,6 @@ define([ // define the downloadable status var DOWNLOADABLE_STATUS = 'DONE'; - // define the default status - var DEFAULT_STATUS = 'READY'; // set the config information for the app Util.getAppConfig().then(function (data) { diff --git a/public/src/js/page/job.js b/public/src/js/page/job.js index 1d1be0d..8c654ac 100644 --- a/public/src/js/page/job.js +++ b/public/src/js/page/job.js @@ -56,41 +56,41 @@ define([ ModelJobList = []; function _updateView (arrJobs) { - return new Promise(function (resolve, reject) { - logger.info('_updateView'); - var targetTableBody = $('#tic-job-table > tbody'); - targetTableBody.empty(); - - if (arrJobs.length <= 0) { - targetTableBody.append(new JobTableEmptyItem().getRow()); - } else { - // when not empty - _.forEach(arrJobs, function (value, index) { - targetTableBody.append(new JobTableItem(value, index).getRow()); - }); - - // bind events - $('#tic-job-table a.btnbiglog').on('click', function (e) { - e.preventDefault(); - Util.showBigLogView(this); - }); - - // bind events - cancel button - $('#tic-job-table a.btncancel').on('click', function (e) { - var msgData, jobId; - e.preventDefault(); - - $(this).addClass('btnnotactive'); - - jobId = $(this).data('jobid'); - msgData = { - jobId: jobId - }; + logger.info('_updateView'); + var targetTableBody = $('#tic-job-table > tbody'); + targetTableBody.empty(); + + if (arrJobs.length <= 0) { + targetTableBody.append(new JobTableEmptyItem().getRow()); + } else { + // when not empty + _.forEach(arrJobs, function (value, index) { + targetTableBody.append(new JobTableItem(value, index).getRow()); + }); - client.emit(AppConfig.EVENT.SOCKET.FS_IMAGE_ADD_KILL, msgData); - }); - } - }); + // bind events + $('#tic-job-table a.btnbiglog').on('click', function (e) { + e.preventDefault(); + Util.showBigLogView(this); + }); + + // bind events - cancel button + $('#tic-job-table a.btncancel').on('click', function (e) { + var msgData, jobId; + e.preventDefault(); + + $(this).addClass('btnnotactive'); + + jobId = $(this).data('jobid'); + msgData = { + jobId: jobId + }; + + client.emit(AppConfig.EVENT.SOCKET.FS_IMAGE_ADD_KILL, msgData); + }); + } + + client.emit(AppConfig.EVENT.SOCKET.MIC_AVAILABLE_FROM); } function _updateDataModel(result) { @@ -196,7 +196,7 @@ define([ */ client.emit(AppConfig.EVENT.SOCKET.MIC_AVAILABLE_FROM); client.on(AppConfig.EVENT.SOCKET.MIC_AVAILABLE_TO, function (data) { - $('#tic-package-create').prop('disabled', !data); + $('#tic-package-create').toggleClass('disabled', !data); }); /** @@ -234,9 +234,6 @@ define([ logger.info(AppConfig.EVENT.SOCKET.FS_IMAGE_ADD_FINISH); - // button enabled - $('#tic-package-create').prop('disabled', false); - function onError(err) { if (err) { logger.error(err); @@ -341,9 +338,6 @@ define([ // notification popup Util.showAlertDialog('Failed to create an image. The #ID is ' + jobId + '.'); - // button enabled - $('#tic-package-create').prop('disabled', false); - // update the status msgObj = { job_status: JOB_STATUS_FAILED @@ -393,7 +387,7 @@ define([ gotoPageNum(pageNum); } - function updateUserInfo (user) { + function updateUserInfo(user) { logger.info('updateUserInfo'); UserInfo = user; @@ -403,14 +397,14 @@ define([ function init () { logger.info('init'); - if (_.isEmpty(AppConfig)) { - Util.getAppConfig().then(function (data) { - AppConfig = data; - if (_.isEmpty(client)) { - _initSocket(Util.getWebSocket()); - } - }); - } + + Util.getAppConfig() + .then(function (config) { + AppConfig = config; + + client = Util.getWebSocket(); + _initSocket(client); + }); } init(); diff --git a/public/src/js/page/package.js b/public/src/js/page/package.js index 8d63835..a130bda 100644 --- a/public/src/js/page/package.js +++ b/public/src/js/page/package.js @@ -51,14 +51,6 @@ define([ return; } - // 'image creation' button is disabled - $('#tic-package-create').prop('disabled', true); - - function doConfirmCancel() { - logger.info('onClickHandlerForImgCreationBtn.doConfirmCancel'); - $('#tic-package-create').prop('disabled', false); - } - function doCreateAnImage() { var pathKsFile, imageName; logger.info('onClickHandlerForImgCreationBtn.doCreateAnImage'); @@ -107,7 +99,6 @@ define([ function onErrorGetRecipeFile(err) { logger.info('onClickHandlerForImgCreationBtn.onErrorGetRecipeFile'); logger.error(err); - $('#tic-package-create').prop('disabled', false); throw err; } @@ -142,7 +133,7 @@ define([ } function setJobModel(jobItem) { - new Promise(function (resolve, reject) { + return new Promise(function (resolve, reject) { var jobObj = jobItem[0]; newJobModel = new JobModel(jobObj); resolve(newJobModel); @@ -156,9 +147,6 @@ define([ } function doConfirmOk() { - logger.info('onClickHandlerForImgCreationBtn.doConfirmOk'); - $('#tic-package-create').prop('disabled', true); - logger.info('onClickHandlerForImgCreationBtn.addJob'); return Util.POST(AppConfig.EVENT.JOB.JOB_ADD_ONE); } @@ -174,8 +162,7 @@ define([ .then(getJobId) .then(setJobModel) .then(getRecipeFile) - .then(doCreateAnImage) - .catch(doConfirmCancel); + .then(doCreateAnImage); } function _getChecked() { @@ -872,7 +859,11 @@ define([ packageList.html(_.orderBy(_.map(list, 'name')).join('
')); } - $('#tic-package-create').toggleClass('disabled', count === 0); + if (count === 0) { + $('#tic-package-create').toggleClass('disabled', true); + } else { + Util.getWebSocket().emit(AppConfig.EVENT.SOCKET.MIC_AVAILABLE_FROM); + } } /** diff --git a/public/src/js/util.js b/public/src/js/util.js index fceeac4..f128119 100644 --- a/public/src/js/util.js +++ b/public/src/js/util.js @@ -173,13 +173,6 @@ define([ }); } }); - - // return new Promise(function (resolve, reject) { - // socket.emit('ws/app/config/from'); - // socket.on('ws/app/config/to', function (data) { - // resolve(data); - // }); - // }); } function getWebSocket() { @@ -188,6 +181,7 @@ define([ function _init() { socket = io.connect(); + getAppConfig(); } _init(); -- 2.7.4