Feat: core updates (ng17)

.gitignore

@@ -76,3 +76,4 @@ apps/extension-toolkit/www_sourcemaps
 .next/
 
 .eslintcache
+.nx/cache

.prettierignore

@@ -4,3 +4,5 @@
 /coverage
 *.geojson.json
 .angular
+
+/.nx/cache

README.md

@@ -7,7 +7,7 @@
 1. Download and install [Git](https://git-scm.com/downloads)  
    This will be used to download the repository
 
-2. Download and install [Node](https://nodejs.org/en/download/) version 16+
+2. Download and install [Node](https://nodejs.org/en/download/) version 18+
    This is the programming lanugage required to run the project
 
 3. Download and Install [Yarn](https://yarnpkg.com/getting-started/install)  

apps/picsa-apps/content-dashboard-e2e/project.json

@@ -17,7 +17,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/picsa-apps/content-dashboard-e2e/**/*.{js,ts}"]

apps/picsa-apps/content-dashboard/project.json

@@ -6,7 +6,7 @@
   "prefix": "picsa",
   "targets": {
     "build": {
-      "executor": "@angular-devkit/build-angular:browser",
+      "executor": "@angular-devkit/build-angular:browser-esbuild",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/apps/picsa-apps/content-dashboard",
@@ -39,7 +39,6 @@
         "development": {
           "buildOptimizer": false,
           "optimization": false,
-          "vendorChunk": true,
           "extractLicenses": false,
           "sourceMap": true,
           "namedChunks": true
@@ -51,22 +50,22 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "browserTarget": "picsa-apps-content-dashboard:build:production"
+          "buildTarget": "picsa-apps-content-dashboard:build:production"
         },
         "development": {
-          "browserTarget": "picsa-apps-content-dashboard:build:development"
+          "buildTarget": "picsa-apps-content-dashboard:build:development"
         }
       },
       "defaultConfiguration": "development"
     },
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "picsa-apps-content-dashboard:build"
+        "buildTarget": "picsa-apps-content-dashboard:build"
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": ["apps/picsa-apps/content-dashboard/**/*.ts", "apps/picsa-apps/content-dashboard/**/*.html"]
       }
@@ -75,8 +74,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/picsa-apps/content-dashboard"],
       "options": {
-        "jestConfig": "apps/picsa-apps/content-dashboard/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "apps/picsa-apps/content-dashboard/jest.config.ts"
       }
     }
   },

apps/picsa-apps/extension-app-e2e/project.json

@@ -17,7 +17,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/picsa-apps/extension-app-e2e/**/*.{js,ts}"]

apps/picsa-apps/extension-app-native/android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "io.picsa.extension"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 3037003
-        versionName "3.37.3"
+        versionCode 3038000
+        versionName "3.38.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

apps/picsa-apps/extension-app/project.json

@@ -18,7 +18,7 @@
         "save-svg-as-png",
         "stacktrace-js"
       ],
-      "executor": "@angular-devkit/build-angular:browser",
+      "executor": "@angular-devkit/build-angular:browser-esbuild",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/apps/picsa-apps/extension-app",
@@ -79,7 +79,6 @@
             "input": "apps/picsa-tools/monitoring-tool/src/assets",
             "output": "assets"
           },
-
           {
             "glob": "**/*",
             "input": "apps/picsa-tools/option-tool/src/assets",
@@ -140,7 +139,6 @@
         "development": {
           "buildOptimizer": false,
           "optimization": false,
-          "vendorChunk": true,
           "extractLicenses": false,
           "sourceMap": true,
           "namedChunks": true
@@ -196,30 +194,30 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "browserTarget": "picsa-apps-extension-app:build:production"
+          "buildTarget": "picsa-apps-extension-app:build:production"
         },
         "development": {
-          "browserTarget": "picsa-apps-extension-app:build:development"
+          "buildTarget": "picsa-apps-extension-app:build:development"
         },
         "external": {
-          "browserTarget": "picsa-apps-extension-app:build:development",
-          "host": "0.0.0.0"
+          "host": "0.0.0.0",
+          "buildTarget": "picsa-apps-extension-app:build:development"
         },
         "external_production": {
-          "browserTarget": "picsa-apps-extension-app:build:production",
-          "host": "0.0.0.0"
+          "host": "0.0.0.0",
+          "buildTarget": "picsa-apps-extension-app:build:production"
         }
       },
       "defaultConfiguration": "development"
     },
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "picsa-apps-extension-app:build"
+        "buildTarget": "picsa-apps-extension-app:build"
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": ["apps/picsa-apps/extension-app/**/*.ts", "apps/picsa-apps/extension-app/**/*.html"]
       }
@@ -228,8 +226,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/picsa-apps/extension-app"],
       "options": {
-        "jestConfig": "apps/picsa-apps/extension-app/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "apps/picsa-apps/extension-app/jest.config.ts"
       }
     }
   },

apps/picsa-apps/extension-app/src/app/pages/home/home.page.html

@@ -4,8 +4,8 @@
 
 <div class="page-content background-image">
   <div class="link-grid">
+    @for (link of links; track $index) {
     <div
-      *ngFor="let link of links"
       [attr.data-tour-id]="link.tourId"
       [attr.data-dev-only]="link.devOnly"
       data-cy="link"
@@ -16,13 +16,11 @@
         <mat-icon [svgIcon]="link.icon" class="nav-icon"></mat-icon>
         <div class="nav-text">{{ link.name | translate }}</div>
       </div>
-      <div
-        class="tile-badge mat-elevation-z8"
-        *ngIf="link.tourId==='monitoring' && monitoringService.pendingSyncCount>0"
-      >
-        {{monitoringService.pendingSyncCount}}
-      </div>
+      @if (link.tourId==='monitoring' && monitoringService.pendingSyncCount>0) {
+      <div class="tile-badge mat-elevation-z8">{{monitoringService.pendingSyncCount}}</div>
+      }
     </div>
+    }
     <div class="grid-tile" (click)="startTour()" style="position: relative">
       <div style="text-align: center">
         <mat-icon svgIcon="picsa_tutorial" class="nav-icon"></mat-icon>

