Skip to content

Commit

Permalink
🛠 Applications and fixes (#1698)
Browse files Browse the repository at this point in the history
* Bootstrap applications api in node

* Fix frontend code

* Add frontend inside node for simplified deployment

* Fix node

* Update Dockerfile

* Fix docker-composes

* Include Snyk changes

* Implement applications search

* Update Twake app ID in frontend

* #1314 Add Company applications table and twake market applications table

* #1314 Improve CompanyApplicationPopup design / add Avatar component / Fix App FilePluginPreview inline type / Clean code

* #1314 Add translation keys

* Fix mentions test

* FIx applicationapi

* #1314 Re implement applications views

* Fix Sentry error TWAKE-NODE-14

* Fix #1707 and #1706 (snyk)

* Migrate applciation display data

* Re-implement simple_name -> application.code

* Fix code / simplename and connected indicator

* key => code

* Update applications usage

* Fix nginx self signed error

* Move code to app identity

* Applications are back

* Implement getCompanyApplication

* Small UI fix

* Clean code remove old files

* Re-implement apps in drive

* Fix Dockerfile

* Fix Dockerfile

* Try with build-essentials

* Fix node-sass

* Fix company rights issue

* See why cp is failing

* craco update

* Fix folder names

* Fixing tests

* Test getting more logs

* Force kill tests

* Fix statistics test

* Test initial value

* PromiseAll -> Await

* PromiseAll -> Await

Co-authored-by: Stéphane VIEIRA <svieira@linagora.com>
  • Loading branch information
2 people authored and Labels Bot committed Nov 9, 2021
1 parent a0631dd commit 43eaede
Show file tree
Hide file tree
Showing 130 changed files with 11,442 additions and 2,492 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
- uses: actions/checkout@v2
- name: unit-test
run: cd twake && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn node npm run test:unit
- name: e2e-cassandra-test
run: cd twake && docker-compose -f docker-compose.tests.yml up -d scylladb elasticsearch rabbitmq && sleep 60 && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn -e SEARCH_DRIVER=elasticsearch -e DB_DRIVER=cassandra node npm run test:e2e
- name: e2e-mongo-test
run: cd twake && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn -e SEARCH_DRIVER=mongodb -e DB_DRIVER=mongodb -e PUBSUB_TYPE=local node npm run test:e2e
- name: e2e-cassandra-test
run: cd twake && docker-compose -f docker-compose.tests.yml up -d scylladb elasticsearch rabbitmq && sleep 60 && docker-compose -f docker-compose.tests.yml run -e NODE_OPTIONS=--unhandled-rejections=warn -e SEARCH_DRIVER=elasticsearch -e DB_DRIVER=cassandra node npm run test:e2e
build:
runs-on: ubuntu-20.04
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- run: cd twake/backend/node && docker build --target production -t twaketech/twake-node -f ../../docker/twake-node/Dockerfile .
- run: cd twake && docker build --target production -t twaketech/twake-node -f docker/twake-node/Dockerfile .
3 changes: 3 additions & 0 deletions twake/backend/node/config/custom-environment-variables.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
"webserver": {
"logger": {
"level": "LOG_LEVEL"
},
"static": {
"root": "STATIC_ROOT"
}
},
"phpnode": {
Expand Down
4 changes: 4 additions & 0 deletions twake/backend/node/config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
},
"cors": {
"origin": "*"
},
"static": {
"root": "./public"
}
},
"phpnode": {
Expand Down Expand Up @@ -142,6 +145,7 @@
"tracker",
"general",
"user",
"applicationsapi",
"applications",
"channels",
"notifications",
Expand Down
Loading

0 comments on commit 43eaede

Please sign in to comment.