Change endpoint from /api/optionControlFile/:command to

/api/v1/optionControlFile/:command

diff --git a/front-end/app/scripts/controllers/Execution.ts b/front-end/app/scripts/controllers/Execution.ts
index 9f8a37e..e9d866a 100644 (file)
--- a/front-end/app/scripts/controllers/Execution.ts
+++ b/front-end/app/scripts/controllers/Execution.ts
@@ -16,7 +16,7 @@ namespace app.controllers {
             this.$scope.$broadcast('close');
             
             // add <command> directive
-            this.MyModal.selectCommand();
+            //this.MyModal.selectCommand();
             this.commandInfoList.push(new declares.CommandInfo('mrcImageNoiseAdd'));
         }
 

diff --git a/front-end/app/scripts/services/APIEndPoint.ts b/front-end/app/scripts/services/APIEndPoint.ts
index 7b3cc16..27b546e 100644 (file)
--- a/front-end/app/scripts/services/APIEndPoint.ts
+++ b/front-end/app/scripts/services/APIEndPoint.ts
@@ -28,7 +28,7 @@ namespace app.services {
         }
 
         public getOptionControlFile(command: string): ng.resource.IResource<declares.IResponse> {
-            var endPoint = '/api/optionControlFile/' + command;
+            var endPoint = '/api/v1/optionControlFile/' + command;
             return <declares.IResponseOption>this.resource(endPoint, {}).get();
         }
 

