Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/dynamic data tests #2205

Merged
merged 27 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f020af6
chore: ng 16 update
chrismclarke Nov 29, 2023
cd62187
chore: add nx to gitignore
chrismclarke Nov 29, 2023
f75219a
chore: remove empty entry components
chrismclarke Nov 29, 2023
85aa681
chore: ng 17 updates
chrismclarke Nov 29, 2023
63d517e
chore: minor dep updates
chrismclarke Nov 29, 2023
8817560
chore: remove ngx-color
chrismclarke Nov 29, 2023
e4feee4
chore: fix breaking changes
chrismclarke Nov 29, 2023
3a53e9a
fix: rxdb breaking changes
chrismclarke Nov 29, 2023
aa77970
chore: update matomo
chrismclarke Nov 29, 2023
b9d7a89
chore: core updates
chrismclarke Nov 29, 2023
20e0289
fix: rxdb imports
chrismclarke Nov 29, 2023
3a0bbb5
chore: cspell updates
chrismclarke Nov 29, 2023
d635dc2
fix: rxdb migration
chrismclarke Nov 29, 2023
7af1dd3
chore: update npm engines
chrismclarke Nov 29, 2023
514d778
chore: add nvmrc
chrismclarke Nov 29, 2023
4130957
chore: update yarn lock
chrismclarke Nov 29, 2023
04c9e58
chore: reduce compiler warnings
chrismclarke Nov 29, 2023
9613b5e
chore: make tsconfig imports specific
chrismclarke Nov 29, 2023
b549c66
fix: template search filter
chrismclarke Dec 8, 2023
993b06f
fix: dynamic data service collection multiple init
chrismclarke Dec 8, 2023
14c5808
chore: code tidying
chrismclarke Dec 8, 2023
b518e8b
style: fix audio component spacing
jfmcquade Dec 12, 2023
fc92e26
Merge branch 'master' of https://github.com/IDEMSInternational/parent…
chrismclarke Dec 15, 2023
2c18594
fix: toggle-bar event double fire
chrismclarke Dec 15, 2023
582452b
fix: odk form encapsulation
chrismclarke Dec 15, 2023
f1b8cd0
Merge branch 'master' of https://github.com/IDEMSInternational/parent…
chrismclarke Feb 13, 2024
9990c5a
fix: dynamic data service reset and tests
chrismclarke Feb 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{
"root": true,
"ignorePatterns": ["packages/api/**/*", "packages/@idemsInternational/**/*"],
"plugins": ["jasmine"],
"env": { "jasmine": true },
"plugins": ["jasmine", "@typescript-eslint"],
"env": {
"jasmine": true
},
"overrides": [
{
"files": ["*.ts"],
Expand Down Expand Up @@ -119,3 +121,4 @@
}
]
}

4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,6 @@ yarn.auto-install
supabase

# Avoid comitting private keys
private.key
private.key

.nx
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v18
22 changes: 14 additions & 8 deletions angular.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"defaultProject": "app",
"newProjectRoot": "projects",
"projects": {
"app": {
Expand Down Expand Up @@ -57,17 +56,24 @@
],
"scripts": ["./node_modules/intro.js/intro.js"],
"allowedCommonJsDependencies": [
"lottie-web",
"firebase/app",
"@firebase/auth",
"clone",
"howler",
"dompurify",
"extract-math",
"fast-deep-equal",
"firebase/app",
"howler",
"html5sortable/dist/html5sortable.cjs",
"intro.js",
"jquery",
"lottie-web",
"marked",
"mingo/operators/pipeline",
"mingo/operators/query",
"mingo/query",
"qrcode",
"stacktrace-js",
"intro.js",
"qrcode"
"websocket"
]
},
"configurations": {
Expand Down Expand Up @@ -212,9 +218,9 @@
}
},
"cli": {
"defaultCollection": "@ionic/angular-toolkit",
"packageManager": "yarn",
"analytics": false
"analytics": false,
"schematicCollections": ["@ionic/angular-toolkit"]
},
"schematics": {
"@ionic/angular-toolkit:component": {
Expand Down
7 changes: 6 additions & 1 deletion cspell.config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
# words - list of words to be always considered correct
"words":
[
"danfojs",
"dexie",
"firebaserc",
"fontawesome",
"gdrive",
Expand All @@ -20,10 +22,13 @@
"metabase",
"mkdocs",
"nocheck",
"Nouislider",
"overidden",
"quickstart",
"rxdb",
"sidemenu",
"sourcemaps",
"swiper",
"templatename",
"tmpl",
"venv",
Expand All @@ -33,4 +38,4 @@
# For example "hte" should be "the"
"flagWords": ["hte"]

"ignorePaths": ["node_modules/**"]
"ignorePaths": ["node_modules/**", "angular.json", "cspell.config.yml"]
6 changes: 3 additions & 3 deletions documentation/docs/developers/quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

The main tech stack comprises of:

- Angular 12
- Ionic v5
- Android Native via Capacitor
- Angular
- Ionic
- Capacitor

## Additional Developer Prerequisites

Expand Down
134 changes: 67 additions & 67 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,27 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^15.0.4",
"@angular/common": "~15.0.4",
"@angular/core": "~15.0.4",
"@angular/elements": "^15.0.4",
"@angular/fire": "^7.3.0",
"@angular/forms": "~15.0.4",
"@angular/platform-browser": "~15.0.4",
"@angular/platform-browser-dynamic": "~15.0.4",
"@angular/router": "~15.0.4",
"@angular/animations": "^17.0.4",
"@angular/common": "~17.0.4",
"@angular/core": "~17.0.4",
"@angular/elements": "^17.0.4",
"@angular/fire": "17.0.0-next.0",
"@angular/forms": "~17.0.4",
"@angular/platform-browser": "~17.0.4",
"@angular/platform-browser-dynamic": "~17.0.4",
"@angular/router": "~17.0.4",
"@capacitor-community/file-opener": "^1.0.5",
"@capacitor-community/firebase-crashlytics": "^3.0.0",
"@capacitor-firebase/authentication": "^5.1.0",
"@capacitor-firebase/performance": "^5.1.0",
"@capacitor/android": "^5.2.3",
"@capacitor-firebase/authentication": "^5.3.0",
"@capacitor-firebase/performance": "^5.3.0",
"@capacitor/android": "^5.5.1",
"@capacitor/app": "^5.0.6",
"@capacitor/clipboard": "^5.0.6",
"@capacitor/core": "^5.2.3",
"@capacitor/core": "^5.5.1",
"@capacitor/device": "^5.0.6",
"@capacitor/filesystem": "^5.1.2",
"@capacitor/filesystem": "^5.1.4",
"@capacitor/local-notifications": "^5.0.6",
"@capacitor/push-notifications": "^5.0.6",
"@capacitor/push-notifications": "^5.1.0",
"@capacitor/share": "^5.0.6",
"@capacitor/splash-screen": "^5.0.6",
"@capawesome/capacitor-app-update": "^5.0.1",
Expand All @@ -60,89 +60,89 @@
"@ionic-native/http": "^5.36.0",
"@ionic-native/media": "^5.36.0",
"@ionic-native/status-bar": "^5.36.0",
"@ionic/angular": "^6.4.1",
"@ionic/pwa-elements": "^3.1.1",
"@ionic/angular": "^7.5.6",
"@ionic/pwa-elements": "^3.2.2",
"@ngx-matomo/router": "^1.3.3",
"@ngx-matomo/tracker": "^1.3.3",
"@sentry/angular": "^7.21.1",
"@supabase/supabase-js": "^2.13.1",
"@sentry/angular": "^7.83.0",
"@supabase/supabase-js": "^2.39.0",
"@types/file-saver": "^2.0.7",
"bootstrap-datepicker": "^1.10.0",
"capacitor-blob-writer": "^1.1.14",
"clone": "^2.1.2",
"core-js": "^3.27.1",
"core-js": "^3.33.3",
"data-models": "workspace:*",
"date-fns": "^2.22.1",
"date-fns": "^2.30.0",
"deep-object-diff": "^1.1.9",
"dexie": "^3.0.3",
"dexie": "^3.2.4",
"dexie-observable": "3.0.0-beta.11",
"dexie-syncable": "^3.0.0-beta.10",
"document-register-element": "^1.14.10",
"dompurify": "^2.3.6",
"dompurify": "^3.0.6",
"extract-math": "^1.2.3",
"file-saver": "^2.0.5",
"firebase": "^9.8.1",
"globalthis": "^1.0.2",
"howler": "^2.2.1",
"firebase": "^10.7.0",
"globalthis": "^1.0.3",
"howler": "^2.2.4",
"html5sortable": "^0.13.3",
"intro.js": "^3.2.1",
"jquery": "^3.7.0",
"intro.js": "^3.4.0",
"jquery": "^3.7.1",
"jquery-touchswipe": "^1.6.19",
"katex": "^0.15.3",
"lottie-web": "^5.7.14",
"marked": "^2.0.1",
"katex": "^0.16.9",
"lottie-web": "^5.12.2",
"marked": "^2.1.3",
"mergexml": "^1.2.3",
"ng2-nouislider": "^1.8.3",
"ngx-color": "^6.1.0",
"ngx-extended-pdf-viewer": "16.2.16",
"ngx-lottie": "^7.0.4",
"nouislider": "^14.6.3",
"qrcode": "^1.5.1",
"rxdb": "^13.15.3",
"rxjs": "^7.8.0",
"ng2-nouislider": "^2.0.0",
"ngx-extended-pdf-viewer": "18.1.9",
"ngx-lottie": "^10.0.0",
"ngx-matomo-client": "^6.0.0",
"nouislider": "^15.7.1",
"qrcode": "^1.5.3",
"rxdb": "^14.17.1",
"rxjs": "^7.8.1",
"scripts": "workspace:*",
"shared": "workspace:*",
"signature_pad": "^4.1.5",
"signature_pad": "^4.1.7",
"stacktrace-js": "^2.0.2",
"swiper": "^8.4.4",
"swiper": "^8.4.7",
"trusted-types": "^2.0.0",
"zone.js": "~0.11.4"
"zone.js": "~0.14.2"
},
"devDependencies": {
"@angular-devkit/architect": "0.1500.4",
"@angular-devkit/build-angular": "~15.0.4",
"@angular-devkit/core": "~15.0.4",
"@angular-devkit/schematics": "~15.0.4",
"@angular-eslint/builder": "15.2.1",
"@angular-eslint/eslint-plugin": "15.2.1",
"@angular-eslint/eslint-plugin-template": "15.2.1",
"@angular-eslint/schematics": "15.2.1",
"@angular-eslint/template-parser": "15.2.1",
"@angular/cli": "~15.0.4",
"@angular/compiler": "~15.0.4",
"@angular/compiler-cli": "~15.0.4",
"@angular/language-service": "~15.0.4",
"@capacitor/cli": "^5.0.0",
"@compodoc/compodoc": "^1.1.19",
"@ionic/angular-toolkit": "^7.0.0",
"@ionic/cli": "^6.18.0",
"@schematics/angular": "~15.0.4",
"@angular-devkit/architect": "0.1700.3",
"@angular-devkit/build-angular": "~17.0.3",
"@angular-devkit/core": "~17.0.3",
"@angular-devkit/schematics": "~17.0.3",
"@angular-eslint/builder": "17.1.0",
"@angular-eslint/eslint-plugin": "17.1.0",
"@angular-eslint/eslint-plugin-template": "17.1.0",
"@angular-eslint/schematics": "17.1.0",
"@angular-eslint/template-parser": "17.1.0",
"@angular/cli": "~17.0.3",
"@angular/compiler": "~17.0.4",
"@angular/compiler-cli": "~17.0.4",
"@angular/language-service": "~17.0.4",
"@capacitor/cli": "^5.5.1",
"@compodoc/compodoc": "^1.1.23",
"@ionic/angular-toolkit": "^10.0.0",
"@ionic/cli": "^7.1.5",
"@schematics/angular": "~17.0.3",
"@swc/helpers": "^0.5.1",
"@types/clone": "^2.1.1",
"@types/howler": "^2.2.2",
"@types/intro.js": "^3.0.1",
"@types/jasmine": "~4.3.0",
"@types/lokijs": "^1.5.7",
"@types/marked": "^2.0.3",
"@types/node": "^16.18.9",
"@types/node": "^18.18.13",
"@types/nouislider": "^15.0.0",
"@types/swiper": "~4.2.0",
"@typescript-eslint/eslint-plugin": "^5.57.1",
"@typescript-eslint/parser": "5.57.1",
"@typescript-eslint/eslint-plugin": "^6.13.1",
"@typescript-eslint/parser": "^6.13.1",
"codelyzer": "^6.0.2",
"concurrently": "^6.2.0",
"cspell": "^6.20.1",
"eslint": "8.37.0",
"eslint": "^8.54.0",
"eslint-config-prettier": "^8.8.0",
"eslint-config-standard-with-typescript": "latest",
"eslint-plugin-import": "^2.27.5",
Expand All @@ -151,7 +151,7 @@
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-prefer-arrow": "1.2.3",
"eslint-plugin-promise": "^6.1.1",
"firebase-tools": "^9.14.0",
"firebase-tools": "^12.9.1",
"husky": "^8.0.3",
"jasmine-core": "~4.5.0",
"jasmine-spec-reporter": "~7.0.0",
Expand All @@ -162,7 +162,7 @@
"karma-jasmine-html-reporter": "~2.0.0",
"lint-staged": "^13.0.3",
"prettier": "^2.6.2",
"typescript": "4.8.4"
"typescript": "5.2.2"
},
"lint-staged": {
"*.{ts,scss,html}": [
Expand All @@ -174,7 +174,7 @@
"fs": false
},
"engines": {
"node": ">=14.20.0"
"node": ">=18.x"
},
"packageManager": "yarn@3.3.1"
}
2 changes: 1 addition & 1 deletion packages/shared/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The angular compiler uses local `tsconfig.app.json` to include external dependen
{
"extends": "./tsconfig.json",
"include": [
"packages/shared/**/*.ts",
"packages/shared/shared/src/models/jsEvaluator/jsEvaluator.ts",
]
}
```
Expand Down
9 changes: 3 additions & 6 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import { IonicModule, IonicRouteStrategy } from "@ionic/angular";
// Libs
import { LottieModule } from "ngx-lottie";
import player from "lottie-web";
import { NgxMatomoTrackerModule } from "@ngx-matomo/tracker";
import { NgxMatomoRouterModule } from "@ngx-matomo/router";
import { MatomoModule, MatomoRouterModule } from "ngx-matomo-client";

// Native
import { HTTP } from "@ionic-native/http/ngx";
Expand All @@ -37,8 +36,6 @@ export function lottiePlayerFactory() {

@NgModule({
declarations: [AppComponent],

entryComponents: [],
imports: [
BrowserModule,
BrowserAnimationsModule,
Expand All @@ -55,11 +52,11 @@ export function lottiePlayerFactory() {
// LottieCacheModule.forRoot(),
TemplateComponentsModule,
TourModule,
NgxMatomoTrackerModule.forRoot({
MatomoModule.forRoot({
siteId: environment.analytics.siteId,
trackerUrl: environment.analytics.endpoint,
}),
NgxMatomoRouterModule,
MatomoRouterModule,
ContextMenuModule,
],
providers: [
Expand Down
5 changes: 2 additions & 3 deletions src/app/feature/feedback/routeGuards.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { Injectable } from "@angular/core";
import { CanActivate } from "@angular/router";

@Injectable({ providedIn: "root" })
export class RouterDisableGuard implements CanActivate {
export class RouterDisableGuard {
canActivate() {
return false;
}
}

@Injectable({ providedIn: "root" })
export class RouterEnableGuard implements CanActivate {
export class RouterEnableGuard {
canActivate() {
return true;
}
Expand Down
Loading
Loading