Browse Source

Merge pull request #106 from dandevaud/bugfix/FIX-Dockerpush

Bugfix/fix dockerpush
pull/5027/head
dandevaud 10 months ago
committed by GitHub
parent
commit
f26a7d9e29
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 4
      apps/api/project.json
  2. 6
      apps/api/src/app/import/import.service.ts
  3. 14
      apps/api/src/app/portfolio/portfolio.service.ts
  4. 6
      apps/client-e2e/project.json
  5. 120
      apps/client/project.json
  6. 6
      apps/ui-e2e/project.json
  7. 3
      nx.json
  8. 4473
      package-lock.json
  9. 2
      package.json
  10. 1134
      yarn.lock

4
apps/api/project.json

@ -4,6 +4,7 @@
"sourceRoot": "apps/api/src",
"projectType": "application",
"prefix": "api",
"tags": [],
"generators": {},
"targets": {
"build": {
@ -80,6 +81,5 @@
},
"outputs": ["{workspaceRoot}/coverage/apps/api"]
}
},
"tags": []
}
}

6
apps/api/src/app/import/import.service.ts

@ -631,12 +631,6 @@ export class ImportService {
`activities.${index}.symbol ("${symbol}") is not valid for the specified data source ("${dataSource}")`
);
}
if (assetProfile.currency !== currency) {
throw new Error(
`activities.${index}.currency ("${currency}") does not match with currency of ${assetProfile.symbol} ("${assetProfile.currency}")`
);
}
}
assetProfiles[getAssetProfileIdentifier({ dataSource, symbol })] =

14
apps/api/src/app/portfolio/portfolio.service.ts

@ -1225,6 +1225,17 @@ export class PortfolioService {
};
}
portfolioCalculator =
portfolioCalculator ??
this.calculatorFactory.createCalculator({
accountBalanceItems,
activities,
filters,
userId,
calculationType: PerformanceCalculationType.TWR,
currency: userCurrency
});
const { endDate, startDate } = getIntervalFromDateRange(dateRange);
const { chart } = await portfolioCalculator.getPerformance({
@ -1702,7 +1713,8 @@ export class PortfolioService {
const { performance } = await this.getPerformance({
impersonationId,
userId
userId,
portfolioCalculator
});
const {

6
apps/client-e2e/project.json

@ -3,6 +3,8 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/client-e2e/src",
"projectType": "application",
"tags": [],
"implicitDependencies": ["client"],
"targets": {
"e2e": {
"executor": "@nx/cypress:cypress",
@ -17,7 +19,5 @@
}
}
}
},
"tags": [],
"implicitDependencies": ["client"]
}
}

120
apps/client/project.json