diff --git a/front-end/dist/bundle.js b/front-end/dist/bundle.js
index 8e7e8c4..a897fd6 100644 (file)
--- a/front-end/dist/bundle.js
+++ b/front-end/dist/bundle.js
@@ -41033,7 +41033,7 @@
                        return this.$resource(endPoint, {}, { execute: execute });
                    };
                    APIEndPoint.prototype.getOptionControlFile = function (command) {
-                       var endPoint = '/api/optionControlFile/' + command;
+                       var endPoint = '/api/v1/optionControlFile/' + command;
                        return this.resource(endPoint, {}).get();
                    };
                    APIEndPoint.prototype.getFiles = function (fileId) {
@@ -41348,7 +41348,6 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.MyModal.selectCommand();
                        this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
                    };
                    Execution.prototype.open = function () {
@@ -41512,7 +41511,7 @@
                        return this.$resource(endPoint, {}, { execute: execute });
                    };
                    APIEndPoint.prototype.getOptionControlFile = function (command) {
-                       var endPoint = '/api/optionControlFile/' + command;
+                       var endPoint = '/api/v1/optionControlFile/' + command;
                        return this.resource(endPoint, {}).get();
                    };
                    APIEndPoint.prototype.getFiles = function (fileId) {
@@ -41827,7 +41826,6 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.MyModal.selectCommand();
                        this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
                    };
                    Execution.prototype.open = function () {
@@ -41991,7 +41989,7 @@
                        return this.$resource(endPoint, {}, { execute: execute });
                    };
                    APIEndPoint.prototype.getOptionControlFile = function (command) {
-                       var endPoint = '/api/optionControlFile/' + command;
+                       var endPoint = '/api/v1/optionControlFile/' + command;
                        return this.resource(endPoint, {}).get();
                    };
                    APIEndPoint.prototype.getFiles = function (fileId) {
@@ -42306,7 +42304,6 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.MyModal.selectCommand();
                        this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
                    };
                    Execution.prototype.open = function () {
@@ -42470,7 +42467,7 @@
                        return this.$resource(endPoint, {}, { execute: execute });
                    };
                    APIEndPoint.prototype.getOptionControlFile = function (command) {
-                       var endPoint = '/api/optionControlFile/' + command;
+                       var endPoint = '/api/v1/optionControlFile/' + command;
                        return this.resource(endPoint, {}).get();
                    };
                    APIEndPoint.prototype.getFiles = function (fileId) {
@@ -42785,7 +42782,6 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.MyModal.selectCommand();
                        this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
                    };
                    Execution.prototype.open = function () {
@@ -42949,7 +42945,7 @@
                        return this.$resource(endPoint, {}, { execute: execute });
                    };
                    APIEndPoint.prototype.getOptionControlFile = function (command) {
-                       var endPoint = '/api/optionControlFile/' + command;
+                       var endPoint = '/api/v1/optionControlFile/' + command;
                        return this.resource(endPoint, {}).get();
                    };
                    APIEndPoint.prototype.getFiles = function (fileId) {
@@ -43264,7 +43260,6 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.MyModal.selectCommand();
                        this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
                    };
                    Execution.prototype.open = function () {
@@ -43428,7 +43423,7 @@
                        return this.$resource(endPoint, {}, { execute: execute });
                    };
                    APIEndPoint.prototype.getOptionControlFile = function (command) {
-                       var endPoint = '/api/optionControlFile/' + command;
+                       var endPoint = '/api/v1/optionControlFile/' + command;
                        return this.resource(endPoint, {}).get();
                    };
                    APIEndPoint.prototype.getFiles = function (fileId) {
@@ -43743,7 +43738,6 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.MyModal.selectCommand();
                        this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
                    };
                    Execution.prototype.open = function () {
@@ -43907,7 +43901,7 @@
                        return this.$resource(endPoint, {}, { execute: execute });
                    };
                    APIEndPoint.prototype.getOptionControlFile = function (command) {
-                       var endPoint = '/api/optionControlFile/' + command;
+                       var endPoint = '/api/v1/optionControlFile/' + command;
                        return this.resource(endPoint, {}).get();
                    };
                    APIEndPoint.prototype.getFiles = function (fileId) {
@@ -44222,7 +44216,6 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.MyModal.selectCommand();
                        this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
                    };
                    Execution.prototype.open = function () {
@@ -44386,7 +44379,7 @@
                        return this.$resource(endPoint, {}, { execute: execute });
                    };
                    APIEndPoint.prototype.getOptionControlFile = function (command) {
-                       var endPoint = '/api/optionControlFile/' + command;
+                       var endPoint = '/api/v1/optionControlFile/' + command;
                        return this.resource(endPoint, {}).get();
                    };
                    APIEndPoint.prototype.getFiles = function (fileId) {
@@ -44701,7 +44694,6 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.MyModal.selectCommand();
                        this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
                    };
                    Execution.prototype.open = function () {
@@ -44865,7 +44857,7 @@
                        return this.$resource(endPoint, {}, { execute: execute });
                    };
                    APIEndPoint.prototype.getOptionControlFile = function (command) {
-                       var endPoint = '/api/optionControlFile/' + command;
+                       var endPoint = '/api/v1/optionControlFile/' + command;
                        return this.resource(endPoint, {}).get();
                    };
                    APIEndPoint.prototype.getFiles = function (fileId) {
@@ -45180,7 +45172,6 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.MyModal.selectCommand();
                        this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
                    };
                    Execution.prototype.open = function () {
@@ -45344,7 +45335,7 @@
                        return this.$resource(endPoint, {}, { execute: execute });
                    };
                    APIEndPoint.prototype.getOptionControlFile = function (command) {
-                       var endPoint = '/api/optionControlFile/' + command;
+                       var endPoint = '/api/v1/optionControlFile/' + command;
                        return this.resource(endPoint, {}).get();
                    };
                    APIEndPoint.prototype.getFiles = function (fileId) {
@@ -45659,7 +45650,6 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.MyModal.selectCommand();
                        this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
                    };
                    Execution.prototype.open = function () {
@@ -45823,7 +45813,7 @@
                        return this.$resource(endPoint, {}, { execute: execute });
                    };
                    APIEndPoint.prototype.getOptionControlFile = function (command) {
-                       var endPoint = '/api/optionControlFile/' + command;
+                       var endPoint = '/api/v1/optionControlFile/' + command;
                        return this.resource(endPoint, {}).get();
                    };
                    APIEndPoint.prototype.getFiles = function (fileId) {
@@ -46138,7 +46128,6 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.MyModal.selectCommand();
                        this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
                    };
                    Execution.prototype.open = function () {
@@ -46302,7 +46291,7 @@
                        return this.$resource(endPoint, {}, { execute: execute });
                    };
                    APIEndPoint.prototype.getOptionControlFile = function (command) {
-                       var endPoint = '/api/optionControlFile/' + command;
+                       var endPoint = '/api/v1/optionControlFile/' + command;
                        return this.resource(endPoint, {}).get();
                    };
                    APIEndPoint.prototype.getFiles = function (fileId) {
@@ -46617,7 +46606,6 @@
                    ;
                    Execution.prototype.add = function () {
                        this.$scope.$broadcast('close');
-                       this.MyModal.selectCommand();
                        this.commandInfoList.push(new app.declares.CommandInfo('mrcImageNoiseAdd'));
                    };
                    Execution.prototype.open = function () {

diff --git a/server/api/v1/optionControlFile/index.js b/server/api/v1/optionControlFile/index.js
new file mode 100644 (file)
index 0000000..39ae2f7
--- /dev/null
+++ b/server/api/v1/optionControlFile/index.js
@@ -0,0 +1,15 @@
+'use strict';
+
+var express = require('express');
+var router  = express.Router();
+
+router.get('/:commandName', function(req, res) {
+   var optionJSON = require(__dirname + '/../../../../user-specific-files/OptionControlFile/commands/' + req.params.commandName);
+   var info = {
+       status: 'success',
+       info: optionJSON
+   };
+   res.send(info);
+});
+
+module.exports = router;

diff --git a/server/routes.js b/server/routes.js
index d40a915..a8d8917 100644 (file)
--- a/server/routes.js
+++ b/server/routes.js
@@ -6,7 +6,7 @@ var config = require('./config');
 module.exports = function(app) {
 
     // Routing
-    app.use('/api/optionControlFile', require('./api/optionControlFile'))
+    //app.use('/api/optionControlFile', require('./api/optionControlFile'))
     /*
     app.use('/api/commandList', require('./api/commandList'))
     app.use('/api/tagList', require('./api/tagList'))
@@ -21,6 +21,7 @@ module.exports = function(app) {
     app.use('/api/v1/execution', require(__dirname + '/api/v1/execution'));
     app.use('/api/v1/workspace/', require(__dirname + '/api/v1/workspace'));
     app.use('/api/v1/all/workspace/directory', require(__dirname + '/api/v1/all/workspace/directory'));
+    app.use('/api/v1/optionControlFile', require(__dirname + '/api/v1/optionControlFile'));
 
     app.route('/*')
     .get(function(req, res) {