Skip to content

Commit

Permalink
Merge pull request #7756 from ever-co/develop
Browse files Browse the repository at this point in the history
* feat: nav menu builder service & types

* feat: base nav component & common nav module

* wip: dynamically add main nav section and items

* feat: added main nav menu section

* fix: if menu items want to removed

* fix: translate main nav menus when language changed

* wip: dynamic sidebar main nav menu

* fix: improved get tasks statistics queries

* feat: finds the employeeId associated with a given userId

* feat: applied mikro orm query for get tasks statistics

* fix: make code consistent for statistic service

* fix: removed that unnecessary InjectRepository

* chore: add more logging for #7735

* chore: revert .env local

* wip: working for total duration for given time frame

* fix: updated column defintion

* fix: task statistics for time tracking for Mikro ORM

* fix: enabled query log for task statistic

* fix: report enabled/disabled for specific organization

* fix: add organization & tenant mapping condition in leftJoin

* fix: dynamic menus add & remove based organization selection

* fix: add change detection

* fix: removed unnecessary previous organization

* fix: default selected menu item by navigation URL

* fix: enabled my tasks menu only for employee

* feat(plugin): job post plugin basic structure

* fix(env): reverted env local file

* chore(deps): added dependencies for @gauzy/job-post-plugin

* fix: export integration tenant module for job post plugin

* feat: employee job post plugin (browsing jobs from AI)

* fix: rename job-post to job-search plugin

* fix: docker build

* fix: added missing job search plugin package for server & desktop

* feat(plugin): job proposal template plugin basic structure

* feat: moved employee proposal template to plugins folder

* feat: inclusion of job proposal template plugin in APIs

* fix: docker build

* fix: added missing await/async

* fix: removed duplicate plugins

* fix: refactor  constructor function or class type

* fix: organization contact don't access proposal directly

* feat: get target repository from active transactional entity manager

* feat: get raw connection from typeorm data source

* wip: custom fields for taggable for proposals

* chore(deps): bump mysql2 from 3.9.3 to 3.9.4

Bumps [mysql2](https://github.com/sidorares/node-mysql2) from 3.9.3 to 3.9.4.
- [Release notes](https://github.com/sidorares/node-mysql2/releases)
- [Changelog](https://github.com/sidorares/node-mysql2/blob/master/Changelog.md)
- [Commits](sidorares/node-mysql2@v3.9.3...v3.9.4)

---
updated-dependencies:
- dependency-name: mysql2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

* fix: missing proposal update command handler

* feat: custom fields proposals for tag entity

* feat: custom fields for employee entity

* fix(deepscan): removed unused import

* fix: if AI integration delete hide job browse & matching menu

* fix: removed deprecated typeorm connection (use instead of entity manager)

* fix: displayed rollback pipeline transaction error

* fix: added some postfix for random emails generated by faker

* fix: appends a postfix before the "@" symbol

* refactor: switch from faker email() to exampleEmail()

* [Feat] Job Browse/Matching (Job Search Plugin) (#7749)

* fix: if AI integration delete hide job browse & matching menu

* fix: job search plugin description

* fix: removed unnecessary inverse relationships

* fix: use custom repository for job preset

* fix: columns definition for many to many relations

* feat(plugin): job matching plugin basic structure

* fix: refactor  constructor function or class type

* fix: organization contact don't access proposal directly

* fix: job matching module moved on plugin folder

* fix: added missing packages

* fix: custom embedded fields for employee entity

* fix: refactor register custom embedded entity field function

* feat: moved employee job preset to plugins folder

* fix: return employee jobPresets from custom entity fields

* fix: trying to save custom/embedded entity fields for employee entity

* feat(migration): alter custom fields for employee [table] for SQLite

* feat: add fake column for custom fields

* feat(migration): alter custom fields for employee [table] for PostgreSQL

* feat(migration): alter custom fields for employee [table] for MySQL

* fix: return updated employee job presets

* fix: added missing job matching build command

* fix: moved job matching plugin inside job search plugin

* fix: export @gauzy/core connection entity manager provider

* fix: seeding jobs data inside plugin

* fix: added public export for custom entity fields

* fix: added missing seeder module

* fix: import/export entities for plugins

* fix: will add factory reset feature for plugins

* fix: updated job preset entities

* fix: use typeorm string utils instead of lodash js

* fix: swagger defintions for employee preset APIs

* [Feat] Job Proposal Plugin (#7750)

* feat(plugin): job proposal template plugin basic structure

* feat(wip): job proposals plugins structure

* fix: duplicate identifier 'ApiProperty'

* feat: proposal update command handler

* fix: proposal module moved on plugin folder

* Revert "fix: proposal module moved on plugin folder"

This reverts commit ccdd9ff.

* fix: missing proposal update command handler

* feat: custom fields proposals for tag entity

* feat: job proposals build command

* fix: cannot find module '@core/entities/internal'

* feat(wip): job proposal plugins structure

* fix: missing proposal seeder service & module for plugin

* feat(migration): alter custom fields for tag [table]

* fix: proposal module moved on plugin folder

* fix: removed console

* feat: job proposal plugin include in API

* fix: proposal template module moved on proposal plugin folder

* fix: job proposal plugin seedable

* fix(deepscan): removed unused import

* chore(deps): bump @mikro-orm/core from ^6.1.12 to ^6.2.1

* fix: convert custom types for mikro-orm/core

* feat: embedded column decorator for custom fields (typeorm)

* fix: docker compose builds

* fix: mapped employees to the specific users

* fix: ⚠ Component ID generation collision detected

* fix: users management page API

* chore: improvements to docker compose

* chore: remove version from Docker Compose (obsolete) and add min required version to README

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: RAHUL RATHORE <[email protected]>
Co-authored-by: Rahul R <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
4 people authored Apr 18, 2024
2 parents b62e901 + 2a030e8 commit 6867929
Show file tree
Hide file tree
Showing 324 changed files with 7,098 additions and 5,193 deletions.
4 changes: 4 additions & 0 deletions .deploy/api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ COPY --chown=node:node packages/plugins/sentry-tracing/package.json ./packages/p
COPY --chown=node:node packages/plugins/product-reviews/package.json ./packages/plugins/product-reviews/
COPY --chown=node:node packages/plugins/knowledge-base/package.json ./packages/plugins/knowledge-base/
COPY --chown=node:node packages/plugins/changelog/package.json ./packages/plugins/changelog/
COPY --chown=node:node packages/plugins/job-search/package.json ./packages/plugins/job-search/
COPY --chown=node:node packages/plugins/job-proposal/package.json ./packages/plugins/job-proposal/

# We do not build here Wakatime plugin, because it used in Desktop Apps for now
# COPY --chown=node:node packages/plugins/integration-wakatime/package.json ./packages/plugins/integration-wakatime/
Expand Down Expand Up @@ -215,6 +217,8 @@ COPY --chown=node:node packages/plugins/sentry-tracing/package.json ./packages/p
COPY --chown=node:node packages/plugins/product-reviews/package.json ./packages/plugins/product-reviews/
COPY --chown=node:node packages/plugins/knowledge-base/package.json ./packages/plugins/knowledge-base/
COPY --chown=node:node packages/plugins/changelog/package.json ./packages/plugins/changelog/
COPY --chown=node:node packages/plugins/job-search/package.json ./packages/plugins/job-search/
COPY --chown=node:node packages/plugins/job-proposal/package.json ./packages/plugins/job-proposal/

# We do not build here Wakatime plugin, because it used in Desktop Apps for now
# COPY --chown=node:node packages/plugins/integration-wakatime/package.json ./packages/plugins/integration-wakatime/
Expand Down
2 changes: 2 additions & 0 deletions .deploy/webapp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,11 @@ COPY --chown=node:node packages/plugins/integration-github/package.json ./packag
COPY --chown=node:node packages/plugins/integration-jira/package.json ./packages/plugins/integration-jira/
COPY --chown=node:node packages/plugins/jitsu-analytics/package.json ./packages/plugins/jitsu-analytics/
COPY --chown=node:node packages/plugins/sentry-tracing/package.json ./packages/plugins/sentry-tracing/
COPY --chown=node:node packages/plugins/job-search/package.json ./packages/plugins/job-search/
COPY --chown=node:node packages/plugins/product-reviews/package.json ./packages/plugins/product-reviews/
COPY --chown=node:node packages/plugins/knowledge-base/package.json ./packages/plugins/knowledge-base/
COPY --chown=node:node packages/plugins/changelog/package.json ./packages/plugins/changelog/
COPY --chown=node:node packages/plugins/job-proposal/package.json ./packages/plugins/job-proposal/

# We do not build here Wakatime plugin, because it used in Desktop Apps for now
# COPY --chown=node:node packages/plugins/integration-wakatime/package.json ./packages/plugins/integration-wakatime/
Expand Down
2 changes: 1 addition & 1 deletion .env.compose
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ DB_CA_CERT=

REDIS_ENABLED=true
# redis[s]://[[username][:password]@][host][:port][/db-number]
REDIS_URL=redis://localhost:6379
REDIS_URL=redis://redis:6379

EXPRESS_SESSION_SECRET=gauzy

Expand Down
2 changes: 1 addition & 1 deletion .env.demo.compose
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ DB_CA_CERT=
# 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
REDIS_URL=redis://redis:6379

EXPRESS_SESSION_SECRET=gauzy

Expand Down
20 changes: 13 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,26 +185,32 @@ Please refer to our official [Platform Documentation](https://docs.gauzy.co) and
### With Docker Compose

- Clone repo.
- Make sure you have Docker Compose [installed locally](https://docs.docker.com/compose/install).
- Run `docker-compose up`, if you want to run the platform in production configuration using our prebuild Docker images. Check `.env.compose` file for different settings (optionally), e.g. DB type. _(Note: Docker Compose will use latest images pre-build automatically from head of `master` branch using GitHub CI/CD.)_
- Run `docker-compose -f docker-compose.demo.yml up`, if you want to run the platform in basic configuration (e.g. for Demo / explore functionality / quick run) using our prebuild Docker images. Check `.env.demo.compose` file for different settings (optionally), e.g. DB type. _(Note: Docker Compose will use latest images pre-build automatically from head of `master` branch using GitHub CI/CD.)_
- Make sure you have latest Docker Compose [installed locally](https://docs.docker.com/compose/install). Important: you need minimum [v2.20](https://docs.docker.com/compose/release-notes/#2200).
- Run `docker-compose -f docker-compose.demo.yml up`, if you want to run the platform in basic configuration (e.g. for Demo / explore functionality / quick run) using our prebuilt Docker images. Check `.env.demo.compose` file for different settings (optionally), e.g. DB type. _(Note: Docker Compose will use latest images pre-build automatically from head of `master` branch using GitHub CI/CD.)_
- Run `docker-compose up`, if you want to run the platform in production configuration using our prebuilt Docker images. Check `.env.compose` file for different settings (optionally), e.g. DB type. _(Note: Docker Compose will use latest images pre-build automatically from head of `master` branch using GitHub CI/CD.)_
- Run `docker-compose -f docker-compose.build.yml up`, if you want to build everything (code and Docker images) locally. Check `.env.compose` file for different settings (optionally), e.g. DB type. _(Note: this is extremely long process because it builds whole platform locally. Other options above are much faster!)_
- :coffee: time... It might take some time for our API to seed fake data in the DB during the first Docker Compose run, even if you used prebuild Docker images.
- :coffee: time... It might take some time for our API to seed fake data in the DB during the first Docker Compose run, even if you used prebuilt Docker images.
- Open <http://localhost:4200> in your browser.
- Login with email `[email protected]` and password: `admin` for Super Admin user.
- Login with email `[email protected]` and password: `123456` for Employee user.
- Enjoy!

Together with Gauzy, Docker Compose will run the following:
Notes:

- while demo `docker-compose.demo.yml` runs minimum amount of containers (API, Web UI and DB), other Docker Compose files run multiple infrastructure dependencies (see full list below).
- you can also run ONLY infra dependencies (without our API / Web containers) with `docker-compose -f docker-compose.infra.yml up` command. We already doing it using `include` in our main docker compose files.

Together with Gauzy, Docker Compose (i.e. `docker-compose.yml` and `docker-compose.build.yml`, not Demo `docker-compose.demo.yml`) will run the following:

- [PostgreSQL](https://www.postgresql.org) - Primary Database.
- [Pgweb](https://github.com/sosedoff/pgweb) - Cross-platform client for PostgreSQL DBs, available on <http://localhost:8081>.
- [ElasticSearch](https://github.com/elastic/elasticsearch) - Search Engine.
- [Dejavu](https://github.com/appbaseio/dejavu) - Web UI for ElasticSearch, available on <http://localhost:1358>.
- [MinIO](https://github.com/minio/minio) - Multi-Cloud ☁️ Object Storage (AWS S3 compatible).
- [Jitsu](https://github.com/jitsucom/jitsu) - Jitsu is an open-source Segment alternative. Fully scriptable data ingestion engine for modern data teams.
- [Jitsu](https://github.com/jitsucom/jitsu) - Jitsu is an open-source Segment alternative (data ingestion engine).
- [Redis](https://github.com/redis/redis) - In-memory data store/caching (also used by Jitsu)
- [Cube](https://github.com/cube-js/cube) - "Semantic Layer" used for Reports, Dashboards, Analytics, and other BI-related features, with UI available on <http://localhost:4000>.
- [Zipkin](https://github.com/openzipkin/zipkin) - distributed tracing system.

### Manually

Expand Down Expand Up @@ -256,7 +262,7 @@ Notes:

- Another variant to deploy Gauzy is to use DigitalOcean Droplets or any other virtual instance (with Ubuntu OS) and deploy using SCP/SSH, for example, following [GitHub Action](https://github.com/ever-co/ever-gauzy/blob/develop/.github/workflows/deploy-do-droplet-demo.yml)

#### Pulumi
#### Pulumi

- In addition, check [Gauzy Pulumi](https://github.com/ever-co/ever-gauzy-pulumi) project (WIP), it makes complex Clouds deployments possible with a single command (`pulumi up`). Note: it currently supports AWS EKS (Kubernetes) for development and production with Application Load Balancers and AWS RDS Serverless PostgreSQL DB deployments. We also implemented deployments to ECS EC2 and Fargate Clusters in the same Pulumi project.

Expand Down
6 changes: 4 additions & 2 deletions apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,12 @@
"seed:prod:build": "yarn ng run api:seed -c=production"
},
"dependencies": {
"@gauzy/core": "^0.1.0",
"@gauzy/changelog-plugin": "^0.1.0",
"@gauzy/knowledge-base-plugin": "^0.1.0",
"@gauzy/core": "^0.1.0",
"@gauzy/jitsu-analytics-plugin": "^0.1.0",
"@gauzy/job-proposal-plugin": "^0.1.0",
"@gauzy/job-search-plugin": "^0.1.0",
"@gauzy/knowledge-base-plugin": "^0.1.0",
"@gauzy/sentry-plugin": "^0.1.0",
"dotenv": "^16.0.3",
"yargs": "^17.5.0"
Expand Down
2 changes: 1 addition & 1 deletion apps/api/src/migration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ yargs
createMigration(pluginConfig, { name });
}
})
.argv; // To set above changes
.argv; // To set above changes
18 changes: 12 additions & 6 deletions apps/api/src/plugins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import { environment } from '@gauzy/config';
import { ChangelogPlugin } from '@gauzy/changelog-plugin';
import { JitsuAnalyticsPlugin } from '@gauzy/jitsu-analytics-plugin';
import { KnowledgeBasePlugin } from '@gauzy/knowledge-base-plugin';
import { JobSearchPlugin } from '@gauzy/job-search-plugin';
import { JobProposalPlugin } from '@gauzy/job-proposal-plugin';
import { SentryTracing as SentryPlugin } from './sentry';

const { jitsu, sentry } = environment;
Expand All @@ -10,10 +12,8 @@ const { jitsu, sentry } = environment;
* An array of plugins to be included or used in the codebase.
*/
export const plugins = [
// Indicates the inclusion or intention to use the ChangelogPlugin in the codebase.
ChangelogPlugin,
// Indicates the inclusion or intention to use the KnowledgeBasePlugin in the codebase.
KnowledgeBasePlugin,
// Includes the SentryPlugin based on the presence of Sentry configuration.
...(sentry && sentry.dsn ? [SentryPlugin] : []),
// Initializes the Jitsu Analytics Plugin by providing a configuration object.
JitsuAnalyticsPlugin.init({
config: {
Expand All @@ -23,6 +23,12 @@ export const plugins = [
echoEvents: jitsu.echoEvents
}
}),
// Includes the SentryPlugin based on the presence of Sentry configuration.
...(sentry && sentry.dsn ? [SentryPlugin] : []),
// Indicates the inclusion or intention to use the ChangelogPlugin in the codebase.
ChangelogPlugin,
// Indicates the inclusion or intention to use the KnowledgeBasePlugin in the codebase.
KnowledgeBasePlugin,
// Indicates the inclusion or intention to use the JobProposalPlugin in the codebase.
JobProposalPlugin,
// Indicates the inclusion or intention to use the JobSearchPlugin in the codebase.
JobSearchPlugin
];
14 changes: 9 additions & 5 deletions apps/desktop/src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,9 @@
"../../../packages/plugins/knowledge-base",
"../../../packages/plugins/changelog",
"../../../packages/plugins/jitsu-analytics",
"../../../packages/plugins/sentry-tracing"
"../../../packages/plugins/sentry-tracing",
"../../../packages/plugins/job-search",
"../../../packages/plugins/job-proposal"
]
},
"build": {
Expand Down Expand Up @@ -143,6 +145,8 @@
"@gauzy/desktop-libs": "^0.1.0",
"@gauzy/desktop-window": "^0.1.0",
"@gauzy/jitsu-analytics-plugin": "^0.1.0",
"@gauzy/job-proposal-plugin": "^0.1.0",
"@gauzy/job-search-plugin": "^0.1.0",
"@gauzy/knowledge-base-plugin": "^0.1.0",
"@gauzy/sentry-plugin": "^0.1.0",
"@nestjs/platform-express": "^10.3.7",
Expand All @@ -158,28 +162,28 @@
"electron-store": "^8.1.0",
"electron-updater": "^6.1.7",
"electron-util": "^0.17.2",
"embedded-queue": "^0.0.11",
"ffi-napi": "^4.0.3",
"form-data": "^3.0.0",
"htmlparser2": "^8.0.2",
"iconv": "^3.0.1",
"knex": "^3.1.0",
"locutus": "^2.0.30",
"mac-screen-capture-permissions": "^2.1.0",
"moment": "^2.29.4",
"node-fetch": "^2.6.7",
"node-notifier": "^8.0.0",
"node-static": "^0.7.11",
"pdfmake": "^0.2.0",
"pg-query-stream": "^4.5.4",
"pg": "^8.11.4",
"screenshot-desktop": "^1.15.0",
"sound-play": "1.1.0",
"sqlite3": "^5.1.7",
"squirrelly": "^8.0.8",
"tslib": "^2.3.0",
"twing": "^5.0.2",
"locutus": "^2.0.30",
"underscore": "^1.13.3",
"screenshot-desktop": "^1.15.0",
"mac-screen-capture-permissions": "^2.1.0",
"embedded-queue": "^0.0.11",
"undici": "^6.10.2"
},
"optionalDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion apps/gauzy-e2e/src/integration/AddTasksTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ describe('Add tasks test', () => {
lastName = faker.person.lastName();
username = faker.internet.userName();
password = faker.internet.password();
employeeEmail = faker.internet.email();
employeeEmail = faker.internet.exampleEmail();
imgUrl = faker.image.avatar();

CustomCommands.login(loginPage, LoginPageData, dashboardPage);
Expand Down
2 changes: 1 addition & 1 deletion apps/gauzy-e2e/src/integration/AddUserTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ describe('Add user test', () => {
firstName = faker.person.firstName();
lastName = faker.person.lastName();
username = faker.internet.userName();
email = faker.internet.email();
email = faker.internet.exampleEmail();
password = faker.internet.password();
imgUrl = faker.image.avatar();

Expand Down
2 changes: 1 addition & 1 deletion apps/gauzy-e2e/src/integration/AppointmentsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('Book public appointment test', () => {
lastName = faker.person.lastName();
username = faker.internet.userName();
password = faker.internet.password();
employeeEmail = faker.internet.email();
employeeEmail = faker.internet.exampleEmail();
imgUrl = faker.image.avatar();

CustomCommands.login(loginPage, LoginPageData, dashboardPage);
Expand Down
2 changes: 1 addition & 1 deletion apps/gauzy-e2e/src/integration/ApprovalRequestTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe('Approval request test', () => {
lastName = faker.person.lastName();
username = faker.internet.userName();
password = faker.internet.password();
employeeEmail = faker.internet.email();
employeeEmail = faker.internet.exampleEmail();
imgUrl = faker.image.avatar();

CustomCommands.login(loginPage, LoginPageData, dashboardPage);
Expand Down
4 changes: 2 additions & 2 deletions apps/gauzy-e2e/src/integration/CandidatesTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ let imgUrl = ' ';

describe('Invite candidate test', () => {
before(() => {
email = faker.internet.email();
secondEmail = faker.internet.email();
email = faker.internet.exampleEmail();
secondEmail = faker.internet.exampleEmail();
firstName = faker.person.firstName();
lastName = faker.person.lastName();
username = faker.internet.userName();
Expand Down
2 changes: 1 addition & 1 deletion apps/gauzy-e2e/src/integration/ClientsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ let website = ' ';

describe('Clients test', () => {
before(() => {
email = faker.internet.email();
email = faker.internet.exampleEmail();
fullName = faker.person.firstName() + ' ' + faker.person.lastName();
inviteName = faker.person.firstName() + ' ' + faker.person.lastName();
deleteName = faker.person.firstName() + ' ' + faker.person.lastName();
Expand Down
2 changes: 1 addition & 1 deletion apps/gauzy-e2e/src/integration/ContactsLeadsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let website = ' ';

describe('Contacts leads test', () => {
before(() => {
email = faker.internet.email();
email = faker.internet.exampleEmail();
fullName = faker.person.firstName() + ' ' + faker.person.lastName();
deleteName = faker.person.firstName() + ' ' + faker.person.lastName();
city = faker.location.city();
Expand Down
2 changes: 1 addition & 1 deletion apps/gauzy-e2e/src/integration/CustomersTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let website = ' ';

describe('Customers test', () => {
before(() => {
email = faker.internet.email();
email = faker.internet.exampleEmail();
fullName = faker.person.firstName() + ' ' + faker.person.lastName();
deleteName = faker.person.firstName() + ' ' + faker.person.lastName();
city = faker.location.city();
Expand Down
6 changes: 3 additions & 3 deletions apps/gauzy-e2e/src/integration/EditEmployeeTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ describe('Edit employee test', () => {
lastName = faker.person.lastName();
username = faker.internet.userName();
password = faker.internet.password();
email = faker.internet.email();
employeeEmail = faker.internet.email();
email = faker.internet.exampleEmail();
employeeEmail = faker.internet.exampleEmail();
fullName = faker.person.firstName() + ' ' + faker.person.lastName();
imgUrl = faker.image.avatar();
city = faker.location.city();
Expand All @@ -49,7 +49,7 @@ describe('Edit employee test', () => {
editUsername = faker.internet.userName();
editFirstName = faker.person.firstName();
editLastName = faker.person.lastName();
editEmail = faker.internet.email();
editEmail = faker.internet.exampleEmail();
contactCity = faker.location.city();
contactPostcode = faker.location.zipCode();
contactStreet = faker.location.streetAddress();
Expand Down
2 changes: 1 addition & 1 deletion apps/gauzy-e2e/src/integration/EditUserTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ describe('Edit user test', () => {
firstName = faker.person.firstName();
lastName = faker.person.lastName();
username = faker.internet.userName();
email = faker.internet.email();
email = faker.internet.exampleEmail();
password = faker.internet.password();
imgUrl = faker.image.avatar();
editFirstName = faker.person.firstName();
Expand Down
4 changes: 2 additions & 2 deletions apps/gauzy-e2e/src/integration/EstimatesTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ let sendEmail = ' ';

describe('Estimates test', () => {
before(() => {
email = faker.internet.email();
email = faker.internet.exampleEmail();
fullName = faker.person.firstName() + ' ' + faker.person.lastName();
city = faker.location.city();
postcode = faker.location.zipCode();
street = faker.location.streetAddress();
website = faker.internet.url();
sendEmail = faker.internet.email();
sendEmail = faker.internet.exampleEmail();

CustomCommands.login(loginPage, LoginPageData, dashboardPage);
});
Expand Down
2 changes: 1 addition & 1 deletion apps/gauzy-e2e/src/integration/GoalsKPITest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('Goals KPI test', () => {
lastName = faker.person.lastName();
username = faker.internet.userName();
password = faker.internet.password();
employeeEmail = faker.internet.email();
employeeEmail = faker.internet.exampleEmail();
imgUrl = faker.image.avatar();

CustomCommands.login(loginPage, LoginPageData, dashboardPage);
Expand Down
2 changes: 1 addition & 1 deletion apps/gauzy-e2e/src/integration/HumanResourcesTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('Human resources page test', () => {
lastName = faker.person.lastName();
username = faker.internet.userName();
password = faker.internet.password();
employeeEmail = faker.internet.email();
employeeEmail = faker.internet.exampleEmail();
imgUrl = faker.image.avatar();

CustomCommands.login(loginPage, LoginPageData, dashboardPage);
Expand Down
4 changes: 2 additions & 2 deletions apps/gauzy-e2e/src/integration/InviteUserTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ let secEmail = ' ';

describe('Invite user/s test', () => {
before(() => {
email = faker.internet.email();
secEmail = faker.internet.email();
email = faker.internet.exampleEmail();
secEmail = faker.internet.exampleEmail();

CustomCommands.login(loginPage, LoginPageData, dashboardPage);
});
Expand Down
4 changes: 2 additions & 2 deletions apps/gauzy-e2e/src/integration/InvoicesTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ let sendEmail = ' ';

describe('Invoices test', () => {
before(() => {
email = faker.internet.email();
email = faker.internet.exampleEmail();
fullName = faker.person.firstName() + ' ' + faker.person.lastName();
city = faker.location.city();
postcode = faker.location.zipCode();
street = faker.location.streetAddress();
website = faker.internet.url();
sendEmail = faker.internet.email();
sendEmail = faker.internet.exampleEmail();

CustomCommands.login(loginPage, LoginPageData, dashboardPage);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ let email = ' ';

describe('Manage candidates invites test', () => {
before(() => {
email = faker.internet.email();
email = faker.internet.exampleEmail();

CustomCommands.login(loginPage, LoginPageData, dashboardPage);
});
Expand Down
8 changes: 4 additions & 4 deletions apps/gauzy-e2e/src/integration/ManageEmployeesTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ let imgUrl = ' ';

describe('Manage employees test', () => {
before(() => {
email = faker.internet.email();
secEmail = faker.internet.email();
email = faker.internet.exampleEmail();
secEmail = faker.internet.exampleEmail();
firstName = faker.person.firstName();
lastName = faker.person.lastName();
username = faker.internet.userName();
email = faker.internet.email();
email = faker.internet.exampleEmail();
password = faker.internet.password();
employeeEmail = faker.internet.email();
employeeEmail = faker.internet.exampleEmail();
imgUrl = faker.image.avatar();

CustomCommands.login(loginPage, LoginPageData, dashboardPage);
Expand Down
Loading

0 comments on commit 6867929

Please sign in to comment.