@ -2,13 +2,59 @@
"name": "client",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"sourceRoot": "apps/client/src",
"prefix": "gf",
"i18n": {
"locales": {
"ca": {
"baseHref": "/ca/",
"translation": "apps/client/src/locales/messages.ca.xlf"
},
"de": {
"baseHref": "/de/",
"translation": "apps/client/src/locales/messages.de.xlf"
},
"es": {
"baseHref": "/es/",
"translation": "apps/client/src/locales/messages.es.xlf"
},
"fr": {
"baseHref": "/fr/",
"translation": "apps/client/src/locales/messages.fr.xlf"
},
"it": {
"baseHref": "/it/",
"translation": "apps/client/src/locales/messages.it.xlf"
},
"nl": {
"baseHref": "/nl/",
"translation": "apps/client/src/locales/messages.nl.xlf"
},
"pl": {
"baseHref": "/pl/",
"translation": "apps/client/src/locales/messages.pl.xlf"
},
"pt": {
"baseHref": "/pt/",
"translation": "apps/client/src/locales/messages.pt.xlf"
},
"tr": {
"baseHref": "/tr/",
"translation": "apps/client/src/locales/messages.tr.xlf"
},
"zh": {
"baseHref": "/zh/",
"translation": "apps/client/src/locales/messages.zh.xlf"
}
},
"sourceLocale": "en"
},
"tags": [],
"generators": {
"@schematics/angular:component": {
"style": "scss"
}
},
"sourceRoot": "apps/client/src",
"prefix": "gf",
"targets": {
"build": {
"executor": "@nx/angular:webpack-browser",
@ -165,7 +211,7 @@
}
},
"serve": {
"executor": "@nx/angular:webpack-dev-server",
"executor": "@nx/angular:dev-server",
"options": {
"buildTarget": "client:build",
"proxyConfig": "apps/client/proxy.conf.json",
@ -175,37 +221,37 @@
},
"configurations": {
"development-de": {
"browserTarget": "client:build:development-de"
"buildTarget": "client:build:development-de"
},
"development-en": {
"browserTarget": "client:build:development-en"
"buildTarget": "client:build:development-en"
},
"development-es": {
"browserTarget": "client:build:development-es"
"buildTarget": "client:build:development-es"
},
"development-fr": {
"browserTarget": "client:build:development-fr"
"buildTarget": "client:build:development-fr"
},
"development-it": {
"browserTarget": "client:build:development-it"
"buildTarget": "client:build:development-it"
},
"development-nl": {
"browserTarget": "client:build:development-nl"
"buildTarget": "client:build:development-nl"
},
"development-pl": {
"browserTarget": "client:build:development-pl"
"buildTarget": "client:build:development-pl"
},
"development-pt": {
"browserTarget": "client:build:development-pt"
"buildTarget": "client:build:development-pt"
},
"development-tr": {
"browserTarget": "client:build:development-tr"
"buildTarget": "client:build:development-tr"
},
"development-zh": {
"buildTarget": "client:build:development-zh"
},
"production": {
"browserTarget": "client:build:production"
"buildTarget": "client:build:production"
}
}
},
@ -242,51 +288,5 @@
},
"outputs": ["{workspaceRoot}/coverage/apps/client"]
}
},
"i18n": {
"locales": {
"ca": {
"baseHref": "/ca/",
"translation": "apps/client/src/locales/messages.ca.xlf"
},
"de": {
"baseHref": "/de/",
"translation": "apps/client/src/locales/messages.de.xlf"
},
"es": {
"baseHref": "/es/",
"translation": "apps/client/src/locales/messages.es.xlf"
},
"fr": {
"baseHref": "/fr/",
"translation": "apps/client/src/locales/messages.fr.xlf"
},
"it": {
"baseHref": "/it/",
"translation": "apps/client/src/locales/messages.it.xlf"
},
"nl": {
"baseHref": "/nl/",
"translation": "apps/client/src/locales/messages.nl.xlf"
},
"pl": {
"baseHref": "/pl/",
"translation": "apps/client/src/locales/messages.pl.xlf"
},
"pt": {
"baseHref": "/pt/",
"translation": "apps/client/src/locales/messages.pt.xlf"
},
"tr": {
"baseHref": "/tr/",
"translation": "apps/client/src/locales/messages.tr.xlf"
},
"zh": {
"baseHref": "/zh/",
"translation": "apps/client/src/locales/messages.zh.xlf"
}
},
"sourceLocale": "en"
},
"tags": []
}
}

6
apps/ui-e2e/project.json

@ -3,6 +3,8 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/ui-e2e/src",
"projectType": "application",
"tags": [],
"implicitDependencies": ["ui"],
"targets": {
"e2e": {
"executor": "@nx/cypress:cypress",
@ -23,7 +25,5 @@
"lintFilePatterns": ["apps/ui-e2e/**/*.{js,ts}"]
}
}
},
"tags": [],
"implicitDependencies": ["ui"]
}
}

3
nx.json

@ -72,5 +72,6 @@
},
"nxCloudAccessToken": "Mjg0ZGQ2YjAtNGI4NS00NmYwLThhOWEtMWZmNmQzODM4YzU4fHJlYWQ=",
"parallel": 1,
"defaultBase": "origin/main"
"defaultBase": "origin/main",
"useInferencePlugins": false
}

4473
package-lock.json

File diff suppressed because it is too large

2
package.json

@ -147,7 +147,7 @@
"@angular-eslint/eslint-plugin": "18.1.0",
"@angular-eslint/eslint-plugin-template": "18.1.0",
"@angular-eslint/template-parser": "18.1.0",
"@angular/cli": "18.1.1",
"@angular/cli": "18.2.1",
"@angular/compiler-cli": "18.1.1",
"@angular/language-service": "18.1.1",
"@angular/localize": "18.1.1",

1134
yarn.lock

File diff suppressed because it is too large
Loading…
Cancel
Save