Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
Datahub
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
93
Issues
93
List
Boards
Labels
Service Desk
Milestones
Jira
Jira
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ICAT
Datahub
Commits
5775aa9d
Commit
5775aa9d
authored
Jun 13, 2019
by
Alejandro De Maria Antolinos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
It fixes
#171
parent
676ee218
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
5 deletions
+6
-5
src/App.js
src/App.js
+2
-2
src/components/Investigation/InvestigationTable.js
src/components/Investigation/InvestigationTable.js
+1
-1
src/containers/InvestigationsContainer.js
src/containers/InvestigationsContainer.js
+2
-1
src/containers/SearchContainer.js
src/containers/SearchContainer.js
+1
-1
No files found.
src/App.js
View file @
5775aa9d
...
...
@@ -126,7 +126,7 @@ class MyDataPage extends React.Component {
<
LoginContainer
/>
<
ExpirationLoginContainer
><
/ExpirationLoginContainer
>
<
div
style
=
{{
marginTop
:
'
30px
'
,
marginLeft
:
'
30px
'
,
marginRight
:
'
30px
'
}}
>
<
InvestigationsContainer
linkProposal
=
{
true
}
openData
=
{
true
}
investigations
=
{
this
.
props
.
myInvestigations
}
/
>
<
InvestigationsContainer
showInvestigationStats
=
{
true
}
linkProposal
=
{
true
}
openData
=
{
true
}
investigations
=
{
this
.
props
.
myInvestigations
}
/
>
<
/div
>
<
/div
>
);
...
...
@@ -153,7 +153,7 @@ class ClosedDataPage extends React.Component {
<
/Panel.Heading
>
<
Panel
>
<
Panel
.
Body
>
<
InvestigationsContainer
linkProposal
=
{
false
}
investigations
=
{
this
.
props
.
investigations
}
openData
=
{
false
}
{...
this
.
props
}
/
>
<
InvestigationsContainer
showInvestigationStats
=
{
this
.
props
.
user
.
isAdministrator
}
linkProposal
=
{
false
}
investigations
=
{
this
.
props
.
investigations
}
openData
=
{
false
}
{...
this
.
props
}
/
>
<
/Panel.Body
>
<
/Panel
>
<
/Panel
>
...
...
src/components/Investigation/InvestigationTable.js
View file @
5775aa9d
...
...
@@ -252,7 +252,7 @@ class InvestigationTable extends React.Component {
xs
:
{
hidden
:
true
},
sm
:
{
hidden
:
true
},
md
:
{
hidden
:
true
},
lg
:
{
hidden
:
!
this
.
props
.
openData
&&
!
this
.
props
.
user
.
isAdministrator
,
width
:
"
150px
"
}
lg
:
{
hidden
:
!
this
.
props
.
showInvestigationStats
,
width
:
"
150px
"
}
}
},
{
...
...
src/containers/InvestigationsContainer.js
View file @
5775aa9d
...
...
@@ -28,7 +28,8 @@ class InvestigationsContainer extends Component {
linkProposal
=
{
this
.
props
.
linkProposal
}
closedData
=
{
this
.
props
.
closedData
}
fetching
=
{
this
.
props
.
investigations
.
fetching
}
investigations
=
{
this
.
props
.
investigations
.
data
}
>
investigations
=
{
this
.
props
.
investigations
.
data
}
showInvestigationStats
=
{
this
.
props
.
showInvestigationStats
}
>
<
/InvestigationTable
>
<
/Loader
>
<
/div>
)
;
...
...
src/containers/SearchContainer.js
View file @
5775aa9d
...
...
@@ -104,7 +104,7 @@ class SearchContainer extends Component {
<
Col
xs
=
{
10
}
>
<
CategorySearch
componentId
=
"
searchbox
"
dataField
=
{[
"
escompactsearch
"
]}
dataField
=
{[
"
investigationName
"
,
"
investigationSummary
"
,
"
name
"
,
"
definition
"
,
"
sampleName
"
,
"
scanType
"
]}
categoryField
=
"
investigationName.keyword
"
queryFormat
=
"
or
"
placeholder
=
"
Search by dataset name, sample name or investigation title
"
/>
...
...
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