Return-Path: X-Original-To: apmail-atlas-commits-archive@minotaur.apache.org Delivered-To: apmail-atlas-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BFEF31858D for ; Sat, 10 Oct 2015 04:34:48 +0000 (UTC) Received: (qmail 20427 invoked by uid 500); 10 Oct 2015 04:34:48 -0000 Delivered-To: apmail-atlas-commits-archive@atlas.apache.org Received: (qmail 20398 invoked by uid 500); 10 Oct 2015 04:34:48 -0000 Mailing-List: contact commits-help@atlas.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@atlas.incubator.apache.org Delivered-To: mailing list commits@atlas.incubator.apache.org Received: (qmail 20389 invoked by uid 99); 10 Oct 2015 04:34:48 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Oct 2015 04:34:48 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 153B2C0FA4 for ; Sat, 10 Oct 2015 04:34:48 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id 0UZQARu4AyBv for ; Sat, 10 Oct 2015 04:34:33 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id ECD6642B36 for ; Sat, 10 Oct 2015 04:34:32 +0000 (UTC) Received: (qmail 20350 invoked by uid 99); 10 Oct 2015 04:34:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Oct 2015 04:34:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0B53CE04C8; Sat, 10 Oct 2015 04:34:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sumasai@apache.org To: commits@atlas.incubator.apache.org Message-Id: <6f3d17a6d6da4cb89dcb5a23446c0f35@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-atlas git commit: ATLAS-188 Provide Ability to Add Tag to Entity (sanjayp via sumasai) Date: Sat, 10 Oct 2015 04:34:32 +0000 (UTC) Repository: incubator-atlas Updated Branches: refs/heads/master 461a2a4e3 -> 4f61fff2b ATLAS-188 Provide Ability to Add Tag to Entity (sanjayp via sumasai) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/4f61fff2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/4f61fff2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/4f61fff2 Branch: refs/heads/master Commit: 4f61fff2b7467d9fa82c2dd7f81624b2ab885281 Parents: 461a2a4 Author: Suma Shivaprasad Authored: Sat Oct 10 10:04:01 2015 +0530 Committer: Suma Shivaprasad Committed: Sat Oct 10 10:04:01 2015 +0530 ---------------------------------------------------------------------- dashboard/public/css/details.css | 2 +- dashboard/public/css/tags.css | 51 +++++++ dashboard/public/index.html | 1 + dashboard/public/js/app.js | 4 +- .../public/modules/details/detailsController.js | 4 +- .../public/modules/details/detailsResource.js | 4 + .../public/modules/details/views/details.html | 1 + .../public/modules/search/views/search.html | 2 +- .../tags/definition/definitionTagsController.js | 63 +++++++++ .../tags/definition/definitionTagsModule.js | 21 +++ .../tags/definition/tagAttributeDefinition.js | 33 +++++ .../modules/tags/definition/views/add.html | 134 +++++++++++++++++++ .../tags/instance/createTagController.js | 72 ++++++++++ .../tags/instance/instanceTagsController.js | 40 ++++++ .../modules/tags/instance/instanceTagsModule.js | 21 +++ .../modules/tags/instance/views/createTag.html | 42 ++++++ .../modules/tags/instance/views/tags.html | 28 ++++ .../modules/tags/tagAttributeDefinition.js | 33 ----- dashboard/public/modules/tags/tagClasses.js | 11 ++ dashboard/public/modules/tags/tagsController.js | 63 --------- dashboard/public/modules/tags/tagsRoutes.js | 19 ++- dashboard/public/modules/tags/views/add.html | 134 ------------------- 22 files changed, 546 insertions(+), 237 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f61fff2/dashboard/public/css/details.css ---------------------------------------------------------------------- diff --git a/dashboard/public/css/details.css b/dashboard/public/css/details.css index 156d5f6..6c62bcf 100644 --- a/dashboard/public/css/details.css +++ b/dashboard/public/css/details.css @@ -18,4 +18,4 @@ .tab-content .table-bordered { border-top: none; -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f61fff2/dashboard/public/css/tags.css ---------------------------------------------------------------------- diff --git a/dashboard/public/css/tags.css b/dashboard/public/css/tags.css new file mode 100644 index 0000000..21aa89d --- /dev/null +++ b/dashboard/public/css/tags.css @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +.add-tag { + text-decoration: underline; +} + +.input-spacing{ + padding-bottom: 10px!important; +} + +.create-tag-entity .modal-footer{ + border-top: 0; +} + +.tag-list{ + border:1px solid #ddd; + padding:10px; + background-color: #F5F5F5; +} + +.tag-list ul{ + padding-left: 0px; +} + +.error{ + color:red; +} + +.tag-list ul li{ + display: inline; + line-height: 30px; + border:none; + padding: 0px; + background-color: inherit; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f61fff2/dashboard/public/index.html ---------------------------------------------------------------------- diff --git a/dashboard/public/index.html b/dashboard/public/index.html index 5ce839d..4190b5c 100644 --- a/dashboard/public/index.html +++ b/dashboard/public/index.html @@ -34,6 +34,7 @@ + http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f61fff2/dashboard/public/js/app.js ---------------------------------------------------------------------- diff --git a/dashboard/public/js/app.js b/dashboard/public/js/app.js index 82171c6..3ef1794 100644 --- a/dashboard/public/js/app.js +++ b/dashboard/public/js/app.js @@ -27,7 +27,9 @@ angular.module('dgc', ['ngCookies', 'dgc.about', 'dgc.search', 'dgc.navigation', - 'dgc.tags' + 'dgc.tags', + 'dgc.tags.instance', + 'dgc.tags.definition' ]); angular.module('dgc.system', ['dgc.system.notification']); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f61fff2/dashboard/public/modules/details/detailsController.js ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/details/detailsController.js b/dashboard/public/modules/details/detailsController.js index c469c37..538d262 100644 --- a/dashboard/public/modules/details/detailsController.js +++ b/dashboard/public/modules/details/detailsController.js @@ -36,7 +36,6 @@ angular.module('dgc.details').controller('DetailsController', ['$window', '$scop $scope.isNumber = angular.isNumber; $scope.isString = angular.isString; - $scope.onActivate = function tabActivate(tabname) { $scope.$broadcast('render-lineage', { type: tabname, @@ -47,6 +46,5 @@ angular.module('dgc.details').controller('DetailsController', ['$window', '$scop $scope.goBack = function() { $window.history.back(); }; - } -]); \ No newline at end of file +]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f61fff2/dashboard/public/modules/details/detailsResource.js ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/details/detailsResource.js b/dashboard/public/modules/details/detailsResource.js index a559e6f..a765595 100644 --- a/dashboard/public/modules/details/detailsResource.js +++ b/dashboard/public/modules/details/detailsResource.js @@ -28,6 +28,10 @@ angular.module('dgc.details').factory('DetailsResource', ['$resource', function( } }, responseType: 'json' + }, + saveTag: { + method: 'POST', + url: '/api/atlas/entity/:id/traits' } }); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f61fff2/dashboard/public/modules/details/views/details.html ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/details/views/details.html b/dashboard/public/modules/details/views/details.html index 26d81ec..f53f94d 100644 --- a/dashboard/public/modules/details/views/details.html +++ b/dashboard/public/modules/details/views/details.html @@ -41,6 +41,7 @@ + +
+
+

Tag Definition

+ +
+
+ +
+ + +
+ +
+
+
+ + +
+ +
+
+ +
+ + +
+ + + + +
+
+
+ + +
+ +
+
+
+ + +
+ +
+
+ +
+ + +
+ + true + false + + +
+
+
+ + +
+ + true + false + + +
+
+
+ + +
+ + true + false + + +
+
+ + +
+ + +
+ +
+
+ +
+
+ + +
+
+
+
+ +
+
+
+
+
+ 
{{savedTag | json}}
+
+
+
\ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f61fff2/dashboard/public/modules/tags/instance/createTagController.js ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/tags/instance/createTagController.js b/dashboard/public/modules/tags/instance/createTagController.js new file mode 100644 index 0000000..e6df24c --- /dev/null +++ b/dashboard/public/modules/tags/instance/createTagController.js @@ -0,0 +1,72 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +angular.module('dgc.tags.instance').controller('CreateTagController', ['$scope', 'DetailsResource', '$modalInstance', 'typesList', 'lodash', 'TagsResource', '$stateParams', '$rootScope', 'TagClasses', 'NotificationService', + function($scope, DetailsResource, $modalInstance, typesList, _, TagsResource, $stateParams, $rootScope, Categories, NotificationService) { + if (typesList) { + $scope.typesList = typesList; + } + $scope.categoryList = Categories; + $scope.category = 'TRAIT'; + + $scope.getAttributeDefinations = function() { + TagsResource.get({ + id: $scope.selectedType + }, function(data) { + var instanceType = Categories[$scope.category].instanceInfo(); + if (instanceType) { + var traitTypes = angular.fromJson(data.definition)[instanceType][0]; + if (traitTypes) { + $scope.propertiesList = {}; + $scope.isRequired = {}; + _.each(traitTypes.attributeDefinitions, function(value) { + $scope.propertiesList[value.name] = ''; + $scope.isRequired[value.name] = value.isRequired; + }); + } + } + + }); + }; + $scope.ok = function(tagDefinitionform) { + if (tagDefinitionform.$valid) { + var requestObject = { + "jsonClass": "org.apache.atlas.typesystem.json.InstanceSerialization$_Struct", + "typeName": $scope.selectedType, + "values": $scope.propertiesList + }; + DetailsResource.saveTag({ + id: $stateParams.id + }, requestObject).$promise.then(function() { + $rootScope.$broadcast('refreshResourceData'); + NotificationService.info('Tag "' + $scope.selectedType + '" has been added to entity', true); + $modalInstance.close(true); + }).catch(function(err) { + $scope.isError = true; + $scope.error = err.data.error; + }); + } + }; + + $scope.cancel = function() { + $modalInstance.dismiss('cancel'); + }; + } +]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f61fff2/dashboard/public/modules/tags/instance/instanceTagsController.js ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/tags/instance/instanceTagsController.js b/dashboard/public/modules/tags/instance/instanceTagsController.js new file mode 100644 index 0000000..663a8d0 --- /dev/null +++ b/dashboard/public/modules/tags/instance/instanceTagsController.js @@ -0,0 +1,40 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +angular.module('dgc.tags.instance').controller('InstanceTagController', ['$scope', 'DetailsResource', '$stateParams', '$state', + function($scope, DetailsResource, $stateParams, $state) { + $scope.id = $stateParams.id; + + function getResourceData() { + DetailsResource.get({ + id: $stateParams.id + }, function(data) { + $scope.traitsList = data.traitNames; + }); + } + $scope.openAddTag = function() { + $state.go('addTag', { + id: $scope.id + }); + }; + getResourceData(); + $scope.$on('refreshResourceData', getResourceData); + } +]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f61fff2/dashboard/public/modules/tags/instance/instanceTagsModule.js ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/tags/instance/instanceTagsModule.js b/dashboard/public/modules/tags/instance/instanceTagsModule.js new file mode 100644 index 0000000..5f7083d --- /dev/null +++ b/dashboard/public/modules/tags/instance/instanceTagsModule.js @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +'use strict'; + +angular.module('dgc.tags.instance', []); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f61fff2/dashboard/public/modules/tags/instance/views/createTag.html ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/tags/instance/views/createTag.html b/dashboard/public/modules/tags/instance/views/createTag.html new file mode 100644 index 0000000..f4db1ce --- /dev/null +++ b/dashboard/public/modules/tags/instance/views/createTag.html @@ -0,0 +1,42 @@ +
+

Add tag

+
+
+
+
+ {{error}} +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ + +
+
+
http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f61fff2/dashboard/public/modules/tags/instance/views/tags.html ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/tags/instance/views/tags.html b/dashboard/public/modules/tags/instance/views/tags.html new file mode 100644 index 0000000..33904b0 --- /dev/null +++ b/dashboard/public/modules/tags/instance/views/tags.html @@ -0,0 +1,28 @@ + +
+
+

Tags

+ +
+
\ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f61fff2/dashboard/public/modules/tags/tagAttributeDefinition.js ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/tags/tagAttributeDefinition.js b/dashboard/public/modules/tags/tagAttributeDefinition.js deleted file mode 100644 index 6b57bd1..0000000 --- a/dashboard/public/modules/tags/tagAttributeDefinition.js +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * 'License'); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an 'AS IS' BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -'use strict'; - -angular.module('dgc.tags').service('AttributeDefinition', function Attribute() { - this.getModel = function getJson() { - return { - name: null, - dataTypeName: 'string', - multiplicity: 'optional', - isComposite: false, - isUnique: false, - isIndexable: true, - reverseAttributeName: null - }; - }; -}); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f61fff2/dashboard/public/modules/tags/tagClasses.js ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/tags/tagClasses.js b/dashboard/public/modules/tags/tagClasses.js index 81ad77c..416acaa 100644 --- a/dashboard/public/modules/tags/tagClasses.js +++ b/dashboard/public/modules/tags/tagClasses.js @@ -35,6 +35,13 @@ angular.module('dgc.tags').factory('TagClasses', ['lodash', function ClassFactor CLASS: 'org.apache.atlas.typesystem.types.ClassType' }; + var instanceRespons = { + ENUM: 'enumTypes', + STRUCT: 'structTypes', + TRAIT: 'traitTypes', + SUPER: 'superTypes' + }; + function Class(classId, className) { this.tags = []; this.id = classId; @@ -65,6 +72,10 @@ angular.module('dgc.tags').factory('TagClasses', ['lodash', function ClassFactor output[classTypeKey] = this.tags; return output; }; + + this.instanceInfo = function() { + return instanceRespons[classId]; + }; } return _.chain(classes) http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f61fff2/dashboard/public/modules/tags/tagsController.js ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/tags/tagsController.js b/dashboard/public/modules/tags/tagsController.js deleted file mode 100755 index e548287..0000000 --- a/dashboard/public/modules/tags/tagsController.js +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -'use strict'; - -angular.module('dgc.tags').controller('TagsController', ['$scope', '$resource', '$state', '$stateParams', 'lodash', 'AttributeDefinition', 'TagClasses', 'TagsResource', 'NotificationService', - function($scope, $resource, $state, $stateParams, _, AttributeDefinition, Categories, TagsResource, NotificationService) { - $scope.categoryList = Categories; - $scope.category = 'TRAIT'; - $scope.tagModel = { - typeName: null, - attributeDefinitions: [] - }; - - $scope.addAttribute = function AddAttribute() { - $scope.tagModel.attributeDefinitions.push(AttributeDefinition.getModel()); - }; - - $scope.categoryChange = function CategorySwitched() { - $scope.categoryInst = Categories[$scope.category].clearTags(); - }; - - $scope.save = function saveTag(form) { - $scope.savedTag = null; - if (form.$valid) { - $scope.categoryInst = Categories[$scope.category]; - $scope.categoryInst.clearTags().addTag($scope.tagModel); - - NotificationService.reset(); - $scope.saving = true; - - TagsResource.save($scope.categoryInst.toJson()).$promise - .then(function TagCreateSuccess() { - NotificationService.info('"' + $scope.tagModel.typeName + '" has been created', false); - return TagsResource.get({ - id: $scope.tagModel.typeName - }).$promise; - }).then(function TagFound(res) { - $scope.savedTag = JSON.parse(res.definition); - }).catch(function TagCreateFailed(error) { - NotificationService.error(error.data.error, false); - }).finally(function() { - $scope.saving = false; - }); - } - }; - } -]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f61fff2/dashboard/public/modules/tags/tagsRoutes.js ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/tags/tagsRoutes.js b/dashboard/public/modules/tags/tagsRoutes.js index a15c3ba..5d768a5 100755 --- a/dashboard/public/modules/tags/tagsRoutes.js +++ b/dashboard/public/modules/tags/tagsRoutes.js @@ -22,7 +22,24 @@ angular.module('dgc.tags').config(['$stateProvider', function($stateProvider) { $stateProvider.state('tags', { url: '/tags', - templateUrl: '/modules/tags/views/add.html' + templateUrl: '/modules/tags/definition/views/add.html' + }); + $stateProvider.state('addTag', { + parent: 'details', + onEnter: ['$stateParams', '$state', '$modal', 'NavigationResource', function($stateParams, $state, $modal, NavigationResource) { + $modal.open({ + templateUrl: '/modules/tags/instance/views/createTag.html', + controller: 'CreateTagController', + windowClass: 'create-tag-entity', + resolve: { + typesList: function() { + return NavigationResource.get().$promise; + } + } + }).result.finally(function() { + $state.go('^'); + }); + }] }); } ]); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4f61fff2/dashboard/public/modules/tags/views/add.html ---------------------------------------------------------------------- diff --git a/dashboard/public/modules/tags/views/add.html b/dashboard/public/modules/tags/views/add.html deleted file mode 100755 index 05ddd89..0000000 --- a/dashboard/public/modules/tags/views/add.html +++ /dev/null @@ -1,134 +0,0 @@ - -
-
-

Tag Definition

- -
-
- -
- - -
- -
-
-
- - -
- -
-
- -
- - -
- - - - -
-
-
- - -
- -
-
-
- - -
- -
-
- -
- - -
- - true - false - - -
-
-
- - -
- - true - false - - -
-
-
- - -
- - true - false - - -
-
- - -
- - -
- -
-
- -
-
- - -
-
-
-
- -
-
-
-
-
- 
{{savedTag | json}}
-
-
-
\ No newline at end of file