Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
TSMatch
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IIoT_external
TSMatch
Commits
372cceea
Commit
372cceea
authored
2 years ago
by
Erkan Karabulut
Browse files
Options
Downloads
Patches
Plain Diff
fix lint errors in Neo4jAdapter class
parent
bc4832b5
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
thing_discovery/src/shared/Neo4jAdapter.ts
+23
-27
23 additions, 27 deletions
thing_discovery/src/shared/Neo4jAdapter.ts
tsmatch_client/src/scene/Updates.js
+0
-1
0 additions, 1 deletion
tsmatch_client/src/scene/Updates.js
with
23 additions
and
28 deletions
thing_discovery/src/shared/Neo4jAdapter.ts
+
23
−
27
View file @
372cceea
...
...
@@ -41,28 +41,28 @@ export class Neo4jAdapter extends DbAdapterBase {
async
initDatabase
(
dbInfo
:
DbConnectionInfo
)
{
// check if the given db exists
let
database
=
await
this
.
runQuery
(
'
show databases where name=$db_name
'
,
{
"
show databases where name=$db_name
"
,
{
db_name
:
dbInfo
.
connectionOptions
.
NEO4J_DATABASE
}
)
if
(
database
==
false
)
{
let
create
_d
b
=
this
.
createDatabase
(
dbInfo
.
connectionOptions
.
NEO4J_DATABASE
);
if
(
!
create
_d
b
)
{
let
create
D
b
=
this
.
createDatabase
(
dbInfo
.
connectionOptions
.
NEO4J_DATABASE
);
if
(
!
create
D
b
)
{
NodeUtils
.
logError
(
"
Neo4J database creation is failed! Exiting...
"
);
process
.
exit
(
1
);
}
}
let
user
=
await
this
.
runQuery
(
'
show users where user=$username
'
,
{
"
show users where user=$username
"
,
{
username
:
dbInfo
.
connectionOptions
.
NEO4J_USERNAME
}
);
if
(
!
user
)
{
let
create
_u
ser
=
this
.
createUser
(
dbInfo
.
connectionOptions
.
NEO4J_USERNAME
,
dbInfo
.
connectionOptions
.
NEO4J_PASSWORD
);
if
(
!
create
_u
ser
)
{
let
create
U
ser
=
this
.
createUser
(
dbInfo
.
connectionOptions
.
NEO4J_USERNAME
,
dbInfo
.
connectionOptions
.
NEO4J_PASSWORD
);
if
(
!
create
U
ser
)
{
NodeUtils
.
logError
(
"
Couldn't create the db user! Exiting...
"
);
process
.
exit
(
1
);
}
...
...
@@ -87,26 +87,26 @@ export class Neo4jAdapter extends DbAdapterBase {
}
async
createIndexes
()
{
await
this
.
runQuery
(
`
CREATE INDEX index_sensor_objectId IF NOT EXISTS FOR (s:Sensor) ON (s.objectId)
`
,
{});
await
this
.
runQuery
(
`
CREATE INDEX index_thing_objectId IF NOT EXISTS FOR (t:Thing) ON (t.objectId)
`
,
{});
await
this
.
runQuery
(
"
CREATE INDEX index_sensor_objectId IF NOT EXISTS FOR (s:Sensor) ON (s.objectId)
"
,
{});
await
this
.
runQuery
(
"
CREATE INDEX index_thing_objectId IF NOT EXISTS FOR (t:Thing) ON (t.objectId)
"
,
{});
}
/**
* Create a database with the given name
* @param db
_n
ame
* @param db
N
ame
*/
async
createDatabase
(
db
_n
ame
)
{
async
createDatabase
(
db
N
ame
)
{
let
result
=
await
this
.
runQuery
(
'
create database $db
n
ame
'
,
{
db
_n
ame
:
db
_n
ame
"
create database $db
N
ame
"
,
{
db
N
ame
:
db
N
ame
}
)
/* TODO: We don't know what result returns in case of success.
Because only enterprise version of Neo4j allows creation of a new database
In case we use the enterprise version, check if the db created successfully
*/
if
(
!
result
)
{
/* TODO: We don't know what result returns in case of success.
Because only enterprise version of Neo4j allows creation of a new database
In case we use the enterprise version, check if the db created successfully
*/
}
return
true
;
...
...
@@ -114,22 +114,18 @@ export class Neo4jAdapter extends DbAdapterBase {
/**
* Create a user with the given username and password
* @param db
_u
ser
* @param db
_user_p
assword
* @param db
U
ser
* @param db
P
assword
*/
async
createUser
(
db
_u
ser
,
db
_user_p
assword
)
{
async
createUser
(
db
U
ser
,
db
P
assword
)
{
let
result
=
await
this
.
runQuery
(
'
CREATE USER $user SET PASSWORD $password
'
,
{
user
:
db
_u
ser
,
password
:
db
_user_p
assword
"
CREATE USER $user SET PASSWORD $password
"
,
{
user
:
db
U
ser
,
password
:
db
P
assword
}
)
if
(
!
result
)
{
return
false
;
}
return
true
;
return
result
;
}
/**
...
...
This diff is collapsed.
Click to expand it.
tsmatch_client/src/scene/Updates.js
+
0
−
1
View file @
372cceea
...
...
@@ -105,7 +105,6 @@ class Updates extends React.Component {
"
min
"
:
min
,
"
max
"
:
max
,
"
currently
"
:
lastOne
});
}
...
...
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