Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
738717fe
Commit
738717fe
authored
11 months ago
by
vkovtun
Browse files
Options
Downloads
Patches
Plain Diff
BIS-753: Added hard coded messages to the messages file.
parent
c266f90f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!40
SSDM-13578 : 2PT : Database and V3 Implementation - include the new AFS "free"...
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ui-admin/src/js/common/messages.js
+2
-0
2 additions, 0 deletions
ui-admin/src/js/common/messages.js
ui-admin/src/js/components/database/DatabaseComponent.jsx
+5
-4
5 additions, 4 deletions
ui-admin/src/js/components/database/DatabaseComponent.jsx
with
7 additions
and
4 deletions
ui-admin/src/js/common/messages.js
+
2
−
0
View file @
738717fe
...
...
@@ -104,6 +104,7 @@ const keys = {
EXPORT_SELECTION
:
'
EXPORT_SELECTION
'
,
FAIL_IF_EXISTS
:
'
FAIL_IF_EXISTS
'
,
FILE_OR_FILES
:
'
FILE_OR_FILES
'
,
FILES
:
'
FILES
'
,
FILE_NAME
:
'
FILE_NAME
'
,
FILE_UPLOAD
:
'
FILE_UPLOAD
'
,
FILTER
:
'
FILTER
'
,
...
...
@@ -443,6 +444,7 @@ const messages_en = {
[
keys
.
EXPORT_SELECTION
]:
'
Select export options
'
,
[
keys
.
FAIL_IF_EXISTS
]:
'
Fail if exists
'
,
[
keys
.
FILE_OR_FILES
]:
'
${0} file(s)
'
,
[
keys
.
FILES
]:
'
files
'
,
[
keys
.
FILE_NAME
]:
'
File name
'
,
[
keys
.
FILE_UPLOAD
]:
'
File upload
'
,
[
keys
.
FILTER
]:
'
Filter
'
,
...
...
This diff is collapsed.
Click to expand it.
ui-admin/src/js/components/database/DatabaseComponent.jsx
+
5
−
4
View file @
738717fe
...
...
@@ -16,6 +16,7 @@ import Box from '@material-ui/core/Box'
import
{
TabContext
,
TabPanel
}
from
'
@material-ui/lab
'
import
autoBind
from
'
auto-bind
'
import
{
withStyles
}
from
'
@material-ui/core/styles
'
import
messages
from
'
@src/js/common/messages.js
'
const
styles
=
theme
=>
({
tabsPanel
:
{
...
...
@@ -130,18 +131,18 @@ class DatabaseComponent extends React.PureComponent {
<
TabContext
value
=
{
value
}
>
<
Box
sx
=
{
{
borderBottom
:
1
,
borderColor
:
'
divider
'
}
}
>
<
Tabs
value
=
{
value
}
onChange
=
{
this
.
handleTabChange
}
>
<
Tab
label
=
"Data Browser"
value
=
"0"
/>
<
Tab
label
=
"Imaging Viewer"
value
=
"1"
/>
<
Tab
label
=
{
messages
.
get
(
messages
.
FILES
)
}
value
=
"0"
/>
<
Tab
label
=
{
messages
.
get
(
messages
.
IMAGES
)
}
value
=
"1"
/>
</
Tabs
>
</
Box
>
<
TabPanel
classes
=
{
{
root
:
classes
.
tabsPanel
}
}
value
=
"0"
>
<
TabPanel
classes
=
{
{
root
:
classes
.
tabsPanel
}
}
value
=
"0"
>
<
DataBrowser
id
=
{
object
.
type
+
'
-
'
+
object
.
id
}
viewType
=
'list'
sessionToken
=
{
AppController
.
getInstance
().
getSessionToken
()
}
/>
</
TabPanel
>
<
TabPanel
classes
=
{
{
root
:
classes
.
tabsPanel
}
}
value
=
"1"
>
<
TabPanel
classes
=
{
{
root
:
classes
.
tabsPanel
}
}
value
=
"1"
>
{
object
.
type
===
objectType
.
DATA_SET
&&
constants
.
IMAGING_DATA_CONFIG
in
this
.
state
.
json
.
properties
&&
<
ImagingDatasetViewer
onUnsavedChanges
=
{
this
.
imagingDatasetChange
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment