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
0ce149e8
Commit
0ce149e8
authored
5 years ago
by
sameer79
Committed by
nixonrodrigues
5 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-3502 : UI : Atlas UI accepts the partial search for classifications
Signed-off-by:
nixonrodrigues
<
nixon@apache.org
>
parent
25044cee
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
50 additions
and
1 deletion
+50
-1
Router.js
dashboardv2/public/js/router/Router.js
+19
-0
SearchLayoutView.js
dashboardv2/public/js/views/search/SearchLayoutView.js
+10
-1
Router.js
dashboardv3/public/js/router/Router.js
+18
-0
ClassificationTreeLayoutView.js
...blic/js/views/search/tree/ClassificationTreeLayoutView.js
+3
-0
No files found.
dashboardv2/public/js/router/Router.js
View file @
0ce149e8
...
@@ -308,6 +308,25 @@ define([
...
@@ -308,6 +308,25 @@ define([
'views/search/SearchDetailLayoutView'
'views/search/SearchDetailLayoutView'
],
function
(
Header
,
SideNavLayoutView
,
SearchDetailLayoutView
)
{
],
function
(
Header
,
SideNavLayoutView
,
SearchDetailLayoutView
)
{
var
paramObj
=
Utils
.
getUrlState
.
getQueryParams
();
var
paramObj
=
Utils
.
getUrlState
.
getQueryParams
();
if
(
paramObj
.
tag
)
{
var
tagValidate
=
paramObj
.
tag
,
isTagPresent
=
false
;
if
((
tagValidate
.
indexOf
(
'*'
)
==
-
1
))
{
classificationDefCollection
.
fullCollection
.
each
(
function
(
model
)
{
var
name
=
Utils
.
getName
(
model
.
toJSON
(),
'name'
);
if
(
model
.
get
(
'category'
)
==
'CLASSIFICATION'
)
{
if
(
tagValidate
)
{
if
(
name
===
tagValidate
)
{
isTagPresent
=
true
;
}
}
}
});
if
(
!
isTagPresent
)
{
paramObj
.
tag
=
null
;
}
}
}
var
isinitialView
=
true
,
var
isinitialView
=
true
,
isTypeTagNotExists
=
false
,
isTypeTagNotExists
=
false
,
tempParam
=
_
.
extend
({},
paramObj
);
tempParam
=
_
.
extend
({},
paramObj
);
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/search/SearchLayoutView.js
View file @
0ce149e8
...
@@ -521,7 +521,16 @@ define(['require',
...
@@ -521,7 +521,16 @@ define(['require',
this
.
ui
.
tagLov
.
select2
({
this
.
ui
.
tagLov
.
select2
({
placeholder
:
"Select Classification"
,
placeholder
:
"Select Classification"
,
allowClear
:
true
,
allowClear
:
true
,
tags
:
true
tags
:
true
,
createTag
:
function
(
tag
)
{
if
(
tag
.
term
.
indexOf
(
'*'
)
!=
-
1
)
{
return
{
id
:
tag
.
term
,
text
:
tag
.
term
,
isNew
:
true
};
}
}
});
});
}
}
that
.
ui
.
typeLov
.
html
(
typeStr
);
that
.
ui
.
typeLov
.
html
(
typeStr
);
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/router/Router.js
View file @
0ce149e8
...
@@ -286,6 +286,24 @@ define([
...
@@ -286,6 +286,24 @@ define([
if
(
paramObj
.
tagFilters
)
{
if
(
paramObj
.
tagFilters
)
{
paramObj
.
tagFilters
=
null
;
paramObj
.
tagFilters
=
null
;
}
}
}
else
{
var
tagValidate
=
paramObj
.
tag
,
isTagPresent
=
false
;
if
((
tagValidate
.
indexOf
(
'*'
)
==
-
1
))
{
classificationDefCollection
.
fullCollection
.
each
(
function
(
model
)
{
var
name
=
Utils
.
getName
(
model
.
toJSON
(),
'name'
);
if
(
model
.
get
(
'category'
)
==
'CLASSIFICATION'
)
{
if
(
tagValidate
)
{
if
(
name
===
tagValidate
)
{
isTagPresent
=
true
;
}
}
}
});
if
(
!
isTagPresent
)
{
paramObj
.
tag
=
null
;
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js
View file @
0ce149e8
...
@@ -114,8 +114,11 @@ define([
...
@@ -114,8 +114,11 @@ define([
}
}
if
(
code
==
13
)
{
if
(
code
==
13
)
{
var
tagValue
=
this
.
ui
.
wildCardValue
.
val
();
var
tagValue
=
this
.
ui
.
wildCardValue
.
val
();
if
(
tagValue
.
indexOf
(
"*"
)
!=
-
1
){
that
.
findSearchResult
(
tagValue
);
that
.
findSearchResult
(
tagValue
);
}
}
}
};
};
return
events
;
return
events
;
...
...
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