apps/picsa-apps/extension-app/src/app/pages/privacy/privacy.component.html

@@ -97,7 +97,7 @@
   <p><strong>Contact Us</strong></p>
   <p>
     If you have any questions or suggestions about our Privacy Policy, do not hesitate to contact us at
-    apps@c2dev.co.uk.
+    apps&#64;c2dev.co.uk.
   </p>
   <p>
     This privacy policy page was created at

apps/picsa-apps/extension-app/src/index.html

@@ -11,7 +11,7 @@
     <script
       type="text/javascript"
       id="compatibility"
-      src="/assets/compatibility.js"
+      src="./assets/compatibility.js"
       async="false"
       defer="false"
     ></script>

apps/picsa-apps/farmer-app-e2e/project.json

@@ -17,7 +17,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/picsa-apps/farmer-app-e2e/**/*.{js,ts}"]

apps/picsa-apps/farmer-app/project.json

@@ -6,7 +6,7 @@
   "prefix": "picsa",
   "targets": {
     "build": {
-      "executor": "@angular-devkit/build-angular:browser",
+      "executor": "@angular-devkit/build-angular:browser-esbuild",
       "outputs": ["{options.outputPath}"],
       "options": {
         "outputPath": "dist/apps/picsa-apps/farmer-app",
@@ -44,7 +44,6 @@
         "development": {
           "buildOptimizer": false,
           "optimization": false,
-          "vendorChunk": true,
           "extractLicenses": false,
           "sourceMap": true,
           "namedChunks": true
@@ -56,22 +55,22 @@
       "executor": "@angular-devkit/build-angular:dev-server",
       "configurations": {
         "production": {
-          "browserTarget": "picsa-apps-farmer-app:build:production"
+          "buildTarget": "picsa-apps-farmer-app:build:production"
         },
         "development": {
-          "browserTarget": "picsa-apps-farmer-app:build:development"
+          "buildTarget": "picsa-apps-farmer-app:build:development"
         }
       },
       "defaultConfiguration": "development"
     },
     "extract-i18n": {
       "executor": "@angular-devkit/build-angular:extract-i18n",
       "options": {
-        "browserTarget": "picsa-apps-farmer-app:build"
+        "buildTarget": "picsa-apps-farmer-app:build"
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "options": {
         "lintFilePatterns": ["apps/picsa-apps/farmer-app/**/*.ts", "apps/picsa-apps/farmer-app/**/*.html"]
       }
@@ -80,8 +79,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/picsa-apps/farmer-app"],
       "options": {
-        "jestConfig": "apps/picsa-apps/farmer-app/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "apps/picsa-apps/farmer-app/jest.config.ts"
       }
     }
   },

apps/picsa-server-legacy/scripts/project.json

@@ -6,7 +6,7 @@
   "implicitDependencies": ["picsa-server-cloud-functions"],
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/picsa-server-legacy/scripts/**/*.ts"]

apps/picsa-server-legacy/test/project.json

@@ -6,7 +6,7 @@
   "implicitDependencies": [],
   "targets": {
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/picsa-server-legacy/test/**/*.ts"]
@@ -16,8 +16,7 @@
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/apps/picsa-server-legacy/test"],
       "options": {
-        "jestConfig": "apps/picsa-server-legacy/test/jest.config.ts",
-        "passWithNoTests": true
+        "jestConfig": "apps/picsa-server-legacy/test/jest.config.ts"
       }
     }
   },

apps/picsa-server/TODO.md

@@ -0,0 +1,19 @@
+**Features**
+
+**Misc**
+
+- Update legacy docs
+
+- Drop additional kobo_sync columns no longer used (not permanent store of kobo metadata)
+
+- Consider calling proxy directly from app (essentially two separate sync protocols)
+
+- Handle submit of forms created on different profile/app language
+
+**Documentation**
+
+- functions KOBO_API_KEY
+- Different endpoints (kpi default however can't create submissions and can only bulk edit, so use more kc submissions). E.g. docs https://kf.kobotoolbox.org/api/v2/assets/aLgKwDoHNd38sZyBQMV293/data/ and https://kc.kobotoolbox.org/api/v1/data
+  Submissions api only for submitting new entries, need to separately use v1 data api or v2 data api to remove data
+
+- Export insomnia workspaces

apps/picsa-server/_deprecated/project.json

@@ -14,7 +14,6 @@
         "cwd": "apps/picsa-server/docker"
       }
     },
-
     "scripts": {
       "executor": "nx:run-commands",
       "dependsOn": [],

apps/picsa-server/project.json

@@ -32,7 +32,6 @@
         "cwd": "apps/picsa-server"
       }
     },
-
     "test-functions": {
       "executor": "nx:run-commands",
       "dependsOn": [],
@@ -42,7 +41,6 @@
         "cwd": "apps/picsa-server/supabase/functions"
       }
     },
-
     "gen-types": {
       "executor": "nx:run-commands",
       "dependsOn": [],

apps/picsa-tools/budget-tool-e2e/project.json

@@ -17,7 +17,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/linter:eslint",
+      "executor": "@nx/eslint:lint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/picsa-tools/budget-tool-e2e/**/*.{js,ts}"]