Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
e3e7f2e0
Commit
e3e7f2e0
authored
5 years ago
by
sameer79
Committed by
nixonrodrigues
5 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-3526 :- UI doesn't pick the classification from Saved search body if it has *.
Signed-off-by:
nixonrodrigues
<
nixon@apache.org
>
parent
09118ca7
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
SearchLayoutView.js
dashboardv2/public/js/views/search/SearchLayoutView.js
+5
-1
ClassificationTreeLayoutView.js
...blic/js/views/search/tree/ClassificationTreeLayoutView.js
+5
-1
EntityTreeLayoutView.js
...ardv3/public/js/views/search/tree/EntityTreeLayoutView.js
+2
-4
No files found.
dashboardv2/public/js/views/search/SearchLayoutView.js
View file @
e3e7f2e0
...
@@ -462,6 +462,7 @@ define(['require',
...
@@ -462,6 +462,7 @@ define(['require',
},
},
manualRender
:
function
(
paramObj
)
{
manualRender
:
function
(
paramObj
)
{
this
.
updateQueryObject
(
paramObj
);
this
.
updateQueryObject
(
paramObj
);
this
.
renderTypeTagList
(
paramObj
);
this
.
setValues
(
paramObj
);
this
.
setValues
(
paramObj
);
},
},
getFilterBox
:
function
()
{
getFilterBox
:
function
()
{
...
@@ -489,10 +490,13 @@ define(['require',
...
@@ -489,10 +490,13 @@ define(['require',
tagStr
=
typeStr
,
tagStr
=
typeStr
,
foundNewClassification
=
false
,
foundNewClassification
=
false
,
optionsValue
=
this
.
options
.
value
;
optionsValue
=
this
.
options
.
value
;
if
(
options
&&
options
.
tag
)
{
optionsValue
=
options
;
}
this
.
typeHeaders
.
fullCollection
.
each
(
function
(
model
)
{
this
.
typeHeaders
.
fullCollection
.
each
(
function
(
model
)
{
var
name
=
Utils
.
getName
(
model
.
toJSON
(),
'name'
);
var
name
=
Utils
.
getName
(
model
.
toJSON
(),
'name'
);
if
(
model
.
get
(
'category'
)
==
'ENTITY'
&&
(
serviceTypeToBefiltered
&&
serviceTypeToBefiltered
.
length
?
_
.
contains
(
serviceTypeToBefiltered
,
model
.
get
(
'serviceType'
))
:
true
))
{
if
(
model
.
get
(
'category'
)
==
'ENTITY'
&&
(
serviceTypeToBefiltered
&&
serviceTypeToBefiltered
.
length
?
_
.
contains
(
serviceTypeToBefiltered
,
model
.
get
(
'serviceType'
))
:
true
))
{
var
entityCount
=
(
that
.
entityCountObj
.
entity
.
entityActive
[
name
]
+
(
that
.
entityCountObj
.
entity
.
entityDeleted
[
name
]
?
that
.
entityCountObj
.
entity
.
entityDeleted
[
name
]
:
0
)
);
var
entityCount
=
(
that
.
entityCountObj
.
entity
.
entityActive
[
name
]
||
0
)
+
(
that
.
entityCountObj
.
entity
.
entityDeleted
[
name
]
||
0
);
typeStr
+=
'<option value="'
+
(
name
)
+
'" data-name="'
+
(
name
)
+
'">'
+
(
name
)
+
' '
+
(
entityCount
?
"("
+
_
.
numberFormatWithComa
(
entityCount
)
+
")"
:
''
)
+
'</option>'
;
typeStr
+=
'<option value="'
+
(
name
)
+
'" data-name="'
+
(
name
)
+
'">'
+
(
name
)
+
' '
+
(
entityCount
?
"("
+
_
.
numberFormatWithComa
(
entityCount
)
+
")"
:
''
)
+
'</option>'
;
}
}
if
(
isTypeOnly
==
undefined
&&
model
.
get
(
'category'
)
==
'CLASSIFICATION'
)
{
if
(
isTypeOnly
==
undefined
&&
model
.
get
(
'category'
)
==
'CLASSIFICATION'
)
{
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
View file @
e3e7f2e0
...
@@ -114,7 +114,7 @@ define([
...
@@ -114,7 +114,7 @@ define([
}
}
if
(
code
==
13
)
{
if
(
code
==
13
)
{
var
tagValue
=
this
.
ui
.
wildCardValue
.
val
();
var
tagValue
=
this
.
ui
.
wildCardValue
.
val
();
if
(
tagValue
.
indexOf
(
"*"
)
!=
-
1
)
{
if
(
tagValue
.
indexOf
(
"*"
)
!=
-
1
)
{
that
.
findSearchResult
(
tagValue
);
that
.
findSearchResult
(
tagValue
);
}
}
...
@@ -247,6 +247,10 @@ define([
...
@@ -247,6 +247,10 @@ define([
this
.
ui
.
classificationSearchTree
.
jstree
(
true
).
deselect_all
();
this
.
ui
.
classificationSearchTree
.
jstree
(
true
).
deselect_all
();
this
.
tagId
=
null
;
this
.
tagId
=
null
;
}
else
{
}
else
{
if
((
that
.
options
.
value
.
tag
.
indexOf
(
'*'
)
!=
-
1
))
{
that
.
ui
.
classificationSearchTree
.
jstree
(
true
).
deselect_all
();
that
.
ui
.
wildCardValue
.
val
(
that
.
options
.
value
.
tag
);
}
var
dataFound
=
this
.
classificationDefCollection
.
fullCollection
.
find
(
function
(
obj
)
{
var
dataFound
=
this
.
classificationDefCollection
.
fullCollection
.
find
(
function
(
obj
)
{
return
obj
.
get
(
"name"
)
===
that
.
options
.
value
.
tag
return
obj
.
get
(
"name"
)
===
that
.
options
.
value
.
tag
});
});
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/views/search/tree/EntityTreeLayoutView.js
View file @
e3e7f2e0
...
@@ -282,10 +282,8 @@ define([
...
@@ -282,10 +282,8 @@ define([
}
}
if
(
categoryType
==
"ENTITY"
)
{
if
(
categoryType
==
"ENTITY"
)
{
var
entityCount
=
var
entityCount
=
that
.
entityCountObj
.
entity
.
entityActive
[
model
.
get
(
"name"
)]
+
(
that
.
entityCountObj
.
entity
.
entityActive
[
model
.
get
(
"name"
)]
||
0
)
+
(
that
.
entityCountObj
.
entity
.
entityDeleted
[
model
.
get
(
"name"
)]
?
(
that
.
entityCountObj
.
entity
.
entityDeleted
[
model
.
get
(
"name"
)]
||
0
),
that
.
entityCountObj
.
entity
.
entityDeleted
[
model
.
get
(
"name"
)]
:
0
),
modelname
=
entityCount
?
model
.
get
(
"name"
)
+
" ("
+
_
.
numberFormatWithComa
(
entityCount
)
+
")"
:
model
.
get
(
"name"
);
modelname
=
entityCount
?
model
.
get
(
"name"
)
+
" ("
+
_
.
numberFormatWithComa
(
entityCount
)
+
")"
:
model
.
get
(
"name"
);
if
(
that
.
options
.
value
)
{
if
(
that
.
options
.
value
)
{
isSelected
=
that
.
options
.
value
.
type
?
that
.
options
.
value
.
type
==
model
.
get
(
"name"
)
:
false
;
isSelected
=
that
.
options
.
value
.
type
?
that
.
options
.
value
.
type
==
model
.
get
(
"name"
)
:
false
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment