Merge branch 'dev' into project-orgnames

.env.local.default

@@ -17,7 +17,7 @@ KEY=certs/key.pem
 
 # Client variables ---------------
 APP_TITLE="IR Engine"
-APP_LOGO=https://etherealengine-static.s3-us-east-1.amazonaws.com/logo.png
+APP_LOGO=https://preview.ir.world/static/ir.svg
 APP_URL=https://localhost:3000
 APP_HOST=localhost:3000
 APP_PORT=3000
@@ -226,6 +226,12 @@ OPENSEARCH_HOST=http://localhost:9200
 # Switch to `true` to enable local file system operations
 FS_PROJECT_SYNC_ENABLED=true
 
+# Metabase variables
+METABASE_SITE_URL=
+METABASE_SECRET_KEY=
+METABASE_CRASH_DASHBOARD_ID=
+METABASE_EXPIRATION=
+
 # Zendesk key for user authentication
 ZENDESK_KEY_NAME=
 ZENDESK_SECRET=

.gitignore

@@ -53,6 +53,7 @@ coverage
 
 # nyc test coverage
 .nyc_output
+coverage/
 
 # Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
 .grunt

nycrc.json

@@ -0,0 +1,35 @@
+{
+  "extension": [
+    ".ts",
+    ".tsx"
+  ],
+  "exclude": [
+    "**/*.d.ts",
+    "**/*.test.ts",
+    "**/*.test.tsx"
+  ],
+  "check-coverage": true,
+  "per-file": true,
+  "statements": 80,
+  "branches": 80,
+  "functions": 80,
+  "lines": 80,
+  "watermarks": {
+    "statements": [
+      80,
+      95
+    ],
+    "branches": [
+      80,
+      95
+    ],
+    "functions": [
+      80,
+      95
+    ],
+    "lines": [
+      80,
+      95
+    ]
+  }
+}

package.json

@@ -45,7 +45,6 @@
     "check-eslint": "eslint --quiet .",
     "checkout-dev": "lerna exec 'git checkout dev' --parallel --no-bail",
     "clean-node-modules": "npx rimraf node_modules && npx rimraf package-lock.json && npx lerna exec npx rimraf node_modules && npx lerna exec npx rimraf package-lock.json",
-    "coverage": "nyc npm run test",
     "create-root-package-json": "cross-env ts-node --swc scripts/create-root-package-json",
     "create-project": "cross-env ts-node --swc scripts/create-project",
     "depcheck": "lerna exec --no-bail --stream -- depcheck",
@@ -83,6 +82,11 @@
     "test": "cross-env TEST=true lerna run --scope '@etherealengine/*' --ignore '@etherealengine/server-core' test && lerna run --scope '@etherealengine/server-core' test && lerna run --ignore '@etherealengine/*' test",
     "test-e2e": "ts-node --swc scripts/run_e2e_tests.ts",
     "test:ci": "cpy --no-overwrite --rename=.env.local '.env.local.default' . && cross-env CI=true npm run test",
+    "test-coverage": "npm run test-coverage-generate ; npm run test-coverage-launch",
+    "test-coverage-generate": "nyc --nycrc-path ./nycrc.json --reporter=html npm run test",
+    "test-coverage-launch": "./scripts/test-coverage-launch.sh",
+    "test-coverage-check": "nyc --nycrc-path ./nycrc.json --check-coverage --per-file --silent --clean false npm run test",
+    "test-coverage-cli-report": "nyc --nycrc-path ./nycrc.json --reporter=text --skip-full true npm run test",
     "validate": "npm run lint && lerna run validate",
     "version-increment": "lerna version --conventional-commits --yes",
     "version-increment-no-tag": "lerna version --conventional-commits --yes --no-git-tag-version",
@@ -109,6 +113,7 @@
     "@eslint/eslintrc": "3.1.0",
     "@eslint/js": "9.5.0",
     "@ianvs/prettier-plugin-sort-imports": "4.1.0",
