Skip to content

A
atlas
Commit eecff698 by pratik24mac Committed by Madhan Neethiraj
Options

ATLAS-2469: UI updates to support propagated tags

Signed-off-by: 's avatarMadhan Neethiraj <madhan@apache.org>
parent 45e38e85
Showing with 475 additions and 85 deletions
dashboardv2/gruntfile.js
...@@ -98,6 +98,7 @@ module.exports = function(grunt) { ...@@ -98,6 +98,7 @@ module.exports = function(grunt) {
'select2.full.min.js': { 'select2/dist/js': 'select2' }, 'select2.full.min.js': { 'select2/dist/js': 'select2' },
'backgrid-select-all.min.js': { 'backgrid-select-all': 'backgrid-select-all' }, 'backgrid-select-all.min.js': { 'backgrid-select-all': 'backgrid-select-all' },
'moment.min.js': { 'moment/min': 'moment/js' }, 'moment.min.js': { 'moment/min': 'moment/js' },
'moment-timezone-with-data.min.js' : {'moment-timezone/builds' : 'moment-timezone'},
'jquery.placeholder.js': { 'jquery-placeholder': 'jquery-placeholder/js' }, 'jquery.placeholder.js': { 'jquery-placeholder': 'jquery-placeholder/js' },
'platform.js': { 'platform': 'platform' }, 'platform.js': { 'platform': 'platform' },
'query-builder.standalone.min.js': { 'jQuery-QueryBuilder/dist/js': 'jQueryQueryBuilder/js' }, 'query-builder.standalone.min.js': { 'jQuery-QueryBuilder/dist/js': 'jQueryQueryBuilder/js' },
...@@ -158,7 +159,8 @@ module.exports = function(grunt) { ...@@ -158,7 +159,8 @@ module.exports = function(grunt) {
{ 'd3-tip': 'd3/' }, { 'd3-tip': 'd3/' },
{ 'dagre-d3': 'dagre-d3' }, { 'dagre-d3': 'dagre-d3' },
{ 'platform': 'platform/' }, { 'platform': 'platform/' },
{ 'jQuery-QueryBuilder': 'jQueryQueryBuilder/' } { 'jQuery-QueryBuilder': 'jQueryQueryBuilder/' },
{'moment-timezone' : 'moment-timezone'}
], ],
'LICENSE.md': [{ 'backbone.babysitter': 'backbone-babysitter' }, 'LICENSE.md': [{ 'backbone.babysitter': 'backbone-babysitter' },
{ 'backbone.wreqr': 'backbone-wreqr' }, { 'backbone.wreqr': 'backbone-wreqr' },
......
dashboardv2/package.json
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
"jquery-placeholder": "2.3.1", "jquery-placeholder": "2.3.1",
"jquery-sparkline": "2.4.0", "jquery-sparkline": "2.4.0",
"moment": "2.18.1", "moment": "2.18.1",
"moment-timezone": "^0.5.14",
"nvd3": "1.8.5", "nvd3": "1.8.5",
"platform": "1.3.4", "platform": "1.3.4",
"pnotify": "3.2.0", "pnotify": "3.2.0",
......
dashboardv2/public/css/scss/override.scss
...@@ -404,4 +404,16 @@ div.columnmanager-dropdown-container { ...@@ -404,4 +404,16 @@ div.columnmanager-dropdown-container {
.ui-pnotify-icon, .ui-pnotify-icon,
.ui-pnotify-icon span { .ui-pnotify-icon span {
padding: 2px 0px; padding: 2px 0px;
}
.btn-round-xs {
border-radius: 11px;
padding-left: 10px;
padding-right: 10px;
background-color: transparent!important;
color: #626467;
border: 1px solid black;
}
.text-center {
text-align: center !important;
} }
\ No newline at end of file
dashboardv2/public/js/main.js
...@@ -114,6 +114,12 @@ require.config({ ...@@ -114,6 +114,12 @@ require.config({
'daterangepicker': { 'daterangepicker': {
'deps': ['jquery', 'moment'] 'deps': ['jquery', 'moment']
}, },
'moment-timezone' : {
'deps' : ['moment']
},
'moment':{
'exports':['moment']
},
'nvd3': { 'nvd3': {
'deps': ['d3'] 'deps': ['d3']
}, },
...@@ -150,6 +156,7 @@ require.config({ ...@@ -150,6 +156,7 @@ require.config({
'select2': 'libs/select2/select2.full.min', 'select2': 'libs/select2/select2.full.min',
'backgrid-select-all': 'libs/backgrid-select-all/backgrid-select-all.min', 'backgrid-select-all': 'libs/backgrid-select-all/backgrid-select-all.min',
'moment': 'libs/moment/js/moment.min', 'moment': 'libs/moment/js/moment.min',
'moment-timezone': 'libs/moment-timezone/moment-timezone-with-data.min',
'jquery-ui': 'external_lib/jquery-ui/jquery-ui.min', 'jquery-ui': 'external_lib/jquery-ui/jquery-ui.min',
'pnotify': 'external_lib/pnotify/pnotify.custom.min', 'pnotify': 'external_lib/pnotify/pnotify.custom.min',
'pnotify.buttons': 'external_lib/pnotify/pnotify.custom.min', 'pnotify.buttons': 'external_lib/pnotify/pnotify.custom.min',
......
dashboardv2/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
...@@ -26,13 +26,18 @@ ...@@ -26,13 +26,18 @@
<div data-id="editButtonContainer" class="pull-right"></div> <div data-id="editButtonContainer" class="pull-right"></div>
{{/if}} {{/if}}
<div class="form-group"> <div class="form-group">
<span class="control-label-sm-pr pull-left">Tags:</span> <span class="control-label-sm-pr pull-left">Classifications:</span>
<div class="pull-left" data-id="tagList"> <div class="pull-left" data-id="tagList">
<button class="btn btn-action btn-sm" title="Add Tag" data-id="addTag"> <button class="btn btn-action btn-sm" title="Add Classification" data-id="addTag">
<i class="fa fa-plus"> </i> <i class="fa fa-plus"> </i>
</button> </button>
</div> </div>
</div> </div>
<div class="form-group" style="display: none;" data-id="propagatedTagDiv">
<span class="control-label-sm-pr pull-left">Propagated Classifications:</span>
<div class="pull-left" data-id="propagatedTagList">
</div>
</div>
</div> </div>
</div> </div>
<div class="container-fluid gray-bg"> <div class="container-fluid gray-bg">
...@@ -75,7 +80,7 @@ ...@@ -75,7 +80,7 @@
<div class="col-sm-12"> <div class="col-sm-12">
<ul class="nav nav-tabs "> <ul class="nav nav-tabs ">
<li role="properties" class="tab active"><a href="#tab-details" aria-controls="tab-details" role="tab" data-toggle="tab">Properties</a></li> <li role="properties" class="tab active"><a href="#tab-details" aria-controls="tab-details" role="tab" data-toggle="tab">Properties</a></li>
<li role="tags"><a href="#tab-tagTable" aria-controls="tab-tagTable" role="tab" data-toggle="tab">Tags</a></li> <li role="tags"><a href="#tab-tagTable" aria-controls="tab-tagTable" role="tab" data-toggle="tab">Classifications</a></li>
<li role="audits" class="tab"><a href="#tab-audit" aria-controls="tab-audit" role="tab" data-toggle="tab">Audits</a></li> <li role="audits" class="tab"><a href="#tab-audit" aria-controls="tab-audit" role="tab" data-toggle="tab">Audits</a></li>
<li role="schema" class="tab schemaTable" style="display:none"><a href="#tab-schema" aria-controls="tab-schema" role="tab" data-toggle="tab">Schema</a></li> <li role="schema" class="tab schemaTable" style="display:none"><a href="#tab-schema" aria-controls="tab-schema" role="tab" data-toggle="tab">Schema</a></li>
<li role="profile" class="tab profileTab" style="display:none"><a href="#tab-profile" aria-controls="tab-profile" role="tab" data-toggle="tab">Profile</a></li> <li role="profile" class="tab profileTab" style="display:none"><a href="#tab-profile" aria-controls="tab-profile" role="tab" data-toggle="tab">Profile</a></li>
......
dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
</div> </div>
</div> </div>
<div class="srchType tagBox clearfix"> <div class="srchType tagBox clearfix">
<span class="srchTitle">Search By Tag</span> <span class="srchTitle">Search By Classification</span>
<div> <div>
<div class="col-sm-10 no-padding"> <div class="col-sm-10 no-padding">
<select data-id="tagLOV"></select> <select data-id="tagLOV"></select>
......
dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
...@@ -38,12 +38,12 @@ ...@@ -38,12 +38,12 @@
<div class="inline" data-id="containerCheckBox" style="display: none;"> <div class="inline" data-id="containerCheckBox" style="display: none;">
<label class="checkbox-inline btn" for="inputLabel"> <label class="checkbox-inline btn" for="inputLabel">
<input type="checkbox" data-id="checkSubClassification" data-value="excludeSC"/> <input type="checkbox" data-id="checkSubClassification" data-value="excludeSC"/>
<b>Exclude sub-classification</b></label> <b>Exclude sub-classifications</b></label>
</div> </div>
<div class="inline" data-id="containerCheckBox" style="display: none;"> <div class="inline" data-id="containerCheckBox" style="display: none;">
<label class="checkbox-inline btn" for="inputLabel"> <label class="checkbox-inline btn" for="inputLabel">
<input type="checkbox" data-id="checkSubType" data-value="excludeST"/> <input type="checkbox" data-id="checkSubType" data-value="excludeST"/>
<b>Exclude sub-type</b></label> <b>Exclude sub-types</b></label>
</div> </div>
<div class="inline"> <div class="inline">
<a href="javascript:void(0)" class=" multiSelectTag assignTag btn btn-action btn-sm" style="display:none" data-id="addAssignTag"><i class="fa fa-plus"></i> Assign Tag</a> <a href="javascript:void(0)" class=" multiSelectTag assignTag btn btn-action btn-sm" style="display:none" data-id="addAssignTag"><i class="fa fa-plus"></i> Assign Tag</a>
......
dashboardv2/public/js/templates/site/SideNavLayoutView_tmpl.html
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</li> </li>
<ul class="tabs" style="width: 100%;" role="tablist"> <ul class="tabs" style="width: 100%;" role="tablist">
<li role="presentation" class="{{tabClass}}"><a href="#tab-search" aria-controls="tab-search" data-name="tab-search" role="tab" data-toggle="tab" class=""><i class="fa fa-search"></i> Search</a></li> <li role="presentation" class="{{tabClass}}"><a href="#tab-search" aria-controls="tab-search" data-name="tab-search" role="tab" data-toggle="tab" class=""><i class="fa fa-search"></i> Search</a></li>
<li role="presentation" class="{{tabClass}}"><a href="#tab-tag" aria-controls="tab-tag" data-name="tab-tag" role="tab" data-toggle="tab"><i class="fa fa-tags"></i> Tags</a></li> <li role="presentation" class="{{tabClass}}"><a href="#tab-tag" aria-controls="tab-tag" data-name="tab-tag" role="tab" data-toggle="tab"><i class="fa fa-tags"></i> Classification</a></li>
</ul> </ul>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
......
dashboardv2/public/js/templates/tag/AddTagModalView_tmpl.html
...@@ -18,9 +18,39 @@ ...@@ -18,9 +18,39 @@
<div class="form-group hide"> <div class="form-group hide">
{{#if tagModel}} {{#if tagModel}}
<h4>{{tagModel.typeName}}</h4> {{else}} <h4>{{tagModel.typeName}}</h4> {{else}}
<select class="form-control row-margin-bottom" data-id="addTagOptions" required> <div class="row modalHeight">
</select> <div class="col-md-8">
{{/if}} <select class="form-control row-margin-bottom" data-id="addTagOptions" required>
</select>
</div>
{{/if}}
<div class="col-sm-2">
<div class="inline">
<label class="checkbox-inline btn">
<input type="checkbox" data-id="checkModalTagProperty" class="input" checked /> Propagate</label>
</div>
</div>
<div class="col-sm-2">
<div class="inline-content-fr table-action-btn">
<div class="inline">
<label class="checkbox-inline btn">
<input type="checkbox" data-id="checkTimezoneProperty" class="input" /> Apply Validity Period</label>
</div>
</div>
</div>
</div>
<div class="row modalHeight" style="display: none;" data-id="timeZoneDiv">
<hr>
<div class="col-sm-12">
<div class="clearfix form-group">
<button type="button" class="btn btn-action btn-sm pull-right" data-id="addTimezoneParms"><i class="fa fa-plus"></i> Add Validity Period</button>
</div>
<div class="panel panel-default" data-id="validityPeriodBody" style="display: none;">
<div class="panel-body" data-id="addTimezoneDiv">
</div>
</div>
</div>
</div>
</div> </div>
<div class="row modalHeight"> <div class="row modalHeight">
<div class="col-sm-12"> <div class="col-sm-12">
...@@ -29,9 +59,9 @@ ...@@ -29,9 +59,9 @@
</div> </div>
</div> </div>
<div class="col-sm-12" style="display:none"> <div class="col-sm-12" style="display:none">
<p>Tag Attributes(optional)</p> <p>Classification Attributes(optional)</p>
<p class="text-gray">Add attribute values for this tag</p> <p class="text-gray">Add attribute values for this tag</p>
<div data-id="tagAttribute"></div> <div data-id="tagAttribute"></div>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file
dashboardv2/public/js/templates/tag/AddTimezoneView_tmpl.html 0 → 100644
<!--
* 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.
-->
<div class="form-group clearfix">
<div class="col-sm-4">
<label for="">Start Time</label>
<input type="text" class="form-control" name="startTime" data-id="startTime" />
</div>
<div class="col-sm-4">
<label for="">End Time</label>
<input type="text" class="form-control" name="endTime" data-id="endTime" />
</div>
<div class="col-sm-3">
<label for="">TimeZone</label>
<select class="form-control row-margin-bottom" data-id="timeZone" required>
</select>
</div>
<div class="col-sm-1 attributePlusData" align="right">
<button type="button" class="btn btn-danger btn-sm closeInput" data-id="close"><i class="fa fa-times"></i></button>
</div>
</div>
\ No newline at end of file
dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
{{#if create}} {{#if create}}
<div class="form-group"> <div class="form-group">
<div class="col-sm-12"> <div class="col-sm-12">
<label>Select tags to inherit attributes(optional)</label> <label>Select classification to inherit attributes(optional)</label>
<p class="text-gray">Attributes define additional properties for the tag</p> <p class="text-gray">Attributes define additional properties for the classification</p>
<select class="form-control" data-id="parentTagList" multiple="multiple"></select> <select class="form-control" data-id="parentTagList" multiple="multiple"></select>
</div> </div>
</div> </div>
......
dashboardv2/public/js/templates/tag/TagAttributeDetailLayoutView_tmpl.html
...@@ -23,12 +23,12 @@ ...@@ -23,12 +23,12 @@
<button type="button" data-id="editButton" class="btn btn-sm btn-action pull-right"><i class="fa fa-pencil"></i></button> <button type="button" data-id="editButton" class="btn btn-sm btn-action pull-right"><i class="fa fa-pencil"></i></button>
<p class="form-group" data-id="description"></p> <p class="form-group" data-id="description"></p>
<div class="superType form-group" style="display:none"> <div class="superType form-group" style="display:none">
<label class="control-label-sm-pr pull-left">Direct super-tags:</label> <label class="control-label-sm-pr pull-left">Direct super-classifications:</label>
<div data-id="superType" class="btn-inline"> <div data-id="superType" class="btn-inline">
</div> </div>
</div> </div>
<div class="subType form-group" style="display:none"> <div class="subType form-group" style="display:none">
<label class="control-label-sm-pr pull-left">Direct sub-tags:</label> <label class="control-label-sm-pr pull-left">Direct sub-classifications:</label>
<div data-id="subType" class="btn-inline"> <div data-id="subType" class="btn-inline">
</div> </div>
</div> </div>
......
dashboardv2/public/js/templates/tag/TagDetailTableLayoutView_tmpl.html
...@@ -16,5 +16,11 @@ ...@@ -16,5 +16,11 @@
--> -->
<div> <div>
<div class="tableOverlay"></div> <div class="tableOverlay"></div>
<div class="inline-content-fr table-action-btn">
<div class="inline" >
<label class="checkbox-inline btn">
<input type="checkbox" data-id="checkPropagtedTag" class="input" checked="true" name="queryType" value="text" name="check" value="1" /> Show Propagated Classifications</label>
</div>
</div>
<div id="r_tagTableLayoutView"></div> <div id="r_tagTableLayoutView"></div>
</div> </div>
\ No newline at end of file
dashboardv2/public/js/templates/tag/TagLayoutView_tmpl.html
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</div> --> </div> -->
<div class="row"> <div class="row">
<div class="list-view col-sm-12"> <div class="list-view col-sm-12">
<input type="text" class="form-control" data-id="offlineSearchTag" placeholder="Search Tags"> <input type="text" class="form-control" data-id="offlineSearchTag" placeholder="Search Classification">
<ul class="tag-tree" data-id="tagsList"> <ul class="tag-tree" data-id="tagsList">
</ul> </ul>
</div> </div>
......
dashboardv2/public/js/utils/CommonViewFunction.js
...@@ -43,7 +43,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum ...@@ -43,7 +43,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
skipDefaultError: true, skipDefaultError: true,
success: function(data) { success: function(data) {
Utils.notifySuccess({ Utils.notifySuccess({
content: "Tag " + options.tagName + Messages.removeSuccessMessage content: "Classification " + options.tagName + Messages.removeSuccessMessage
}); });
if (options.callback) { if (options.callback) {
options.callback(); options.callback();
...@@ -285,7 +285,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum ...@@ -285,7 +285,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
queryArray.push(typeKeyValue) queryArray.push(typeKeyValue)
} }
if (value.tag) { if (value.tag) {
var tagKeyValue = '<span class="key">Tag:</span>&nbsp<span class="value">' + _.escape(value.tag) + '</span>'; var tagKeyValue = '<span class="key">Classification:</span>&nbsp<span class="value">' + _.escape(value.tag) + '</span>';
if (tagFilters) { if (tagFilters) {
tagKeyValue += '&nbsp<span class="operator">AND</span>&nbsp(<span class="operator">' + tagFilters.condition + '</span>&nbsp(' + objToString(tagFilters) + '))'; tagKeyValue += '&nbsp<span class="operator">AND</span>&nbsp(<span class="operator">' + tagFilters.condition + '</span>&nbsp(' + objToString(tagFilters) + '))';
} }
......
dashboardv2/public/js/utils/Enums.js
...@@ -25,9 +25,9 @@ define(['require'], function(require) { ...@@ -25,9 +25,9 @@ define(['require'], function(require) {
ENTITY_CREATE: "Entity Created", ENTITY_CREATE: "Entity Created",
ENTITY_UPDATE: "Entity Updated", ENTITY_UPDATE: "Entity Updated",
ENTITY_DELETE: "Entity Deleted", ENTITY_DELETE: "Entity Deleted",
TAG_ADD: "Tag Added", TAG_ADD: "Classification Added",
TAG_DELETE: "Tag Deleted", TAG_DELETE: "Classification Deleted",
TAG_UPDATE: "Tag Updated", TAG_UPDATE: "Classification Updated",
ENTITY_IMPORT_CREATE: "Entity Created by import", ENTITY_IMPORT_CREATE: "Entity Created by import",
ENTITY_IMPORT_UPDATE: "Entity Updated by import", ENTITY_IMPORT_UPDATE: "Entity Updated by import",
ENTITY_IMPORT_DELETE: "Entity Deleted by import" ENTITY_IMPORT_DELETE: "Entity Deleted by import"
......
dashboardv2/public/js/utils/Messages.js
...@@ -23,20 +23,20 @@ define(['require'], function(require) { ...@@ -23,20 +23,20 @@ define(['require'], function(require) {
defaultErrorMessage: "Something went wrong", defaultErrorMessage: "Something went wrong",
addSuccessMessage: " has been created successfully", addSuccessMessage: " has been created successfully",
addErrorMessage: " could not be Created", addErrorMessage: " could not be Created",
removeTag: "Remove Tag Assignment", removeTag: "Remove Classification Assignment",
deleteSuccessMessage: " has been deleted successfully", deleteSuccessMessage: " has been deleted successfully",
deleteErrorMessage: " could not be deleted", deleteErrorMessage: " could not be deleted",
removeSuccessMessage: " has been removed successfully", removeSuccessMessage: " has been removed successfully",
removeErrorMessage: " could not be removed", removeErrorMessage: " could not be removed",
editSuccessMessage: " has been updated successfully", editSuccessMessage: " has been updated successfully",
assignDeletedEntity: " is deleted, tag cannot be assigned", assignDeletedEntity: " is deleted, Classification cannot be assigned",
conformation: { conformation: {
deleteMessage: "Are you sure you want to delete " deleteMessage: "Are you sure you want to delete "
}, },
search: { search: {
noRecordForPage: "No record found at ", noRecordForPage: "No record found at ",
onSamePage: "You are on the same page!", onSamePage: "You are on the same page!",
notExists: "Invalid Expression or Tag/Type has been deleted.", notExists: "Invalid Expression or Classification/Type has been deleted.",
favoriteSearch: { favoriteSearch: {
save: "Do you want to overwrite ", save: "Do you want to overwrite ",
notSelectedFavoriteElement: "Please select any one favorite search", notSelectedFavoriteElement: "Please select any one favorite search",
...@@ -44,8 +44,8 @@ define(['require'], function(require) { ...@@ -44,8 +44,8 @@ define(['require'], function(require) {
} }
}, },
tag: { tag: {
addAttributeSuccessMessage: "Tag attribute is added successfully", addAttributeSuccessMessage: "Classification attribute is added successfully",
updateTagDescriptionMessage: "Tag description is updated successfully" updateTagDescriptionMessage: "Classification description is updated successfully"
} }
}; };
return Messages; return Messages;
......
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
...@@ -50,6 +50,7 @@ define(['require', ...@@ -50,6 +50,7 @@ define(['require',
/** ui selector cache */ /** ui selector cache */
ui: { ui: {
tagClick: '[data-id="tagClick"]', tagClick: '[data-id="tagClick"]',
propagatedTagDiv: '[data-id="propagatedTagDiv"]',
title: '[data-id="title"]', title: '[data-id="title"]',
editButton: '[data-id="editButton"]', editButton: '[data-id="editButton"]',
editButtonContainer: '[data-id="editButtonContainer"]', editButtonContainer: '[data-id="editButtonContainer"]',
...@@ -59,6 +60,7 @@ define(['require', ...@@ -59,6 +60,7 @@ define(['require',
backButton: "[data-id='backButton']", backButton: "[data-id='backButton']",
addTag: '[data-id="addTag"]', addTag: '[data-id="addTag"]',
tagList: '[data-id="tagList"]', tagList: '[data-id="tagList"]',
propagatedTagList: '[data-id="propagatedTagList"]',
fullscreenPanel: "#fullscreen_panel" fullscreenPanel: "#fullscreen_panel"
}, },
templateHelpers: function() { templateHelpers: function() {
...@@ -302,12 +304,27 @@ define(['require', ...@@ -302,12 +304,27 @@ define(['require',
}, },
generateTag: function(tagObject) { generateTag: function(tagObject) {
var that = this, var that = this,
tagData = ""; tagData = "",
propagatedTagListData = "",
tag = {
'self': [],
'propagated': []
};
_.each(tagObject, function(val) { _.each(tagObject, function(val) {
tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="tagClick"><span>' + val.typeName + '</span><i class="fa fa-close" data-id="deleteTag" data-type="tag"></i></span>'; val.entityGuid === that.id ? tag['self'].push(val) : tag['propagated'].push(val);
}); });
_.each(tag.self, function(val) {
tagData += '<span class="btn btn-action btn-sm btn-icon btn-blue" title=' + val.typeName + ' data-id="tagClick"><span>' + val.typeName + '</span><i class="fa fa-close" data-id="deleteTag" data-type="tag" title="Delete Tag"></i></span>';
});
_.each(tag.propagated, function(val) {
propagatedTagListData += '<span class="btn btn-action btn-sm btn-icon btn-blue" title=' + val.typeName + ' data-id="tagClick"><span>' + val.typeName + '</span></span>';
});
propagatedTagListData !== "" ? this.ui.propagatedTagDiv.show() : this.ui.propagatedTagDiv.hide();
this.ui.tagList.find("span.btn").remove(); this.ui.tagList.find("span.btn").remove();
this.ui.propagatedTagList.find("span.btn").remove();
this.ui.tagList.prepend(tagData); this.ui.tagList.prepend(tagData);
this.ui.propagatedTagList.html(propagatedTagListData);
}, },
hideLoader: function() { hideLoader: function() {
Utils.hideTitleLoader(this.$('.page-title .fontLoader'), this.$('.entityDetail')); Utils.hideTitleLoader(this.$('.page-title .fontLoader'), this.$('.entityDetail'));
...@@ -318,19 +335,23 @@ define(['require', ...@@ -318,19 +335,23 @@ define(['require',
onClickAddTagBtn: function(e) { onClickAddTagBtn: function(e) {
var that = this; var that = this;
require(['views/tag/AddTagModalView'], function(AddTagModalView) { require(['views/tag/AddTagModalView'], function(AddTagModalView) {
var view = new AddTagModalView({ var tagList = [];
guid: that.id, _.map(that.entityObject.entity.classifications, function(obj) {
tagList: _.map(that.entityObject.entity.classifications, function(obj) { if (obj.entityGuid === that.id) {
return obj.typeName; tagList.push(obj.typeName);
}), }
callback: function() { });
that.fetchCollection(); var view = new AddTagModalView({
}, guid: that.id,
showLoader: that.showLoader.bind(that), tagList: tagList,
hideLoader: that.hideLoader.bind(that), callback: function() {
collection: that.classificationDefCollection, that.fetchCollection();
enumDefCollection: that.enumDefCollection },
}); showLoader: that.showLoader.bind(that),
hideLoader: that.hideLoader.bind(that),
collection: that.classificationDefCollection,
enumDefCollection: that.enumDefCollection
});
view.modal.on('ok', function() { view.modal.on('ok', function() {
Utils.showTitleLoader(that.$('.page-title .fontLoader'), that.$('.entityDetail')); Utils.showTitleLoader(that.$('.page-title .fontLoader'), that.$('.entityDetail'));
}); });
......
dashboardv2/public/js/views/search/SearchResultLayoutView.js
...@@ -779,7 +779,7 @@ define(['require', ...@@ -779,7 +779,7 @@ define(['require',
col = options.col; col = options.col;
if (col) { if (col) {
col['tag'] = { col['tag'] = {
label: "Tags", label: "Classifications",
cell: "Html", cell: "Html",
editable: false, editable: false,
sortable: false, sortable: false,
......
dashboardv2/public/js/views/tag/AddTagModalView.js
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
define(['require', define(['require',
'hbs!tmpl/tag/AddTagModalView_tmpl', 'hbs!tmpl/tag/AddTagModalView_tmpl',
'views/tag/AddTimezoneItemView',
'collection/VTagList', 'collection/VTagList',
'collection/VCommonList', 'collection/VCommonList',
'modules/Modal', 'modules/Modal',
...@@ -26,26 +27,61 @@ define(['require', ...@@ -26,26 +27,61 @@ define(['require',
'utils/UrlLinks', 'utils/UrlLinks',
'utils/Enums', 'utils/Enums',
'utils/Messages', 'utils/Messages',
'moment',
'moment-timezone',
'daterangepicker' 'daterangepicker'
], function(require, AddTagModalViewTmpl, VTagList, VCommonList, Modal, VEntity, Utils, UrlLinks, Enums, Messages) { ], function(require, AddTagModalViewTmpl, AddTimezoneItemView, VTagList, VCommonList, Modal, VEntity, Utils, UrlLinks, Enums, Messages, moment) {
'use strict'; 'use strict';
var AddTagModel = Marionette.LayoutView.extend({ var AddTagModel = Backbone.Marionette.CompositeView.extend({
template: AddTagModalViewTmpl, template: AddTagModalViewTmpl,
templateHelpers: function() { templateHelpers: function() {
return { return {
tagModel: this.tagModel tagModel: this.tagModel
}; };
}, },
childView: AddTimezoneItemView,
childViewOptions: function() {
return {
// saveButton: this.ui.saveButton,
parentView: this,
tagModel: this.tagModel
};
},
childViewContainer: "[data-id='addTimezoneDiv']",
regions: {}, regions: {},
ui: { ui: {
addTagOptions: "[data-id='addTagOptions']", addTagOptions: "[data-id='addTagOptions']",
tagAttribute: "[data-id='tagAttribute']" tagAttribute: "[data-id='tagAttribute']",
togglepropagated: "input[name='togglePropagated']",
checkTimeZone: "[data-id='checkTimezoneProperty']",
timeZoneDiv: "[data-id='timeZoneDiv']",
checkTagModalPropagate: "[data-id='checkModalTagProperty']",
addTimezoneParms: "[data-id='addTimezoneParms']",
validityPeriodBody: "[data-id='validityPeriodBody']"
}, },
events: function() { events: function() {
var events = {}; var events = {};
events["change " + this.ui.addTagOptions] = 'onChangeTagDefination'; events["change " + this.ui.addTagOptions] = 'onChangeTagDefination';
events["change " + this.ui.togglepropagated] = 'checkPropagtedTag';
events["change " + this.ui.checkTimeZone] = function(e) {
if (e.target.checked) {
this.ui.timeZoneDiv.show();
this.ui.validityPeriodBody.show();
if (_.isEmpty(this.collection.models)) {
this.collection.add(new Backbone.Model({
"startTime": "",
"endTime": "",
"timeZone": ""
}));
}
} else {
this.ui.timeZoneDiv.hide();
this.ui.validityPeriodBody.hide();
}
};
events["change " + this.ui.checkTagModalPropagate] = 'checkTagModalPropagate';
events["click " + this.ui.addTimezoneParms] = 'addTimezoneBtn'
return events; return events;
}, },
/** /**
...@@ -53,21 +89,29 @@ define(['require', ...@@ -53,21 +89,29 @@ define(['require',
* @constructs * @constructs
*/ */
initialize: function(options) { initialize: function(options) {
_.extend(this, _.pick(options, 'collection', 'modalCollection', 'guid', 'callback', 'multiple', 'showLoader', 'hideLoader', 'tagList', 'tagModel', 'enumDefCollection')); _.extend(this, _.pick(options, 'modalCollection', 'guid', 'callback', 'multiple', 'showLoader', 'hideLoader', 'tagList', 'tagModel', 'enumDefCollection'));
this.commonCollection = new VTagList(); this.commonCollection = new VTagList();
if (this.tagModel) {
this.collection = new Backbone.Collection(this.tagModel.validityPeriods);
} else {
this.collection = new Backbone.Collection();
}
this.tagCollection = options.collection;
var that = this, var that = this,
modalObj = { modalObj = {
title: 'Add Tag', title: 'Add Classification',
content: this, content: this,
okText: 'Add', okText: 'Add',
cancelText: "Cancel", cancelText: "Cancel",
mainClass: 'modal-lg',
allowCancel: true, allowCancel: true,
}; };
if (this.tagModel) { if (this.tagModel) {
modalObj.title = 'Edit Tag'; modalObj.title = 'Edit Classification';
modalObj.okText = 'Update'; modalObj.okText = 'Update';
} }
this.modal = new Modal(modalObj).open(); this.modal = new Modal(modalObj)
this.modal.open();
this.modal.$el.find('button.ok').attr("disabled", true); this.modal.$el.find('button.ok').attr("disabled", true);
this.on('ok', function() { this.on('ok', function() {
var tagName = this.tagModel ? this.tagModel.typeName : this.ui.addTagOptions.val(), var tagName = this.tagModel ? this.tagModel.typeName : this.ui.addTagOptions.val(),
...@@ -183,17 +227,34 @@ define(['require', ...@@ -183,17 +227,34 @@ define(['require',
onRender: function() { onRender: function() {
var that = this; var that = this;
this.hideAttributeBox(); this.propagate,
this.hideAttributeBox();
this.tagsCollection(); this.tagsCollection();
if (this.tagModel) { if (this.tagModel) {
this.fetchTagSubData(that.tagModel.typeName); this.fetchTagSubData(that.tagModel.typeName);
that.ui.checkTagModalPropagate.prop('checked', this.tagModel.propagate === true ? true : false);
that.ui.checkTimeZone.prop('checked', _.isEmpty(this.tagModel.validityPeriods) ? false : true);
if (_.isEmpty(this.tagModel.validityPeriods)) {
that.ui.timeZoneDiv.hide()
} else {
that.ui.timeZoneDiv.show();
}
that.checkTimezoneProperty(that.ui.checkTimeZone[0]);
} }
that.showAttributeBox(); that.showAttributeBox();
}, },
addTimezoneBtn: function() {
this.ui.validityPeriodBody.show();
this.collection.add(new Backbone.Model({
"startTime": "",
"endTime": "",
"timeZone": ""
}));
},
bindEvents: function() { bindEvents: function() {
var that = this; var that = this;
this.enumArr = []; this.enumArr = [];
this.listenTo(this.collection, 'reset', function() { this.listenTo(this.tagCollection, 'reset', function() {
this.tagsCollection(); this.tagsCollection();
}, this); }, this);
this.listenTo(this.commonCollection, 'reset', function() { this.listenTo(this.commonCollection, 'reset', function() {
...@@ -202,8 +263,8 @@ define(['require', ...@@ -202,8 +263,8 @@ define(['require',
}, },
tagsCollection: function() { tagsCollection: function() {
var that = this, var that = this,
str = '<option selected="selected" disabled="disabled">-- Select a tag from the dropdown list --</option>'; str = '<option selected="selected" disabled="disabled">-- Select a Classification from the dropdown list --</option>';
this.collection.fullCollection.each(function(obj, key) { this.tagCollection.fullCollection.each(function(obj, key) {
var name = Utils.getName(obj.toJSON(), 'name'); var name = Utils.getName(obj.toJSON(), 'name');
// using obj.get('name') insted of name variable because if html is presen in name then escaped name will not found in tagList. // using obj.get('name') insted of name variable because if html is presen in name then escaped name will not found in tagList.
if (_.indexOf(that.tagList, obj.get('name')) === -1) { if (_.indexOf(that.tagList, obj.get('name')) === -1) {
...@@ -227,14 +288,15 @@ define(['require', ...@@ -227,14 +288,15 @@ define(['require',
}, },
fetchTagSubData: function(tagname) { fetchTagSubData: function(tagname) {
var attributeDefs = Utils.getNestedSuperTypeObj({ var attributeDefs = Utils.getNestedSuperTypeObj({
data: this.collection.fullCollection.find({ name: tagname }).toJSON(), data: this.tagCollection.fullCollection.find({ name: tagname }).toJSON(),
collection: this.collection, collection: this.tagCollection,
attrMerge: true attrMerge: true
}); });
this.subAttributeData(attributeDefs); this.subAttributeData(attributeDefs);
}, },
showAttributeBox: function() { showAttributeBox: function() {
var that = this; var that = this,
isButtonactive;
this.$('.attrLoader').hide(); this.$('.attrLoader').hide();
this.$('.form-group.hide').removeClass('hide'); this.$('.form-group.hide').removeClass('hide');
if (this.ui.tagAttribute.children().length !== 0) { if (this.ui.tagAttribute.children().length !== 0) {
...@@ -242,10 +304,21 @@ define(['require', ...@@ -242,10 +304,21 @@ define(['require',
} }
this.ui.tagAttribute.find('input,select').on("keyup change", function(e) { this.ui.tagAttribute.find('input,select').on("keyup change", function(e) {
if (e.keyCode != 32) { if (e.keyCode != 32) {
that.modal.$el.find('button.ok').attr("disabled", false); that.buttonActive({ isButtonActive: true });
}
});
this.ui.checkTagModalPropagate.on('change', function(e) {
if (that.tagModel) {
that.buttonActive({ isButtonActive: true });
} }
}); });
}, },
buttonActive: function(option) {
if (option && option.isButtonActive) {
var isButton = option.isButtonActive;
this.modal.$el.find('button.ok').attr("disabled", isButton === true ? false : true);
}
},
hideAttributeBox: function() { hideAttributeBox: function() {
this.ui.tagAttribute.children().empty(); this.ui.tagAttribute.children().empty();
this.ui.tagAttribute.parent().hide(); this.ui.tagAttribute.parent().hide();
...@@ -314,22 +387,51 @@ define(['require', ...@@ -314,22 +387,51 @@ define(['require',
} }
}, },
checkPropagtedTag: function(e) {
if (!this.ui.togglepropagated.prop('checked')) {
this.propagate = true;
} else {
this.propagate = false;
}
},
checkTimezoneProperty: function(e) {
if (e.checked) {
this.ui.timeZoneDiv.show();
this.ui.validityPeriodBody.show();
} else {
this.ui.timeZoneDiv.hide();
this.ui.validityPeriodBody.hide();
}
},
checkTagModalPropagate: function(e) {
if (e.target.checked) {
this.propagate = true;
} else {
this.propagate = false;
}
},
saveTagData: function(options) { saveTagData: function(options) {
var that = this; var that = this;
this.entityModel = new VEntity(); this.entityModel = new VEntity();
var tagName = options.tagName, var tagName = options.tagName,
tagAttributes = options.tagAttributes, tagAttributes = options.tagAttributes,
validityPeriodVal = that.ui.checkTimeZone.is(':checked') ? that.collection.toJSON() : [],
json = { json = {
"classification": { "classification": {
"typeName": tagName, "typeName": tagName,
"attributes": tagAttributes "attributes": tagAttributes,
"propagate": _.isUndefined(that.propagate) ? true : that.propagate,
"validityPeriods": validityPeriodVal
}, },
"entityGuids": options.guid "entityGuids": options.guid
}; };
if (this.tagModel) { if (this.tagModel) {
json = [{ json = [{
"typeName": tagName, "typeName": tagName,
"attributes": tagAttributes "attributes": tagAttributes,
"propagate": _.isUndefined(that.propagate) ? true : that.propagate,
"validityPeriods": validityPeriodVal
}] }]
} }
if (this.showLoader) { if (this.showLoader) {
......
dashboardv2/public/js/views/tag/AddTimezoneItemView.js 0 → 100644
/*
* 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.
*/
define(['require',
'backbone',
'hbs!tmpl/tag/AddTimezoneView_tmpl',
'moment',
'moment-timezone',
'daterangepicker'
], function(require, Backbone, AddTimezoneViewTmpl, moment) {
'use strict';
return Backbone.Marionette.ItemView.extend(
/** @lends GlobalExclusionListView */
{
template: AddTimezoneViewTmpl,
/** Layout sub regions */
regions: {},
/** ui selector cache */
ui: {
close: "[data-id='close']",
startTime: 'input[name="startTime"]',
endTime: 'input[name="endTime"]',
timeZone: '[data-id="timeZone"]'
},
/** ui events hash */
events: function() {
var events = {};
events["change " + this.ui.startTime] = function(e) {
this.model.set({ "startTime": this.ui.startTime.val() });
this.buttonActive({ isButtonActive: true });
};
events["change " + this.ui.endTime] = function(e) {
this.model.set({ "endTime": this.ui.endTime.val() });
this.buttonActive({ isButtonActive: true });
};
events["change " + this.ui.timeZone] = function(e) {
this.model.set({ "timeZone": this.ui.timeZone.val() });
this.buttonActive({ isButtonActive: true });
};
events["click " + this.ui.close] = 'onCloseButton';
return events;
},
/**
* intialize a new GlobalExclusionComponentView Layout
* @constructs
*/
initialize: function(options) {
_.extend(this, _.pick(options, 'parentView', 'model', 'tagModel'));
},
onRender: function() {
var that = this,
dateObj = {
"singleDatePicker": true,
"showDropdowns": true,
"timePicker": true,
"startDate": new Date(),
"timePickerIncrement": 30,
"locale": {
format: 'YYYY/MM/DD HH:MM:SS'
}
},
tzstr = '<option selected="selected" disabled="disabled">-- Select Timezone --</option>';
if (this.model.get('startTime') !== "") {
this.ui.startTime.daterangepicker({
"singleDatePicker": true,
"showDropdowns": true,
"timePicker": true,
"startDate": this.model.get('startTime'),
"timePickerIncrement": 30,
"locale": {
format: 'YYYY/MM/DD HH:MM:SS'
}
});
this.ui.endTime.daterangepicker({
"singleDatePicker": true,
"showDropdowns": true,
"timePicker": true,
"startDate": this.model.get('endTime'),
"timePickerIncrement": 30,
"locale": {
format: 'YYYY/MM/DD HH:MM:SS'
}
});
this.ui.timeZone.select2({
data: moment.tz.names()
});
this.ui.timeZone.val(this.model.get('timeZone')).trigger("change", { 'manual': true });
} else {
this.ui.startTime.daterangepicker(dateObj);
this.ui.endTime.daterangepicker(dateObj);
this.ui.timeZone.html(tzstr);
this.ui.timeZone.select2({
placeholder: "Select TimeZone",
allowClear: true,
data: moment.tz.names()
});
}
},
buttonActive: function(option) {
var that = this;
if (option && option.isButtonActive && that.tagModel) {
var isButton = option.isButtonActive;
this.parentView.modal.$el.find('button.ok').attr("disabled", isButton === true ? false : true);
}
},
onCloseButton: function() {
if (this.parentView.collection.models.length > 0) {
this.model.destroy();
}
if (this.parentView.collection.models.length <= 0) {
this.parentView.ui.timeZoneDiv.hide();
this.parentView.ui.checkTimeZone.prop('checked',false);
this.parentView.modal.$el.find('button.ok').attr("disabled",true);
}
}
});
});
\ No newline at end of file
dashboardv2/public/js/views/tag/CreateTagLayoutView.js
...@@ -109,7 +109,7 @@ define(['require', ...@@ -109,7 +109,7 @@ define(['require',
if (platform.name === "IE") { if (platform.name === "IE") {
that.ui.parentTag.select2({ that.ui.parentTag.select2({
multiple: true, multiple: true,
placeholder: "Search Tags", placeholder: "Search Classification",
allowClear: true allowClear: true
}); });
} }
......
dashboardv2/public/js/views/tag/TagAttributeDetailLayoutView.js
...@@ -292,7 +292,7 @@ define(['require', ...@@ -292,7 +292,7 @@ define(['require',
], function(CreateTagLayoutView, Modal) { ], function(CreateTagLayoutView, Modal) {
var view = new CreateTagLayoutView({ 'tagCollection': that.collection, 'model': that.model, 'tag': that.tag, 'enumDefCollection': enumDefCollection }); var view = new CreateTagLayoutView({ 'tagCollection': that.collection, 'model': that.model, 'tag': that.tag, 'enumDefCollection': enumDefCollection });
that.modal = new Modal({ that.modal = new Modal({
title: 'Edit Tag', title: 'Edit Classification',
content: view, content: view,
cancelText: "Cancel", cancelText: "Cancel",
okText: 'Save', okText: 'Save',
......
dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
...@@ -44,6 +44,8 @@ define(['require', ...@@ -44,6 +44,8 @@ define(['require',
addTag: "[data-id='addTag']", addTag: "[data-id='addTag']",
deleteTag: "[data-id='delete']", deleteTag: "[data-id='delete']",
editTag: "[data-id='edit']", editTag: "[data-id='edit']",
checkPropagtedTag: "[data-id='checkPropagtedTag']",
propagatedFromClick: "[data-id='propagatedFromClick']"
}, },
/** ui events hash */ /** ui events hash */
events: function() { events: function() {
...@@ -57,6 +59,14 @@ define(['require', ...@@ -57,6 +59,14 @@ define(['require',
events["click " + this.ui.editTag] = function(e) { events["click " + this.ui.editTag] = function(e) {
this.editTagDataModal(e); this.editTagDataModal(e);
}; };
events["click " + this.ui.propagatedFromClick] = function(e) {
Utils.setUrl({
url: '#!/detailPage/' + e.currentTarget.dataset.guid,
mergeBrowserUrl: false,
trigger: true
});
};
events["click " + this.ui.checkPropagtedTag] = 'onCheckPropagtedTag';
return events; return events;
}, },
/** /**
...@@ -97,19 +107,24 @@ define(['require', ...@@ -97,19 +107,24 @@ define(['require',
}))); })));
}); });
}, },
getSchemaTableColumns: function() { getSchemaTableColumns: function(options) {
var that = this; var that = this,
var col = {}; col = {};
return this.tagCollection.constructor.getTableCols({ return this.tagCollection.constructor.getTableCols({
tag: { tag: {
label: "Tags", label: "Classification",
cell: "String", cell: "html",
editable: false, editable: false,
sortable: false, sortable: false,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, { formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) { fromRaw: function(rawValue, model) {
return model.get('typeName'); if (that.guid !== model.get('entityGuid') ) {
var propagtedFrom = ' <span class="btn btn-action btn-sm btn-icon btn-blue" title="Propagated From" data-guid='+ model.get('entityGuid') +' data-id="propagatedFromClick"><span> Propagated From </span></span>';
return '<a title="" href="#!/tag/tagAttribute/' + model.get('typeName') + '">' + model.get('typeName') + '</a>' + propagtedFrom;
} else {
return '<a title="' + model.get('typeName') + '" href="#!/tag/tagAttribute/' + model.get('typeName') + '">' + model.get('typeName') + '</a>';
}
} }
}) })
}, },
...@@ -145,7 +160,7 @@ define(['require', ...@@ -145,7 +160,7 @@ define(['require',
}) })
}, },
tool: { tool: {
label: "Tool", label: "Action",
cell: "html", cell: "html",
editable: false, editable: false,
sortable: false, sortable: false,
...@@ -154,12 +169,11 @@ define(['require', ...@@ -154,12 +169,11 @@ define(['require',
var deleteData = '<button title="Delete" class="btn btn-action btn-sm" data-id="delete" data-name="' + model.get('typeName') + '"><i class="fa fa-trash"></i></button>', var deleteData = '<button title="Delete" class="btn btn-action btn-sm" data-id="delete" data-name="' + model.get('typeName') + '"><i class="fa fa-trash"></i></button>',
editData = '<button title="Edit" class="btn btn-action btn-sm" data-id="edit" data-name="' + model.get('typeName') + '"><i class="fa fa-pencil"></i></button>', editData = '<button title="Edit" class="btn btn-action btn-sm" data-id="edit" data-name="' + model.get('typeName') + '"><i class="fa fa-pencil"></i></button>',
btnObj = null; btnObj = null;
if (model.get('attributes') === undefined) { if (that.guid === model.get('entityGuid')) {
btnObj = deleteData; return '<div class="btn-inline">' + deleteData + editData + '</div>'
} else { } else {
btnObj = deleteData + editData; return;
} }
return '<div class="btn-inline">' + btnObj + '</div>'
} }
}) })
}, },
...@@ -233,6 +247,20 @@ define(['require', ...@@ -233,6 +247,20 @@ define(['require',
'enumDefCollection': that.enumDefCollection 'enumDefCollection': that.enumDefCollection
}); });
}); });
},
onCheckPropagtedTag: function(e) {
var that = this,
tags = _.toArray(that.collectionObject.classifications),
unPropagatedTags = [];
e.stopPropagation();
if (e.target.checked) {
that.tagCollection.reset(tags);
} else {
unPropagatedTags = _.filter(tags,function(val){
return that.guid === val.entityGuid;
});
that.tagCollection.reset(unPropagatedTags);
}
} }
}); });
return TagDetailTableLayoutView; return TagDetailTableLayoutView;
......
dashboardv2/public/js/views/tag/TagLayoutView.js
...@@ -124,7 +124,7 @@ define(['require', ...@@ -124,7 +124,7 @@ define(['require',
}); });
that.ui.treeLov.html(treeStr); that.ui.treeLov.html(treeStr);
that.ui.treeLov.select2({ that.ui.treeLov.select2({
placeholder: "Search tag", placeholder: "Search Classification",
allowClear: true allowClear: true
}); });
}, },
...@@ -349,7 +349,7 @@ define(['require', ...@@ -349,7 +349,7 @@ define(['require',
var name = (!(nodeName == "BUTTON") ? that.query[that.viewType].tagName : null); var name = (!(nodeName == "BUTTON") ? that.query[that.viewType].tagName : null);
var view = new CreateTagLayoutView({ 'tagCollection': that.collection, 'selectedTag': name, 'enumDefCollection': enumDefCollection }), var view = new CreateTagLayoutView({ 'tagCollection': that.collection, 'selectedTag': name, 'enumDefCollection': enumDefCollection }),
modal = new Modal({ modal = new Modal({
title: 'Create a new tag', title: 'Create a new classification',
content: view, content: view,
cancelText: "Cancel", cancelText: "Cancel",
okCloses: false, okCloses: false,
...@@ -368,7 +368,7 @@ define(['require', ...@@ -368,7 +368,7 @@ define(['require',
modal.on('shownModal', function() { modal.on('shownModal', function() {
view.ui.parentTag.select2({ view.ui.parentTag.select2({
multiple: true, multiple: true,
placeholder: "Search Tags", placeholder: "Search Classification",
allowClear: true allowClear: true
}); });
}); });
...@@ -493,7 +493,7 @@ define(['require', ...@@ -493,7 +493,7 @@ define(['require',
that.collection.fullCollection.add(classificationDefs); that.collection.fullCollection.add(classificationDefs);
that.setUrl('#!/tag/tagAttribute/' + ref.ui.tagName.val(), true); that.setUrl('#!/tag/tagAttribute/' + ref.ui.tagName.val(), true);
Utils.notifySuccess({ Utils.notifySuccess({
content: "Tag " + that.name + Messages.addSuccessMessage content: "Classification " + that.name + Messages.addSuccessMessage
}); });
modal.trigger('cancel'); modal.trigger('cancel');
that.typeHeaders.fetch({ reset: true }); that.typeHeaders.fetch({ reset: true });
...@@ -529,9 +529,9 @@ define(['require', ...@@ -529,9 +529,9 @@ define(['require',
popoverOptions: { popoverOptions: {
content: function() { content: function() {
return "<ul>" + return "<ul>" +
"<li class='listTerm' ><i class='fa fa-search'></i> <a href='javascript:void(0)' data-fn='onSearchTag'>Search Tag</a></li>" + "<li class='listTerm' ><i class='fa fa-search'></i> <a href='javascript:void(0)' data-fn='onSearchTag'>Search Classification</a></li>" +
"<li class='listTerm' ><i class='fa fa-plus'></i> <a href='javascript:void(0)' data-fn='onClickCreateTag'>Create Sub-tag</a></li>" + "<li class='listTerm' ><i class='fa fa-plus'></i> <a href='javascript:void(0)' data-fn='onClickCreateTag'>Create Sub-classification</a></li>" +
"<li class='listTerm' ><i class='fa fa-trash-o'></i> <a href='javascript:void(0)' data-fn='onDeleteTag'>Delete Tag</a></li>" + "<li class='listTerm' ><i class='fa fa-trash-o'></i> <a href='javascript:void(0)' data-fn='onDeleteTag'>Delete Classification</a></li>" +
"</ul>"; "</ul>";
} }
} }
...@@ -563,7 +563,7 @@ define(['require', ...@@ -563,7 +563,7 @@ define(['require',
}, },
cancel: function(argument) {} cancel: function(argument) {}
} }
var text = "Are you sure you want to delete the tag" var text = "Are you sure you want to delete the classification"
notifyObj['text'] = text; notifyObj['text'] = text;
Utils.notifyConfirm(notifyObj); Utils.notifyConfirm(notifyObj);
}, },
...@@ -581,7 +581,7 @@ define(['require', ...@@ -581,7 +581,7 @@ define(['require',
data: JSON.stringify(deleteJson), data: JSON.stringify(deleteJson),
success: function() { success: function() {
Utils.notifySuccess({ Utils.notifySuccess({
content: "Tag " + that.tag + Messages.deleteSuccessMessage content: "Classification " + that.tag + Messages.deleteSuccessMessage
}); });
// if deleted tag is prviously searched then remove that tag url from save state of tab. // if deleted tag is prviously searched then remove that tag url from save state of tab.
var searchUrl = Globals.saveApplicationState.tabState.searchUrl; var searchUrl = Globals.saveApplicationState.tabState.searchUrl;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment