Merge pull request #7344 from ever-co/stage

Release
ever-co · Dec 21, 2023 · efc1b0c · efc1b0c
2 parents d93164a + 54c1f41
commit efc1b0c
Show file tree

Hide file tree

Showing 49 changed files with 811 additions and 497 deletions.
diff --git a/.cspell.json b/.cspell.json
diff --git a/.deploy/api/Dockerfile b/.deploy/api/Dockerfile
@@ -88,6 +88,8 @@ ARG COMPANY_NAME
 ARG OTEL_ENABLED
 ARG OTEL_EXPORTER_OTLP_HEADERS
 ARG OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
+ARG REDIS_ENABLED
+ARG REDIS_URL
 
 FROM node:18-alpine3.17 AS dependencies
 
@@ -370,6 +372,8 @@ ENV COMPANY_NAME=${COMPANY_NAME}
 ENV OTEL_ENABLED=${OTEL_ENABLED}
 ENV OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=${OTEL_EXPORTER_OTLP_TRACES_ENDPOINT}
 ENV OTEL_EXPORTER_OTLP_HEADERS=${OTEL_EXPORTER_OTLP_HEADERS}
+ENV REDIS_ENABLED=${REDIS_ENABLED}
+ENV REDIS_URL=${REDIS_URL}
 
 EXPOSE ${API_PORT}
 

diff --git a/.deploy/k8s/k8s-manifest.civo.prod.yaml b/.deploy/k8s/k8s-manifest.civo.prod.yaml
@@ -83,6 +83,10 @@ spec:
                         value: '$DB_NAME'
                       - name: DB_PORT
                         value: '$DB_PORT'
+                      - name: REDIS_ENABLED
+                        value: '$REDIS_ENABLED'
+                      - name: REDIS_URL
+                        value: '$REDIS_URL'
                       - name: AWS_ACCESS_KEY_ID
                         value: '$AWS_ACCESS_KEY_ID'
                       - name: AWS_SECRET_ACCESS_KEY

diff --git a/.deploy/k8s/k8s-manifest.civo.stage.yaml b/.deploy/k8s/k8s-manifest.civo.stage.yaml
@@ -83,6 +83,10 @@ spec:
                         value: '$DB_NAME'
                       - name: DB_PORT
                         value: '$DB_PORT'
+                      - name: REDIS_ENABLED
+                        value: '$REDIS_ENABLED'
+                      - name: REDIS_URL
+                        value: '$REDIS_URL'
                       - name: AWS_ACCESS_KEY_ID
                         value: '$AWS_ACCESS_KEY_ID'
                       - name: AWS_SECRET_ACCESS_KEY

diff --git a/.deploy/k8s/k8s-manifest.cw.prod.yaml b/.deploy/k8s/k8s-manifest.cw.prod.yaml
@@ -109,6 +109,10 @@ spec:
                         value: '$DB_NAME'
                       - name: DB_PORT
                         value: '$DB_PORT'
+                      - name: REDIS_ENABLED
+                        value: '$REDIS_ENABLED'
+                      - name: REDIS_URL
+                        value: '$REDIS_URL'
                       - name: AWS_ACCESS_KEY_ID
                         value: '$AWS_ACCESS_KEY_ID'
                       - name: AWS_SECRET_ACCESS_KEY

diff --git a/.deploy/k8s/k8s-manifest.cw.stage.yaml b/.deploy/k8s/k8s-manifest.cw.stage.yaml
@@ -109,6 +109,10 @@ spec:
                         value: '$DB_NAME'
                       - name: DB_PORT
                         value: '$DB_PORT'
+                      - name: REDIS_ENABLED
+                        value: '$REDIS_ENABLED'
+                      - name: REDIS_URL
+                        value: '$REDIS_URL'
                       - name: AWS_ACCESS_KEY_ID
                         value: '$AWS_ACCESS_KEY_ID'
                       - name: AWS_SECRET_ACCESS_KEY

diff --git a/.deploy/k8s/k8s-manifest.prod.yaml b/.deploy/k8s/k8s-manifest.prod.yaml
@@ -62,10 +62,10 @@ spec:
                   image: registry.digitalocean.com/ever/gauzy-api:latest
                   resources:
                       requests:
-                          memory: "1536Mi"
-                          cpu: "1000m"
+                          memory: '1536Mi'
+                          cpu: '1000m'
                       limits:
-                          memory: "2048Mi"
+                          memory: '2048Mi'
                   env:
                       - name: API_HOST
                         value: 0.0.0.0
@@ -107,6 +107,10 @@ spec:
                         value: '$DB_NAME'
                       - name: DB_PORT
                         value: '$DB_PORT'
+                      - name: REDIS_ENABLED
+                        value: '$REDIS_ENABLED'
+                      - name: REDIS_URL
+                        value: '$REDIS_URL'
                       - name: AWS_ACCESS_KEY_ID
                         value: '$AWS_ACCESS_KEY_ID'
                       - name: AWS_SECRET_ACCESS_KEY

diff --git a/.deploy/k8s/k8s-manifest.stage.yaml b/.deploy/k8s/k8s-manifest.stage.yaml
@@ -101,6 +101,10 @@ spec:
                         value: '$DB_NAME'
                       - name: DB_PORT
                         value: '$DB_PORT'
+                      - name: REDIS_ENABLED
+                        value: '$REDIS_ENABLED'
+                      - name: REDIS_URL
+                        value: '$REDIS_URL'
                       - name: AWS_ACCESS_KEY_ID
                         value: '$AWS_ACCESS_KEY_ID'
                       - name: AWS_SECRET_ACCESS_KEY

diff --git a/.env.compose b/.env.compose
@@ -68,6 +68,10 @@ DB_POOL_SIZE=40
 DB_CONNECTION_TIMEOUT=1000
 DB_SLOW_QUERY_LOGGING_TIMEOUT=3000
 
+REDIS_ENABLED=true
+# redis[s]://[[username][:password]@][host][:port][/db-number]
+REDIS_URL=redis://localhost:6379
+
 EXPRESS_SESSION_SECRET=gauzy
 
 # JWT Refresh Token Configuration

diff --git a/.env.demo.compose b/.env.demo.compose
@@ -69,6 +69,11 @@ DB_POOL_SIZE=40
 DB_CONNECTION_TIMEOUT=1000
 DB_SLOW_QUERY_LOGGING_TIMEOUT=3000
 
+# we don't run Redis in basic Demo setup
+REDIS_ENABLED=false
+# redis[s]://[[username][:password]@][host][:port][/db-number]
+REDIS_URL=redis://localhost:6379
+
 EXPRESS_SESSION_SECRET=gauzy
 
 # JWT Refresh Token Configuration

diff --git a/.env.docker b/.env.docker
@@ -67,6 +67,10 @@ DB_POOL_SIZE=40
 DB_CONNECTION_TIMEOUT=1000
 DB_SLOW_QUERY_LOGGING_TIMEOUT=3000
 
+REDIS_ENABLED=false
+# redis[s]://[[username][:password]@][host][:port][/db-number]
+REDIS_URL=redis://localhost:6379
+
 EXPRESS_SESSION_SECRET=gauzy
 
 # JWT Configuration

diff --git a/.env.local b/.env.local
@@ -67,6 +67,10 @@ DB_POOL_SIZE=40
 DB_CONNECTION_TIMEOUT=1000
 DB_SLOW_QUERY_LOGGING_TIMEOUT=3000
 
+REDIS_ENABLED=false
+# redis[s]://[[username][:password]@][host][:port][/db-number]
+REDIS_URL=redis://localhost:6379
+
 EXPRESS_SESSION_SECRET=gauzy
 
 # JWT Configuration

diff --git a/.env.sample b/.env.sample
@@ -51,6 +51,10 @@ DB_TYPE=better-sqlite3
 # DB_CONNECTION_TIMEOUT=1000
 # DB_SLOW_QUERY_LOGGING_TIMEOUT=3000
 
+REDIS_ENABLED=false
+# redis[s]://[[username][:password]@][host][:port][/db-number]
+REDIS_URL=redis://localhost:6379
+
 EXPRESS_SESSION_SECRET=gauzy
 
 # JWT Configuration

diff --git a/.github/workflows/deploy-civo-prod.yml b/.github/workflows/deploy-civo-prod.yml
@@ -53,6 +53,8 @@ jobs:
           DB_PORT: '${{ secrets.DB_PORT }}'
           DB_CA_CERT: '${{ secrets.DB_CA_CERT }}'
           DB_SSL_MODE: '${{ secrets.DB_SSL_MODE }}'
+          REDIS_ENABLED: '${{ secrets.REDIS_ENABLED }}'
+          REDIS_URL: '${{ secrets.REDIS_URL }}'
           CLOUD_PROVIDER: 'CIVO'
           SENTRY_DSN: '${{ secrets.SENTRY_DSN }}'
           SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'

diff --git a/.github/workflows/deploy-civo-stage.yml b/.github/workflows/deploy-civo-stage.yml
@@ -54,6 +54,8 @@ jobs:
           DB_PORT: '${{ secrets.DB_PORT }}'
           DB_CA_CERT: '${{ secrets.DB_CA_CERT }}'
           DB_SSL_MODE: '${{ secrets.DB_SSL_MODE }}'
+          REDIS_ENABLED: '${{ secrets.REDIS_ENABLED }}'
+          REDIS_URL: '${{ secrets.REDIS_URL }}'
           CLOUD_PROVIDER: 'CIVO'
           SENTRY_DSN: '${{ secrets.SENTRY_DSN }}'
           SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'

diff --git a/.github/workflows/deploy-cw-prod.yml b/.github/workflows/deploy-cw-prod.yml
@@ -53,6 +53,8 @@ jobs:
           DB_PORT: '${{ secrets.DB_PORT }}'
           DB_CA_CERT: '${{ secrets.DB_CA_CERT }}'
           DB_SSL_MODE: '${{ secrets.DB_SSL_MODE }}'
+          REDIS_ENABLED: '${{ secrets.REDIS_ENABLED }}'
+          REDIS_URL: '${{ secrets.REDIS_URL }}'
           CLOUD_PROVIDER: 'CW'
           SENTRY_DSN: '${{ secrets.SENTRY_DSN }}'
           SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'

diff --git a/.github/workflows/deploy-cw-stage.yml b/.github/workflows/deploy-cw-stage.yml
@@ -54,6 +54,8 @@ jobs:
           DB_PORT: '${{ secrets.DB_PORT }}'
           DB_CA_CERT: '${{ secrets.DB_CA_CERT }}'
           DB_SSL_MODE: '${{ secrets.DB_SSL_MODE }}'
+          REDIS_ENABLED: '${{ secrets.REDIS_ENABLED }}'
+          REDIS_URL: '${{ secrets.REDIS_URL }}'
           CLOUD_PROVIDER: 'CW'
           SENTRY_DSN: '${{ secrets.SENTRY_DSN }}'
           SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'

diff --git a/.github/workflows/deploy-do-prod.yml b/.github/workflows/deploy-do-prod.yml
@@ -48,6 +48,8 @@ jobs:
           DB_PORT: '${{ secrets.DB_PORT }}'
           DB_CA_CERT: '${{ secrets.DB_CA_CERT }}'
           DB_SSL_MODE: '${{ secrets.DB_SSL_MODE }}'
+          REDIS_ENABLED: '${{ secrets.REDIS_ENABLED }}'
+          REDIS_URL: '${{ secrets.REDIS_URL }}'
           CLOUD_PROVIDER: 'DO'
           SENTRY_DSN: '${{ secrets.SENTRY_DSN }}'
           SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'

diff --git a/.github/workflows/deploy-do-stage.yml b/.github/workflows/deploy-do-stage.yml
@@ -49,6 +49,8 @@ jobs:
           DB_PORT: '${{ secrets.DB_PORT }}'
           DB_CA_CERT: '${{ secrets.DB_CA_CERT }}'
           DB_SSL_MODE: '${{ secrets.DB_SSL_MODE }}'
+          REDIS_ENABLED: '${{ secrets.REDIS_ENABLED }}'
+          REDIS_URL: '${{ secrets.REDIS_URL }}'
           CLOUD_PROVIDER: 'DO'
           SENTRY_DSN: '${{ secrets.SENTRY_DSN }}'
           SENTRY_TRACES_SAMPLE_RATE: '${{ secrets.SENTRY_TRACES_SAMPLE_RATE }}'

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -25,6 +25,5 @@
 		"**/public/**/*.jpg": true,
 		"**/public/**/*.pdf": true
 	},
-	"angular.enable-strict-mode-prompt": false,
-	"cSpell.words": []
+	"angular.enable-strict-mode-prompt": false
 }
diff --git a/apps/gauzy/package.json b/apps/gauzy/package.json
@@ -99,7 +99,6 @@
 		"detect-passive-events": "^1.0.4",
 		"echarts": "^5.0.1",
 		"eva-icons": "^1.1.3",
-		"express-session": "^1.17.2",
 		"fast-json-stringify": "^2.7.12",
 		"file-saver": "^2.0.5",
 		"filepond": "^4.25.1",

diff --git a/...hared/employee/edit-employee-membership-form/edit-employee-membership-form.component.html b/...hared/employee/edit-employee-membership-form/edit-employee-membership-form.component.html
@@ -55,11 +55,11 @@
 			</div>
 		</div>
 	</nb-card-header>
-	<nb-card-body *ngIf="employeeEntities?.length">
-		<div class="ml-3 mb-4">
+	<nb-card-body class="entities" *ngIf="employeeEntities?.length">
+		<div class="mb-3">
 			<strong>{{ title }}</strong>
 		</div>
-		<nb-card class="entities" *ngFor="let entity of employeeEntities">
+		<nb-card *ngFor="let entity of employeeEntities">
 			<nb-card-body>
 				{{ entity.name }}
 				<nb-actions class="float-right" e="medium">

diff --git a/...hared/employee/edit-employee-membership-form/edit-employee-membership-form.component.scss b/...hared/employee/edit-employee-membership-form/edit-employee-membership-form.component.scss
@@ -17,10 +17,16 @@
 }
 
 .entities {
-  margin-bottom: 0.5rem;
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
 }
 
 :host{
   height: 100%;
   @include dialog(var(--gauzy-card-2), var(--gauzy-card-1));
-}
+  nb-card-header,
+  nb-card-body {
+    padding: 1rem;
+  }
+}
diff --git a/apps/gauzy/src/app/@shared/employee/employee-location/employee-location.component.html b/apps/gauzy/src/app/@shared/employee/employee-location/employee-location.component.html
@@ -1,5 +1,5 @@
 <nb-card>
-	<nb-card-body>
+	<nb-card-body class="m-3">
 		<form [formGroup]="form">
 			<div class="container">
 				<div class="row">

diff --git a/apps/gauzy/src/app/@shared/employee/employee-location/employee-location.component.scss b/apps/gauzy/src/app/@shared/employee/employee-location/employee-location.component.scss
@@ -4,9 +4,12 @@
   height: 100%;
   nb-card {
     background-color: var(--gauzy-card-2);
-    height: 100%;
+    border-radius: 0;
+
     nb-card-body {
-      height: 100%;
+      background-color: var(--card-background-color);
+      border-radius: 0.625rem;
+
       form {
         display: flex;
         flex-direction: column;

diff --git a/...employee/edit-employee-profile/edit-employee-contact/edit-employee-contact.component.html b/...employee/edit-employee-profile/edit-employee-contact/edit-employee-contact.component.html
@@ -1,9 +1,11 @@
-<ga-edit-employee-membership
-	[selectedEmployee]="selectedEmployee"
-	[organizationEntities]="organizationContact"
-	[employeeEntities]="employeeContact"
-	[placeholder]="'FORM.PLACEHOLDERS.CONTACTS' | translate"
-	[title]="'EMPLOYEES_PAGE.EDIT_EMPLOYEE.EMPLOYEE_CONTACTS' | translate"
-	(entitiesAdded)="submitForm($event, false)"
-	(entitiesRemoved)="submitForm($event, true)"
-></ga-edit-employee-membership>
+<div class="container-contact">
+	<ga-edit-employee-membership
+		[selectedEmployee]="selectedEmployee"
+		[organizationEntities]="organizationContact"
+		[employeeEntities]="employeeContact"
+		[placeholder]="'FORM.PLACEHOLDERS.CONTACTS' | translate"
+		[title]="'EMPLOYEES_PAGE.EDIT_EMPLOYEE.EMPLOYEE_CONTACTS' | translate"
+		(entitiesAdded)="submitForm($event, false)"
+		(entitiesRemoved)="submitForm($event, true)"
+	></ga-edit-employee-membership>
+</div>
diff --git a/...t-employee/edit-employee-profile/edit-employee-contact/edit-employee-contact.component.ts b/...t-employee/edit-employee-profile/edit-employee-contact/edit-employee-contact.component.ts
@@ -22,6 +22,18 @@ import { ToastrService } from 'apps/gauzy/src/app/@core/services/toastr.service'
 			:host {
         		overflow-y: auto;
 				height: calc(100vh - 20.5rem);
+
+				.container-contact {
+    				background-color: var(--gauzy-card-2);
+					padding: 1rem;
+					height: 100%;
+				}
+
+				nb-card {
+					margin: 0 !important;
+					background-color: var(--gauzy-card-3) !important;
+					border-radius: var(--card-border-radius);
+				}
 			}
 		`
 	]