+    "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@swc/core": "1.3.41",
     "@testing-library/react": "15.0.4",
     "@types/app-root-path": "1.2.4",
@@ -145,7 +150,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-ecr": "^3.319.0",
-    "@aws-sdk/client-s3": "3.614.0",
+    "@aws-sdk/client-s3": "^3.319.0",
     "@feathersjs/errors": "5.0.5",
     "@feathersjs/feathers": "5.0.5",
     "@feathersjs/schema": "5.0.5",

packages/client-core/i18n/en/admin.json

@@ -83,9 +83,12 @@
       "all": "All",
       "refresh": "Refresh",
       "name": "Name",
+      "lastUpdatedBy": "Last updated by user id: {{userId}} on {{updatedAt}}",
       "fillRequiredFields": "Please fill all required field",
       "fixErrorFields": "Please fix all errors",
-      "logOut": "Log Out"
+      "logOut": "Log Out",
+      "newestFirst": "Newest First",
+      "oldestFirst": "Oldest First"
     },
     "analytics": {
       "loading": "Loading analytics...",
@@ -102,6 +105,10 @@
       "activity": "Activity",
       "users": "Users"
     },
+    "crashReport": {
+      "title": "Crash Report",
+      "loading": "Loading crash report..."
+    },
     "group": {
       "createGroup": "Create Group",
       "name": "Name",
@@ -199,6 +206,7 @@
         "name": "Name",
         "projectVersion": "Version",
         "enabled": "Enabled",
+        "visibility": "Visibility",
         "commitSHA": "Commit SHA",
         "commitDate": "Commit Date",
         "actions": "Actions"
@@ -208,8 +216,10 @@
         "repo": "Repo",
         "access": "Access",
         "invalidateCache": "Invalidate Cache",
-        "update": "Update"
+        "update": "Update",
+        "history": "History"
       },
+      "projectHistory": "Project History",
       "addProject": "Add Project",
       "updateProject": "Update Project",
       "downloadProject": "Download Project",
@@ -532,7 +542,6 @@
         "delete": "Delete",
         "add": "Add",
         "noSettingsMessage": "No settings available",
-        "lastUpdatedBy": "Last updated by user id: {{userId}}",
         "duplicateKey": "Duplicate keys cannot exist",
         "keyName": "Key Name",
         "value": "Value"
@@ -556,12 +565,19 @@
         "port": "Port",
         "processInterval": "Process Interval"
       },
-
       "plugins": "Plugins",
+      "metabase": {
+        "header": "Metabase",
+        "subtitle": "Edit Metabase Settings",
+        "siteUrl": "Site Url",
+        "secretKey": "Secret Key",
+        "expiration": "Expiration",
+        "crashDashboardId": "Crash Dashboard Id"
+      },
       "zendesk": {
         "header": "Zendesk",
         "subtitle": "Edit Zendesk Settings"
-      }, 
+      },
       "keyName": "key Name",
       "kid": "Key Id"
     },
@@ -623,6 +639,7 @@
         "avatar": "Avatar",
         "accountIdentifier": "Linked Accounts",
         "lastLogin": "Last Login",
+        "acceptedTOS": "TOS Agreed",
         "isGuest": "Is Guest",
         "action": "Action"
       },

packages/client-core/i18n/en/common.json

@@ -47,6 +47,8 @@
     "loadingAllowed": "Loading allowed routes...",
     "loadingXRSystems": "Loading immersive session...",
     "connectingToWorld": "Connecting to world...",
+    "needToAgreeTOS": "You need to agree the terms of service to access chat.",
+    "needToLogIn": "You need to log in to access chat.",
     "connectingToMedia": "Connecting to media...",
     "entering": "Entering world...",
     "loading": "Loading...",
@@ -130,7 +132,8 @@
   "error": {
     "loading-error": "Failed to load user data",
     "validation-error": "Please input valid {{type}}",
-    "login-error": "Failed to login"
+    "login-error": "Failed to login",
+    "expiredToken": "The token has expired."
   },
   "table": {
     "refetching": "Refetching Data...",