Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/kpi-centered'
Browse files Browse the repository at this point in the history
# Conflicts:
#	eda/eda_app/src/app/module/components/eda-kpi/eda-kpi.component.html
#	eda/eda_app/src/app/module/components/eda-kpi/eda-kpi.component.ts
#	eda/eda_app/src/app/module/components/eda-table/eda-table.ts
  • Loading branch information
jortilles committed Feb 19, 2024
2 parents 7bd40a7 + 3d633c0 commit 1f47b69
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions eda/docker_run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ then
mongosh --eval 'db.createCollection("data-source")' EDA
mongosh --eval 'db.createCollection("files")' EDA
mongosh --eval 'db.createCollection("features")' EDA
mongosh --eval 'db.groups.insert( { "_id": ObjectId("135792467811111111111110"), "role": "EDA_ADMIN_ROLE", "name" : "EDA_ADMIN", "users":[ ObjectId("135792467811111111111111") ] } )' EDA
mongosh --eval 'db.groups.insert( { "_id": ObjectId("135792467811111111111113"), "role": "EDA_USER_ROLE", "name" : "RO", "users":[] } )' EDA
mongosh --eval 'db.groups.insertOne( { "_id": ObjectId("135792467811111111111110"), "role": "EDA_ADMIN_ROLE", "name" : "EDA_ADMIN", "users":[ ObjectId("135792467811111111111111") ] } )' EDA
mongosh --eval 'db.groups.insertOne( { "_id": ObjectId("135792467811111111111113"), "role": "EDA_USER_ROLE", "name" : "RO", "users":[] } )' EDA
mongosh --eval 'db.groups.insert( { "_id": ObjectId("135792467811111111111115"), "role": "EDA_USER_ROLE", "name" : "EDA_DATASOURCE_CREATOR", "users":[] } )' EDA
mongosh --eval 'db.users.insert( { "_id" : ObjectId("135792467811111111111111"), "role" : [ ObjectId("135792467811111111111110") ], "name" : "EDA", "email" : "[email protected]", "password" : "$2a$10$J48xu5KAqobLzvD8FX1LOem7NZUMuXPHID1uSHzbzTbM.wGFPXjb2" } )' EDA
mongosh --eval ' db.users.insert( { "_id" : ObjectId("135792467811111111111112"), "role" : [], "name" : "edaanonim", "email" : "[email protected]", "password" : "$2a$10$ziukAcgjgTe2XPmjO1xsruKJW1HlX0I2pvCiKZHQ69DdaCzgZA4/2" } ) ' EDA
mongosh --eval 'db.users.insertOne( { "_id" : ObjectId("135792467811111111111111"), "role" : [ ObjectId("135792467811111111111110") ], "name" : "EDA", "email" : "[email protected]", "password" : "$2a$10$J48xu5KAqobLzvD8FX1LOem7NZUMuXPHID1uSHzbzTbM.wGFPXjb2" } )' EDA
mongosh --eval ' db.users.insertOne( { "_id" : ObjectId("135792467811111111111112"), "role" : [], "name" : "edaanonim", "email" : "[email protected]", "password" : "$2a$10$ziukAcgjgTe2XPmjO1xsruKJW1HlX0I2pvCiKZHQ69DdaCzgZA4/2" } ) ' EDA

npm install -g forever forever-monitor nodemon http-server

Expand Down
2 changes: 1 addition & 1 deletion eda/eda_api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "api-eda",
"version": "0.1.0",
"version": "2.0.0",
"description": "",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit 1f47b69

Please sign in to comment.