Skip to content

Commit

Permalink
Refers #81. Solves the crowded modules issue and decreases time requi…
Browse files Browse the repository at this point in the history
…red for opening a project.

 - Modules can now be hidden/shown on demand.
 - Added controls for quickly searching and showing modules.
 - nodeRegistry and editedNodes services have been added to keep track of modules
 - no server-side code has been affected
 - Considerable refactoring and cleaning up has been made to the designer.js/html files
RESTCOMM-493
  • Loading branch information
otsakir committed Jan 7, 2015
1 parent 13d194b commit b69e5e5
Show file tree
Hide file tree
Showing 6 changed files with 506 additions and 293 deletions.
20 changes: 4 additions & 16 deletions restcomm/restcomm.rvd/src/main/webapp/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ App.config([ '$routeProvider', function($routeProvider) {
resolve: {
authInfo: function (authentication) {return authentication.authResolver();},
projectSettings: function (projectSettingsService, $route) {return projectSettingsService.retrieve($route.current.params.projectName);},
project: function(designerService, $route) {return designerService.openProject($route.current.params.projectName);}
project: function(designerService, $route) {
return designerService.openProject($route.current.params.projectName);
}
}
})
.when('/packaging/:projectName', {
Expand Down Expand Up @@ -64,20 +66,6 @@ App.config([ '$routeProvider', function($routeProvider) {

}]);


App.factory('stepService', ['protos', function(protos) {
var stepService = {
serviceName: 'stepService',
lastStepId: 0,

newStepName: function () {
return 'step' + (++this.lastStepId);
}
};

return stepService;
}]);

App.factory( 'dragService', [function () {
var dragInfo;
var dragId = 0;
Expand Down Expand Up @@ -186,7 +174,7 @@ App.directive('autoClear', [function() {
}]
);

App.directive('valueExtractor', ['protos','accessOperationKinds','objectActions','arrayActions', function (protos,accessOperationKinds,objectActions,arrayActions) {
App.directive('valueExtractor', ['accessOperationKinds','objectActions','arrayActions', function (accessOperationKinds,objectActions,arrayActions) {
return {
restrict: 'E',
templateUrl: 'templates/directive/valueExtractor.html',
Expand Down
2 changes: 2 additions & 0 deletions restcomm/restcomm.rvd/src/main/webapp/js/app/directives.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*
angular.module('Rvd').directive('rvdModule', function (projectModules) {
return {
restrict: "A",
Expand All @@ -14,6 +15,7 @@ angular.module('Rvd').directive('rvdModule', function (projectModules) {
}
}
});
*/

angular.module('Rvd').directive('stepHeading', function () {
return {
Expand Down
71 changes: 51 additions & 20 deletions restcomm/restcomm.rvd/src/main/webapp/js/app/models.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ angular.module('Rvd').service('ModelBuilder', ['$injector', function ($injector)
var modelBuilder = {};
modelBuilder.build = function (modelName) {
var builtModel = $injector.invoke([modelName, function(model) {
var newInstance = new model();
var newInstance = new model;
return newInstance;
}]);
return builtModel;
Expand All @@ -11,6 +11,7 @@ angular.module('Rvd').service('ModelBuilder', ['$injector', function ($injector)
return modelBuilder;
}]);

/*
angular.module('Rvd').factory('ExceptionHandlingInfo', ['rvdModel', function(rvdModel) {
function ExceptionHandlingInfo() {
this.exceptionMappings = [];
Expand All @@ -24,10 +25,10 @@ angular.module('Rvd').factory('ExceptionHandlingInfo', ['rvdModel', function(rvd
else
return angular.copy(this);
}

return ExceptionHandlingInfo;
}]);

*/

angular.module('Rvd').factory('CcInfo', ['rvdModel', function(rvdModel) {
function CcInfo() {
Expand All @@ -37,29 +38,17 @@ angular.module('Rvd').factory('CcInfo', ['rvdModel', function(rvdModel) {
}
CcInfo.prototype = new rvdModel();
CcInfo.prototype.constructor = CcInfo;
/*
CcInfo.prototype.pack = function () {
if ( this.defaultNext === undefined && this.exceptionMappings.length == 0 )
return undefined;
else
return angular.copy(this);
}
*/
return CcInfo;
}]);

angular.module('Rvd').factory('nodeModel', ['rvdModel', 'nodeRegistry', 'stepPacker', function (rvdModel, nodeRegistry, stepPacker) {
function NodeModel() {
this.id = undefined;
this.name = 'module';
this.label = 'Untitled module';
this.steps = [];
this.iface = {edited:false,editLabel:false};
}
NodeModel.NodeModel(this);
}
NodeModel.prototype = new rvdModel();
NodeModel.prototype.constructor = NodeModel;
NodeModel.prototype.setId = function (newid) {
this.id = newid;
NodeModel.prototype.setName = function (newname) {
this.name = newname;
}
NodeModel.prototype.init = function(from) {
angular.extend(this, from);
Expand All @@ -69,5 +58,47 @@ angular.module('Rvd').factory('nodeModel', ['rvdModel', 'nodeRegistry', 'stepPac
}
return this;
}
NodeModel.NodeModel = function (o) {
o.name = undefined;
o.label = 'Untitled module';
o.steps = [];
o.iface = {edited:false,editLabel:false};
}
return NodeModel;
}])
}]);

angular.module('Rvd').factory('voiceNodeModel', ['nodeModel', function (nodeModel) {
function VoiceNodeModel() {
nodeModel.NodeModel(this);
this.kind = "voice";

}
VoiceNodeModel.prototype = new nodeModel();
VoiceNodeModel.prototype.constructor = VoiceNodeModel;

return VoiceNodeModel;
}]);

angular.module('Rvd').factory('smsNodeModel', ['nodeModel', function (nodeModel) {
function SmsNodeModel() {
nodeModel.NodeModel(this);
this.kind = "sms";

}
SmsNodeModel.prototype = new nodeModel();
SmsNodeModel.prototype.constructor = SmsNodeModel;

return SmsNodeModel;
}]);

angular.module('Rvd').factory('ussdNodeModel', ['nodeModel', function (nodeModel) {
function UssdNodeModel() {
nodeModel.NodeModel(this);
this.kind = "ussd";

}
UssdNodeModel.prototype = new nodeModel();
UssdNodeModel.prototype.constructor = UssdNodeModel;

return UssdNodeModel;
}]);

0 comments on commit b69e5e5

Please sign in to comment.