Compare commits
48 Commits
831532739c
...
accountvie
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
36eb9a16b0 | ||
|
|
203cf6b078 | ||
|
|
9b84b28a78 | ||
| 7abce8f95c | |||
| 88dce4d100 | |||
| 06fdaff879 | |||
| 8024a3d02a | |||
|
|
223031866b | ||
|
|
cb75b25529 | ||
| 83b470e28a | |||
|
|
acf104eaa7 | ||
|
|
e793d7a9e2 | ||
|
|
3ecae0be0f | ||
|
|
d37e53b1a9 | ||
|
|
2f89c7e13b | ||
|
|
6bf4055c2f | ||
|
|
bf7ee630d0 | ||
| 1739567b18 | |||
|
|
a5a9af5ddc | ||
|
|
4e3e293495 | ||
|
|
65533c15d2 | ||
|
|
2530bc0ec2 | ||
| 5050156beb | |||
| b1fa6ac458 | |||
| 9ff24f8258 | |||
|
|
9a3409c29f | ||
| d265a9f78c | |||
| f848de15f1 | |||
| ebaf2dedf0 | |||
|
|
749204f96b | ||
|
|
a142737771 | ||
| 1053bb6e4c | |||
| 88f46787e5 | |||
|
|
d9230d0be8 | ||
|
|
38f301f053 | ||
| e42552c67a | |||
|
|
c06ffec466 | ||
|
|
8b199ec76c | ||
|
|
d32cca4f53 | ||
|
|
4004d9fe52 | ||
|
|
2f99d0b416 | ||
|
|
9c3002f9c7 | ||
|
|
82fd7cddf7 | ||
|
|
10f2920e11 | ||
|
|
75c89b471c | ||
|
|
a804877a08 | ||
|
|
f7441f39e7 | ||
|
|
e647af0777 |
57
BUILDING.md
57
BUILDING.md
@@ -1151,28 +1151,28 @@ If you need to build manually or want to understand the individual steps:
|
|||||||
|
|
||||||
- ... and you may have to fix these, especially with pkgx:
|
- ... and you may have to fix these, especially with pkgx:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
gem_path=$(which gem)
|
gem_path=$(which gem)
|
||||||
shortened_path="${gem_path:h:h}"
|
shortened_path="${gem_path:h:h}"
|
||||||
export GEM_HOME=$shortened_path
|
export GEM_HOME=$shortened_path
|
||||||
export GEM_PATH=$shortened_path
|
export GEM_PATH=$shortened_path
|
||||||
```
|
```
|
||||||
|
|
||||||
##### 1. Bump the version in package.json for `MARKETING_VERSION`, then `grep CURRENT_PROJECT_VERSION ios/App/App.xcodeproj/project.pbxproj` and add 1 for the numbered version;
|
##### 1. Bump the version in package.json for `MARKETING_VERSION`, then `grep CURRENT_PROJECT_VERSION ios/App/App.xcodeproj/project.pbxproj` and add 1 for the numbered version;
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cd ios/App && xcrun agvtool new-version 46 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.1.1;/g" App.xcodeproj/project.pbxproj && cd -
|
cd ios/App && xcrun agvtool new-version 47 && perl -p -i -e "s/MARKETING_VERSION = .*;/MARKETING_VERSION = 1.1.2;/g" App.xcodeproj/project.pbxproj && cd -
|
||||||
# Unfortunately this edits Info.plist directly.
|
# Unfortunately this edits Info.plist directly.
|
||||||
#xcrun agvtool new-marketing-version 0.4.5
|
#xcrun agvtool new-marketing-version 0.4.5
|
||||||
```
|
```
|
||||||
|
|
||||||
##### 2. Build
|
##### 2. Build
|
||||||
|
|
||||||
Here's prod. Also available: test, dev
|
Here's prod. Also available: test, dev
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npm run build:ios:prod
|
npm run build:ios:prod
|
||||||
```
|
```
|
||||||
|
|
||||||
3.1. Use Xcode to build and run on simulator or device.
|
3.1. Use Xcode to build and run on simulator or device.
|
||||||
|
|
||||||
@@ -1197,7 +1197,8 @@ If you need to build manually or want to understand the individual steps:
|
|||||||
- It can take 15 minutes for the build to show up in the list of builds.
|
- It can take 15 minutes for the build to show up in the list of builds.
|
||||||
- You'll probably have to "Manage" something about encryption, disallowed in France.
|
- You'll probably have to "Manage" something about encryption, disallowed in France.
|
||||||
- Then "Save" and "Add to Review" and "Resubmit to App Review".
|
- Then "Save" and "Add to Review" and "Resubmit to App Review".
|
||||||
- Eventually it'll be "Ready for Distribution" which means
|
- Eventually it'll be "Ready for Distribution" which means it's live
|
||||||
|
- When finished, bump package.json version
|
||||||
|
|
||||||
### Android Build
|
### Android Build
|
||||||
|
|
||||||
@@ -1315,26 +1316,26 @@ The recommended way to build for Android is using the automated build script:
|
|||||||
|
|
||||||
#### Android Manual Build Process
|
#### Android Manual Build Process
|
||||||
|
|
||||||
##### 1. Bump the version in package.json, then here: android/app/build.gradle
|
##### 1. Bump the version in package.json, then update these versions & run:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
perl -p -i -e 's/versionCode .*/versionCode 46/g' android/app/build.gradle
|
perl -p -i -e 's/versionCode .*/versionCode 47/g' android/app/build.gradle
|
||||||
perl -p -i -e 's/versionName .*/versionName "1.1.1"/g' android/app/build.gradle
|
perl -p -i -e 's/versionName .*/versionName "1.1.2"/g' android/app/build.gradle
|
||||||
```
|
```
|
||||||
|
|
||||||
##### 2. Build
|
##### 2. Build
|
||||||
|
|
||||||
Here's prod. Also available: test, dev
|
Here's prod. Also available: test, dev
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npm run build:android:prod
|
npm run build:android:prod
|
||||||
```
|
```
|
||||||
|
|
||||||
##### 3. Open the project in Android Studio
|
##### 3. Open the project in Android Studio
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
npx cap open android
|
npx cap open android
|
||||||
```
|
```
|
||||||
|
|
||||||
##### 4. Use Android Studio to build and run on emulator or device
|
##### 4. Use Android Studio to build and run on emulator or device
|
||||||
|
|
||||||
@@ -1379,6 +1380,8 @@ At play.google.com/console:
|
|||||||
- Note that if you add testers, you have to go to "Publishing Overview" and send
|
- Note that if you add testers, you have to go to "Publishing Overview" and send
|
||||||
those changes or your (closed) testers won't see it.
|
those changes or your (closed) testers won't see it.
|
||||||
|
|
||||||
|
- When finished, bump package.json version
|
||||||
|
|
||||||
### Capacitor Operations
|
### Capacitor Operations
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
|
|||||||
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
|
||||||
|
## [1.1.2] - 2025.11.06
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- Bad page when user follows prompt to backup seed
|
||||||
|
|
||||||
|
|
||||||
## [1.1.1] - 2025.11.03
|
## [1.1.1] - 2025.11.03
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@@ -31,8 +31,8 @@ android {
|
|||||||
applicationId "app.timesafari.app"
|
applicationId "app.timesafari.app"
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 46
|
versionCode 47
|
||||||
versionName "1.1.1"
|
versionName "1.1.2"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
aaptOptions {
|
aaptOptions {
|
||||||
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ dependencies {
|
|||||||
implementation project(':capacitor-share')
|
implementation project(':capacitor-share')
|
||||||
implementation project(':capacitor-status-bar')
|
implementation project(':capacitor-status-bar')
|
||||||
implementation project(':capawesome-capacitor-file-picker')
|
implementation project(':capawesome-capacitor-file-picker')
|
||||||
implementation project(':timesafari-daily-notification-plugin')
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -36,30 +36,6 @@
|
|||||||
android:grantUriPermissions="true">
|
android:grantUriPermissions="true">
|
||||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
|
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths" />
|
||||||
</provider>
|
</provider>
|
||||||
|
|
||||||
<!-- Daily Notification Plugin Receivers -->
|
|
||||||
<receiver
|
|
||||||
android:name="com.timesafari.dailynotification.DailyNotificationReceiver"
|
|
||||||
android:enabled="true"
|
|
||||||
android:exported="false">
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="com.timesafari.daily.NOTIFICATION" />
|
|
||||||
</intent-filter>
|
|
||||||
</receiver>
|
|
||||||
<receiver
|
|
||||||
android:name="com.timesafari.dailynotification.BootReceiver"
|
|
||||||
android:directBootAware="true"
|
|
||||||
android:enabled="true"
|
|
||||||
android:exported="true">
|
|
||||||
<intent-filter android:priority="1000">
|
|
||||||
<!-- Delivered very early after reboot (before unlock) -->
|
|
||||||
<action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
|
|
||||||
<!-- Delivered after the user unlocks / credential-encrypted storage is available -->
|
|
||||||
<action android:name="android.intent.action.BOOT_COMPLETED" />
|
|
||||||
<!-- Delivered after app update; great for rescheduling alarms without reboot -->
|
|
||||||
<action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
|
|
||||||
</intent-filter>
|
|
||||||
</receiver>
|
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
<!-- Permissions -->
|
<!-- Permissions -->
|
||||||
@@ -69,15 +45,4 @@
|
|||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||||
<uses-permission android:name="android.permission.CAMERA" />
|
<uses-permission android:name="android.permission.CAMERA" />
|
||||||
<uses-feature android:name="android.hardware.camera" android:required="true" />
|
<uses-feature android:name="android.hardware.camera" android:required="true" />
|
||||||
|
|
||||||
<!-- Notification permissions -->
|
|
||||||
<!-- POST_NOTIFICATIONS required for Android 13+ (API 33+) -->
|
|
||||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
|
||||||
|
|
||||||
<!-- SCHEDULE_EXACT_ALARM required for Android 12+ (API 31+) to schedule exact alarms -->
|
|
||||||
<!-- Note: On Android 12+, users can grant/deny this permission -->
|
|
||||||
<uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
|
|
||||||
|
|
||||||
<!-- RECEIVE_BOOT_COMPLETED needed to reschedule notifications after device reboot -->
|
|
||||||
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
|
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|||||||
@@ -34,9 +34,5 @@
|
|||||||
{
|
{
|
||||||
"pkg": "@capawesome/capacitor-file-picker",
|
"pkg": "@capawesome/capacitor-file-picker",
|
||||||
"classpath": "io.capawesome.capacitorjs.plugins.filepicker.FilePickerPlugin"
|
"classpath": "io.capawesome.capacitorjs.plugins.filepicker.FilePickerPlugin"
|
||||||
},
|
|
||||||
{
|
|
||||||
"pkg": "@timesafari/daily-notification-plugin",
|
|
||||||
"classpath": "com.timesafari.dailynotification.DailyNotificationPlugin"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -28,6 +28,3 @@ project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacit
|
|||||||
|
|
||||||
include ':capawesome-capacitor-file-picker'
|
include ':capawesome-capacitor-file-picker'
|
||||||
project(':capawesome-capacitor-file-picker').projectDir = new File('../node_modules/@capawesome/capacitor-file-picker/android')
|
project(':capawesome-capacitor-file-picker').projectDir = new File('../node_modules/@capawesome/capacitor-file-picker/android')
|
||||||
|
|
||||||
include ':timesafari-daily-notification-plugin'
|
|
||||||
project(':timesafari-daily-notification-plugin').projectDir = new File('../node_modules/@timesafari/daily-notification-plugin/android')
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -403,7 +403,7 @@
|
|||||||
buildSettings = {
|
buildSettings = {
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 46;
|
CURRENT_PROJECT_VERSION = 47;
|
||||||
DEVELOPMENT_TEAM = GM3FS5JQPH;
|
DEVELOPMENT_TEAM = GM3FS5JQPH;
|
||||||
ENABLE_APP_SANDBOX = NO;
|
ENABLE_APP_SANDBOX = NO;
|
||||||
ENABLE_USER_SCRIPT_SANDBOXING = NO;
|
ENABLE_USER_SCRIPT_SANDBOXING = NO;
|
||||||
@@ -413,7 +413,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.1.1;
|
MARKETING_VERSION = 1.1.2;
|
||||||
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
|
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
|
PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
@@ -430,7 +430,7 @@
|
|||||||
buildSettings = {
|
buildSettings = {
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
CODE_SIGN_STYLE = Automatic;
|
CODE_SIGN_STYLE = Automatic;
|
||||||
CURRENT_PROJECT_VERSION = 46;
|
CURRENT_PROJECT_VERSION = 47;
|
||||||
DEVELOPMENT_TEAM = GM3FS5JQPH;
|
DEVELOPMENT_TEAM = GM3FS5JQPH;
|
||||||
ENABLE_APP_SANDBOX = NO;
|
ENABLE_APP_SANDBOX = NO;
|
||||||
ENABLE_USER_SCRIPT_SANDBOXING = NO;
|
ENABLE_USER_SCRIPT_SANDBOXING = NO;
|
||||||
@@ -440,7 +440,7 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
MARKETING_VERSION = 1.1.1;
|
MARKETING_VERSION = 1.1.2;
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
|
PRODUCT_BUNDLE_IDENTIFIER = app.timesafari;
|
||||||
PRODUCT_NAME = "$(TARGET_NAME)";
|
PRODUCT_NAME = "$(TARGET_NAME)";
|
||||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
|
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
|
||||||
|
|||||||
46
package-lock.json
generated
46
package-lock.json
generated
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "timesafari",
|
"name": "timesafari",
|
||||||
"version": "1.1.2-beta",
|
"version": "1.1.3-beta",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "timesafari",
|
"name": "timesafari",
|
||||||
"version": "1.1.2-beta",
|
"version": "1.1.3-beta",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@capacitor-community/electron": "^5.0.1",
|
"@capacitor-community/electron": "^5.0.1",
|
||||||
"@capacitor-community/sqlite": "6.0.2",
|
"@capacitor-community/sqlite": "6.0.2",
|
||||||
@@ -37,7 +37,6 @@
|
|||||||
"@pvermeer/dexie-encrypted-addon": "^3.0.0",
|
"@pvermeer/dexie-encrypted-addon": "^3.0.0",
|
||||||
"@simplewebauthn/browser": "^10.0.0",
|
"@simplewebauthn/browser": "^10.0.0",
|
||||||
"@simplewebauthn/server": "^10.0.0",
|
"@simplewebauthn/server": "^10.0.0",
|
||||||
"@timesafari/daily-notification-plugin": "file:../daily-notification-plugin",
|
|
||||||
"@tweenjs/tween.js": "^21.1.1",
|
"@tweenjs/tween.js": "^21.1.1",
|
||||||
"@types/qrcode": "^1.5.5",
|
"@types/qrcode": "^1.5.5",
|
||||||
"@veramo/core": "^5.6.0",
|
"@veramo/core": "^5.6.0",
|
||||||
@@ -150,43 +149,6 @@
|
|||||||
"vite": "^5.2.0"
|
"vite": "^5.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"../daily-notification-plugin": {
|
|
||||||
"name": "@timesafari/daily-notification-plugin",
|
|
||||||
"version": "1.0.1",
|
|
||||||
"license": "MIT",
|
|
||||||
"workspaces": [
|
|
||||||
"packages/*"
|
|
||||||
],
|
|
||||||
"dependencies": {
|
|
||||||
"@capacitor/core": "^6.2.1"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@capacitor/android": "^6.2.1",
|
|
||||||
"@capacitor/cli": "^6.2.1",
|
|
||||||
"@capacitor/ios": "^6.2.1",
|
|
||||||
"@types/jest": "^29.5.0",
|
|
||||||
"@types/jsdom": "^21.1.7",
|
|
||||||
"@types/node": "^20.19.0",
|
|
||||||
"@typescript-eslint/eslint-plugin": "^5.57.0",
|
|
||||||
"@typescript-eslint/parser": "^5.57.0",
|
|
||||||
"eslint": "^8.37.0",
|
|
||||||
"jest": "^29.5.0",
|
|
||||||
"jest-environment-jsdom": "^30.0.5",
|
|
||||||
"jsdom": "^26.1.0",
|
|
||||||
"markdownlint-cli2": "^0.18.1",
|
|
||||||
"prettier": "^2.8.7",
|
|
||||||
"rimraf": "^4.4.0",
|
|
||||||
"rollup": "^3.20.0",
|
|
||||||
"rollup-plugin-typescript2": "^0.31.0",
|
|
||||||
"standard-version": "^9.5.0",
|
|
||||||
"ts-jest": "^29.1.0",
|
|
||||||
"typescript": "~5.2.0",
|
|
||||||
"vite": "^7.1.9"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@0no-co/graphql.web": {
|
"node_modules/@0no-co/graphql.web": {
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/@0no-co/graphql.web/-/graphql.web-1.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/@0no-co/graphql.web/-/graphql.web-1.2.0.tgz",
|
||||||
@@ -9643,10 +9605,6 @@
|
|||||||
"node": ">=10"
|
"node": ">=10"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@timesafari/daily-notification-plugin": {
|
|
||||||
"resolved": "../daily-notification-plugin",
|
|
||||||
"link": true
|
|
||||||
},
|
|
||||||
"node_modules/@tootallnate/once": {
|
"node_modules/@tootallnate/once": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "timesafari",
|
"name": "timesafari",
|
||||||
"version": "1.1.2-beta",
|
"version": "1.1.3-beta",
|
||||||
"description": "Time Safari Application",
|
"description": "Time Safari Application",
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Time Safari Team"
|
"name": "Time Safari Team"
|
||||||
@@ -166,7 +166,6 @@
|
|||||||
"@pvermeer/dexie-encrypted-addon": "^3.0.0",
|
"@pvermeer/dexie-encrypted-addon": "^3.0.0",
|
||||||
"@simplewebauthn/browser": "^10.0.0",
|
"@simplewebauthn/browser": "^10.0.0",
|
||||||
"@simplewebauthn/server": "^10.0.0",
|
"@simplewebauthn/server": "^10.0.0",
|
||||||
"@timesafari/daily-notification-plugin": "file:../daily-notification-plugin",
|
|
||||||
"@tweenjs/tween.js": "^21.1.1",
|
"@tweenjs/tween.js": "^21.1.1",
|
||||||
"@types/qrcode": "^1.5.5",
|
"@types/qrcode": "^1.5.5",
|
||||||
"@veramo/core": "^5.6.0",
|
"@veramo/core": "^5.6.0",
|
||||||
|
|||||||
@@ -436,7 +436,21 @@ fi
|
|||||||
log_info "Cleaning dist directory..."
|
log_info "Cleaning dist directory..."
|
||||||
clean_build_artifacts "dist"
|
clean_build_artifacts "dist"
|
||||||
|
|
||||||
# Step 4: Build Capacitor version with mode
|
# Step 4: Run TypeScript type checking for test and production builds
|
||||||
|
if [ "$BUILD_MODE" = "production" ] || [ "$BUILD_MODE" = "test" ]; then
|
||||||
|
log_info "Running TypeScript type checking for $BUILD_MODE mode..."
|
||||||
|
|
||||||
|
if ! measure_time npm run type-check; then
|
||||||
|
log_error "TypeScript type checking failed for $BUILD_MODE mode!"
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
|
||||||
|
log_success "TypeScript type checking completed for $BUILD_MODE mode"
|
||||||
|
else
|
||||||
|
log_debug "Skipping TypeScript type checking for development mode"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Step 5: Build Capacitor version with mode
|
||||||
if [ "$BUILD_MODE" = "development" ]; then
|
if [ "$BUILD_MODE" = "development" ]; then
|
||||||
safe_execute "Building Capacitor version (development)" "npm run build:capacitor" || exit 3
|
safe_execute "Building Capacitor version (development)" "npm run build:capacitor" || exit 3
|
||||||
elif [ "$BUILD_MODE" = "test" ]; then
|
elif [ "$BUILD_MODE" = "test" ]; then
|
||||||
@@ -445,23 +459,23 @@ elif [ "$BUILD_MODE" = "production" ]; then
|
|||||||
safe_execute "Building Capacitor version (production)" "npm run build:capacitor -- --mode production" || exit 3
|
safe_execute "Building Capacitor version (production)" "npm run build:capacitor -- --mode production" || exit 3
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Step 5: Clean Gradle build
|
# Step 6: Clean Gradle build
|
||||||
safe_execute "Cleaning Gradle build" "cd android && ./gradlew clean && cd .." || exit 4
|
safe_execute "Cleaning Gradle build" "cd android && ./gradlew clean && cd .." || exit 4
|
||||||
|
|
||||||
# Step 6: Build based on type
|
# Step 7: Build based on type
|
||||||
if [ "$BUILD_TYPE" = "debug" ]; then
|
if [ "$BUILD_TYPE" = "debug" ]; then
|
||||||
safe_execute "Assembling debug build" "cd android && ./gradlew assembleDebug && cd .." || exit 5
|
safe_execute "Assembling debug build" "cd android && ./gradlew assembleDebug && cd .." || exit 5
|
||||||
elif [ "$BUILD_TYPE" = "release" ]; then
|
elif [ "$BUILD_TYPE" = "release" ]; then
|
||||||
safe_execute "Assembling release build" "cd android && ./gradlew assembleRelease && cd .." || exit 5
|
safe_execute "Assembling release build" "cd android && ./gradlew assembleRelease && cd .." || exit 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Step 7: Sync with Capacitor
|
# Step 8: Sync with Capacitor
|
||||||
safe_execute "Syncing with Capacitor" "npx cap sync android" || exit 6
|
safe_execute "Syncing with Capacitor" "npx cap sync android" || exit 6
|
||||||
|
|
||||||
# Step 8: Generate assets
|
# Step 9: Generate assets
|
||||||
safe_execute "Generating assets" "npx capacitor-assets generate --android" || exit 7
|
safe_execute "Generating assets" "npx capacitor-assets generate --android" || exit 7
|
||||||
|
|
||||||
# Step 9: Build APK/AAB if requested
|
# Step 10: Build APK/AAB if requested
|
||||||
if [ "$BUILD_APK" = true ]; then
|
if [ "$BUILD_APK" = true ]; then
|
||||||
if [ "$BUILD_TYPE" = "debug" ]; then
|
if [ "$BUILD_TYPE" = "debug" ]; then
|
||||||
safe_execute "Building debug APK" "cd android && ./gradlew assembleDebug && cd .." || exit 5
|
safe_execute "Building debug APK" "cd android && ./gradlew assembleDebug && cd .." || exit 5
|
||||||
@@ -474,7 +488,7 @@ if [ "$BUILD_AAB" = true ]; then
|
|||||||
safe_execute "Building AAB" "cd android && ./gradlew bundleRelease && cd .." || exit 5
|
safe_execute "Building AAB" "cd android && ./gradlew bundleRelease && cd .." || exit 5
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Step 10: Auto-run app if requested
|
# Step 11: Auto-run app if requested
|
||||||
if [ "$AUTO_RUN" = true ]; then
|
if [ "$AUTO_RUN" = true ]; then
|
||||||
log_step "Auto-running Android app..."
|
log_step "Auto-running Android app..."
|
||||||
safe_execute "Launching app" "npx cap run android" || {
|
safe_execute "Launching app" "npx cap run android" || {
|
||||||
@@ -485,7 +499,7 @@ if [ "$AUTO_RUN" = true ]; then
|
|||||||
log_success "Android app launched successfully!"
|
log_success "Android app launched successfully!"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Step 11: Open Android Studio if requested
|
# Step 12: Open Android Studio if requested
|
||||||
if [ "$OPEN_STUDIO" = true ]; then
|
if [ "$OPEN_STUDIO" = true ]; then
|
||||||
safe_execute "Opening Android Studio" "npx cap open android" || exit 8
|
safe_execute "Opening Android Studio" "npx cap open android" || exit 8
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -381,7 +381,21 @@ safe_execute "Cleaning iOS build" "clean_ios_build" || exit 1
|
|||||||
log_info "Cleaning dist directory..."
|
log_info "Cleaning dist directory..."
|
||||||
clean_build_artifacts "dist"
|
clean_build_artifacts "dist"
|
||||||
|
|
||||||
# Step 4: Build Capacitor version with mode
|
# Step 4: Run TypeScript type checking for test and production builds
|
||||||
|
if [ "$BUILD_MODE" = "production" ] || [ "$BUILD_MODE" = "test" ]; then
|
||||||
|
log_info "Running TypeScript type checking for $BUILD_MODE mode..."
|
||||||
|
|
||||||
|
if ! measure_time npm run type-check; then
|
||||||
|
log_error "TypeScript type checking failed for $BUILD_MODE mode!"
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
|
||||||
|
log_success "TypeScript type checking completed for $BUILD_MODE mode"
|
||||||
|
else
|
||||||
|
log_debug "Skipping TypeScript type checking for development mode"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Step 5: Build Capacitor version with mode
|
||||||
if [ "$BUILD_MODE" = "development" ]; then
|
if [ "$BUILD_MODE" = "development" ]; then
|
||||||
safe_execute "Building Capacitor version (development)" "npm run build:capacitor" || exit 3
|
safe_execute "Building Capacitor version (development)" "npm run build:capacitor" || exit 3
|
||||||
elif [ "$BUILD_MODE" = "test" ]; then
|
elif [ "$BUILD_MODE" = "test" ]; then
|
||||||
@@ -390,16 +404,16 @@ elif [ "$BUILD_MODE" = "production" ]; then
|
|||||||
safe_execute "Building Capacitor version (production)" "npm run build:capacitor -- --mode production" || exit 3
|
safe_execute "Building Capacitor version (production)" "npm run build:capacitor -- --mode production" || exit 3
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Step 5: Sync with Capacitor
|
# Step 6: Sync with Capacitor
|
||||||
safe_execute "Syncing with Capacitor" "npx cap sync ios" || exit 6
|
safe_execute "Syncing with Capacitor" "npx cap sync ios" || exit 6
|
||||||
|
|
||||||
# Step 6: Generate assets
|
# Step 7: Generate assets
|
||||||
safe_execute "Generating assets" "npx capacitor-assets generate --ios" || exit 7
|
safe_execute "Generating assets" "npx capacitor-assets generate --ios" || exit 7
|
||||||
|
|
||||||
# Step 7: Build iOS app
|
# Step 8: Build iOS app
|
||||||
safe_execute "Building iOS app" "build_ios_app" || exit 5
|
safe_execute "Building iOS app" "build_ios_app" || exit 5
|
||||||
|
|
||||||
# Step 8: Build IPA/App if requested
|
# Step 9: Build IPA/App if requested
|
||||||
if [ "$BUILD_IPA" = true ]; then
|
if [ "$BUILD_IPA" = true ]; then
|
||||||
log_info "Building IPA package..."
|
log_info "Building IPA package..."
|
||||||
cd ios/App
|
cd ios/App
|
||||||
@@ -426,12 +440,12 @@ if [ "$BUILD_APP" = true ]; then
|
|||||||
log_success "App bundle built successfully"
|
log_success "App bundle built successfully"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Step 9: Auto-run app if requested
|
# Step 10: Auto-run app if requested
|
||||||
if [ "$AUTO_RUN" = true ]; then
|
if [ "$AUTO_RUN" = true ]; then
|
||||||
safe_execute "Auto-running iOS app" "auto_run_ios_app" || exit 9
|
safe_execute "Auto-running iOS app" "auto_run_ios_app" || exit 9
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Step 10: Open Xcode if requested
|
# Step 11: Open Xcode if requested
|
||||||
if [ "$OPEN_STUDIO" = true ]; then
|
if [ "$OPEN_STUDIO" = true ]; then
|
||||||
safe_execute "Opening Xcode" "npx cap open ios" || exit 8
|
safe_execute "Opening Xcode" "npx cap open ios" || exit 8
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.dialog {
|
.dialog {
|
||||||
@apply bg-white px-4 py-6 rounded-lg w-full max-w-lg max-h-[90%] overflow-y-auto;
|
@apply bg-white px-4 py-6 rounded-lg w-full max-w-lg max-h-[calc(100vh-3rem)] overflow-y-auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Markdown content styling to restore list elements */
|
/* Markdown content styling to restore list elements */
|
||||||
|
|||||||
@@ -111,7 +111,7 @@
|
|||||||
? 'bg-blue-600 text-white cursor-pointer'
|
? 'bg-blue-600 text-white cursor-pointer'
|
||||||
: 'bg-slate-400 text-slate-200 cursor-not-allowed',
|
: 'bg-slate-400 text-slate-200 cursor-not-allowed',
|
||||||
]"
|
]"
|
||||||
@click="handleMainAction"
|
@click="processSelectedMembers"
|
||||||
>
|
>
|
||||||
{{ buttonText }}
|
{{ buttonText }}
|
||||||
</button>
|
</button>
|
||||||
@@ -145,7 +145,7 @@ import { Contact } from "@/db/tables/contacts";
|
|||||||
export default class BulkMembersDialog extends Vue {
|
export default class BulkMembersDialog extends Vue {
|
||||||
@Prop({ default: "" }) activeDid!: string;
|
@Prop({ default: "" }) activeDid!: string;
|
||||||
@Prop({ default: "" }) apiServer!: string;
|
@Prop({ default: "" }) apiServer!: string;
|
||||||
@Prop({ required: true }) dialogType!: "admit" | "visibility";
|
// isOrganizer: true = organizer mode (admit members), false = member mode (set visibility)
|
||||||
@Prop({ required: true }) isOrganizer!: boolean;
|
@Prop({ required: true }) isOrganizer!: boolean;
|
||||||
|
|
||||||
// Vue notification system
|
// Vue notification system
|
||||||
@@ -252,15 +252,7 @@ export default class BulkMembersDialog extends Vue {
|
|||||||
return this.selectedMembers.includes(memberDid);
|
return this.selectedMembers.includes(memberDid);
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleMainAction() {
|
async processSelectedMembers() {
|
||||||
if (this.dialogType === "admit") {
|
|
||||||
await this.organizerAdmitAndAddWithVisibility();
|
|
||||||
} else {
|
|
||||||
await this.memberAddContactWithVisibility();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async organizerAdmitAndAddWithVisibility() {
|
|
||||||
try {
|
try {
|
||||||
const selectedMembers: MemberData[] = this.membersData.filter((member) =>
|
const selectedMembers: MemberData[] = this.membersData.filter((member) =>
|
||||||
this.selectedMembers.includes(member.did),
|
this.selectedMembers.includes(member.did),
|
||||||
@@ -275,16 +267,20 @@ export default class BulkMembersDialog extends Vue {
|
|||||||
|
|
||||||
for (const member of selectedMembers) {
|
for (const member of selectedMembers) {
|
||||||
try {
|
try {
|
||||||
// First, admit the member
|
// Organizer mode: admit and register the member first
|
||||||
await this.admitMember(member);
|
if (this.isOrganizer) {
|
||||||
|
await this.admitMember(member);
|
||||||
// Register them
|
await this.registerMember(member);
|
||||||
await this.registerMember(member);
|
admittedCount++;
|
||||||
admittedCount++;
|
}
|
||||||
|
|
||||||
// If they're not a contact yet, add them as a contact
|
// If they're not a contact yet, add them as a contact
|
||||||
if (!member.isContact) {
|
if (!member.isContact) {
|
||||||
await this.addAsContact(member, true);
|
// Organizer mode: set isRegistered to true, member mode: undefined
|
||||||
|
await this.addAsContact(
|
||||||
|
member,
|
||||||
|
this.isOrganizer ? true : undefined,
|
||||||
|
);
|
||||||
contactAddedCount++;
|
contactAddedCount++;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -299,88 +295,51 @@ export default class BulkMembersDialog extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Show success notification
|
// Show success notification
|
||||||
if (admittedCount > 0) {
|
if (this.isOrganizer) {
|
||||||
this.$notify(
|
if (admittedCount > 0) {
|
||||||
{
|
this.$notify(
|
||||||
group: "alert",
|
{
|
||||||
type: "success",
|
group: "alert",
|
||||||
title: "Members Admitted Successfully",
|
type: "success",
|
||||||
text: `${admittedCount} member${admittedCount === 1 ? "" : "s"} admitted and registered${contactAddedCount === 0 ? "" : admittedCount === contactAddedCount ? " and" : `, ${contactAddedCount}`}${contactAddedCount === 0 ? "" : ` added as contact${contactAddedCount === 1 ? "" : "s"}`}.`,
|
title: "Members Admitted Successfully",
|
||||||
},
|
text: `${admittedCount} member${admittedCount === 1 ? "" : "s"} admitted and registered${contactAddedCount === 0 ? "" : admittedCount === contactAddedCount ? " and" : `, ${contactAddedCount}`}${contactAddedCount === 0 ? "" : ` added as contact${contactAddedCount === 1 ? "" : "s"}`}.`,
|
||||||
10000,
|
},
|
||||||
);
|
5000,
|
||||||
}
|
);
|
||||||
if (errors > 0) {
|
}
|
||||||
this.$notify(
|
if (errors > 0) {
|
||||||
{
|
this.$notify(
|
||||||
group: "alert",
|
{
|
||||||
type: "danger",
|
group: "alert",
|
||||||
title: "Error",
|
type: "danger",
|
||||||
text: "Failed to fully admit some members. Work with them individually below.",
|
title: "Error",
|
||||||
},
|
text: "Failed to fully admit some members. Work with them individually below.",
|
||||||
5000,
|
},
|
||||||
);
|
5000,
|
||||||
}
|
);
|
||||||
|
}
|
||||||
this.close(notSelectedMembers.map((member) => member.did));
|
} else {
|
||||||
} catch (error) {
|
// Member mode: show contacts added notification
|
||||||
// eslint-disable-next-line no-console
|
if (contactAddedCount > 0) {
|
||||||
console.error("Error admitting members:", error);
|
this.$notify(
|
||||||
this.$notify(
|
{
|
||||||
{
|
group: "alert",
|
||||||
group: "alert",
|
type: "success",
|
||||||
type: "danger",
|
title: "Contacts Added Successfully",
|
||||||
title: "Error",
|
text: `${contactAddedCount} member${contactAddedCount === 1 ? "" : "s"} added as contact${contactAddedCount === 1 ? "" : "s"}.`,
|
||||||
text: "Some errors occurred. Work with members individually below.",
|
},
|
||||||
},
|
5000,
|
||||||
5000,
|
);
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async memberAddContactWithVisibility() {
|
|
||||||
try {
|
|
||||||
const selectedMembers: MemberData[] = this.membersData.filter((member) =>
|
|
||||||
this.selectedMembers.includes(member.did),
|
|
||||||
);
|
|
||||||
const notSelectedMembers: MemberData[] = this.membersData.filter(
|
|
||||||
(member) => !this.selectedMembers.includes(member.did),
|
|
||||||
);
|
|
||||||
|
|
||||||
let contactsAddedCount = 0;
|
|
||||||
|
|
||||||
for (const member of selectedMembers) {
|
|
||||||
try {
|
|
||||||
// If they're not a contact yet, add them as a contact first
|
|
||||||
if (!member.isContact) {
|
|
||||||
await this.addAsContact(member, undefined);
|
|
||||||
contactsAddedCount++;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set their seesMe to true
|
|
||||||
await this.updateContactVisibility(member.did, true);
|
|
||||||
} catch (error) {
|
|
||||||
// eslint-disable-next-line no-console
|
|
||||||
console.error(`Error processing member ${member.did}:`, error);
|
|
||||||
// Continue with other members even if one fails
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show success notification
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "success",
|
|
||||||
title: "Contacts Added Successfully",
|
|
||||||
text: `${contactsAddedCount} member${contactsAddedCount === 1 ? "" : "s"} added as contact${contactsAddedCount === 1 ? "" : "s"}.`,
|
|
||||||
},
|
|
||||||
5000,
|
|
||||||
);
|
|
||||||
|
|
||||||
this.close(notSelectedMembers.map((member) => member.did));
|
this.close(notSelectedMembers.map((member) => member.did));
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// eslint-disable-next-line no-console
|
// eslint-disable-next-line no-console
|
||||||
console.error("Error adding contacts:", error);
|
console.error(
|
||||||
|
`Error ${this.isOrganizer ? "admitting members" : "adding contacts"}:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
group: "alert",
|
group: "alert",
|
||||||
@@ -487,10 +446,10 @@ export default class BulkMembersDialog extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
showContactInfo() {
|
showContactInfo() {
|
||||||
const message =
|
// isOrganizer: true = admit mode, false = visibility mode
|
||||||
this.dialogType === "admit"
|
const message = this.isOrganizer
|
||||||
? "This user is already your contact, but they are not yet admitted to the meeting."
|
? "This user is already your contact, but they are not yet admitted to the meeting."
|
||||||
: "This user is already your contact, but your activities are not visible to them yet.";
|
: "This user is already your contact, but your activities are not visible to them yet.";
|
||||||
|
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ messages * - Conditional UI based on platform capabilities * * @component *
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div id="sectionDataExport" :class="containerClasses">
|
<div id="sectionDataExport" :class="containerClasses">
|
||||||
<div :class="titleClasses">Data Export</div>
|
<div :class="titleClasses">Data Management</div>
|
||||||
<router-link
|
<router-link
|
||||||
v-if="activeDid"
|
v-if="activeDid"
|
||||||
:to="{ name: 'seed-backup' }"
|
:to="{ name: 'seed-backup' }"
|
||||||
@@ -30,7 +30,7 @@ messages * - Conditional UI based on platform capabilities * * @component *
|
|||||||
:class="exportButtonClasses"
|
:class="exportButtonClasses"
|
||||||
@click="exportDatabase()"
|
@click="exportDatabase()"
|
||||||
>
|
>
|
||||||
{{ isExporting ? "Exporting..." : "Download Contacts" }}
|
{{ isExporting ? "Exporting..." : "Export Contacts" }}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
@@ -55,11 +55,54 @@ messages * - Conditional UI based on platform capabilities * * @component *
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Import Contacts -->
|
||||||
|
<div id="sectionImportContactsSettings" class="mt-4">
|
||||||
|
<h2 class="text-slate-500 text-sm font-bold">Import Contacts</h2>
|
||||||
|
|
||||||
|
<div class="mt-2">
|
||||||
|
<input
|
||||||
|
type="file"
|
||||||
|
class="w-full bg-white rounded-md pe-2 file:border-0 file:bg-gradient-to-b file:from-blue-400 file:to-blue-700 file:shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] file:text-white file:px-3 file:py-2 file:me-2 file:rounded-s-md"
|
||||||
|
@change="uploadImportFile"
|
||||||
|
/>
|
||||||
|
<transition
|
||||||
|
enter-active-class="transform ease-out duration-300 transition"
|
||||||
|
enter-from-class="translate-y-2 opacity-0 sm:translate-y-4"
|
||||||
|
enter-to-class="translate-y-0 opacity-100 sm:translate-y-0"
|
||||||
|
leave-active-class="transition ease-in duration-500"
|
||||||
|
leave-from-class="opacity-100"
|
||||||
|
leave-to-class="opacity-0"
|
||||||
|
>
|
||||||
|
<div v-if="showContactImport()" class="mt-2">
|
||||||
|
<!-- Bulk import has an error
|
||||||
|
<div class="flex justify-center">
|
||||||
|
<button
|
||||||
|
class="block text-center text-md bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-6"
|
||||||
|
@click="confirmSubmitImportFile()"
|
||||||
|
>
|
||||||
|
Overwrite Settings & Contacts
|
||||||
|
<br />
|
||||||
|
(which doesn't include Identifier Data)
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
-->
|
||||||
|
<button
|
||||||
|
class="block w-full text-center text-md bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
|
||||||
|
@click="checkContactImports()"
|
||||||
|
>
|
||||||
|
Import Contacts
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</transition>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Prop, Vue } from "vue-facing-decorator";
|
import { Component, Prop, Vue } from "vue-facing-decorator";
|
||||||
|
import { Router } from "vue-router";
|
||||||
import * as R from "ramda";
|
import * as R from "ramda";
|
||||||
|
|
||||||
import { AppString, NotificationIface } from "../constants/app";
|
import { AppString, NotificationIface } from "../constants/app";
|
||||||
@@ -67,8 +110,10 @@ import { Contact } from "../db/tables/contacts";
|
|||||||
|
|
||||||
import { logger } from "../utils/logger";
|
import { logger } from "../utils/logger";
|
||||||
import { contactsToExportJson } from "../libs/util";
|
import { contactsToExportJson } from "../libs/util";
|
||||||
import { createNotifyHelpers } from "@/utils/notify";
|
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
||||||
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
||||||
|
import { ACCOUNT_VIEW_CONSTANTS } from "@/constants/accountView";
|
||||||
|
import { ImportContent } from "@/interfaces/accountView";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @vue-component
|
* @vue-component
|
||||||
@@ -91,6 +136,12 @@ export default class DataExportSection extends Vue {
|
|||||||
*/
|
*/
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Router instance injected by Vue
|
||||||
|
* Used for navigation
|
||||||
|
*/
|
||||||
|
$router!: Router;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Active DID (Decentralized Identifier) of the user
|
* Active DID (Decentralized Identifier) of the user
|
||||||
* Controls visibility of seed backup option
|
* Controls visibility of seed backup option
|
||||||
@@ -110,6 +161,12 @@ export default class DataExportSection extends Vue {
|
|||||||
*/
|
*/
|
||||||
showRedNotificationDot = false;
|
showRedNotificationDot = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reference to the selected import file
|
||||||
|
* Used to store the file selected by the user for import
|
||||||
|
*/
|
||||||
|
private inputImportFileName: Blob | undefined;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Notification helper for consistent notification patterns
|
* Notification helper for consistent notification patterns
|
||||||
* Created as a getter to ensure $notify is available when called
|
* Created as a getter to ensure $notify is available when called
|
||||||
@@ -200,12 +257,30 @@ export default class DataExportSection extends Vue {
|
|||||||
// first remove the contactMethods field, mostly to cast to a clear type (that will end up with JSON objects)
|
// first remove the contactMethods field, mostly to cast to a clear type (that will end up with JSON objects)
|
||||||
const exContact: Contact = R.omit(["contactMethods"], contact);
|
const exContact: Contact = R.omit(["contactMethods"], contact);
|
||||||
// now add contactMethods as a true array of ContactMethod objects
|
// now add contactMethods as a true array of ContactMethod objects
|
||||||
exContact.contactMethods = contact.contactMethods
|
// $contacts() returns normalized contacts where contactMethods is already an array,
|
||||||
? typeof contact.contactMethods === "string" &&
|
// but we handle both array and string cases for robustness
|
||||||
contact.contactMethods.trim() !== ""
|
if (contact.contactMethods) {
|
||||||
? JSON.parse(contact.contactMethods)
|
if (Array.isArray(contact.contactMethods)) {
|
||||||
: []
|
// Already an array, use it directly
|
||||||
: [];
|
exContact.contactMethods = contact.contactMethods;
|
||||||
|
} else {
|
||||||
|
// Check if it's a string that needs parsing (shouldn't happen with normalized contacts, but handle for robustness)
|
||||||
|
const contactMethodsValue = contact.contactMethods as unknown;
|
||||||
|
if (
|
||||||
|
typeof contactMethodsValue === "string" &&
|
||||||
|
contactMethodsValue.trim() !== ""
|
||||||
|
) {
|
||||||
|
// String that needs parsing
|
||||||
|
exContact.contactMethods = JSON.parse(contactMethodsValue);
|
||||||
|
} else {
|
||||||
|
// Invalid data, use empty array
|
||||||
|
exContact.contactMethods = [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// No contactMethods, use empty array
|
||||||
|
exContact.contactMethods = [];
|
||||||
|
}
|
||||||
return exContact;
|
return exContact;
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -248,5 +323,58 @@ export default class DataExportSection extends Vue {
|
|||||||
this.showRedNotificationDot = false;
|
this.showRedNotificationDot = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handles file selection for contact import
|
||||||
|
* Stores the selected file for later processing
|
||||||
|
*/
|
||||||
|
async uploadImportFile(event: Event): Promise<void> {
|
||||||
|
this.inputImportFileName = (event.target as HTMLInputElement).files?.[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if a contact import file has been selected
|
||||||
|
* Used to conditionally show the import button
|
||||||
|
*/
|
||||||
|
showContactImport(): boolean {
|
||||||
|
return !!this.inputImportFileName;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Processes the selected import file and navigates to the contact import view
|
||||||
|
* Parses the JSON file and extracts contact data for import
|
||||||
|
*/
|
||||||
|
async checkContactImports(): Promise<void> {
|
||||||
|
if (!this.inputImportFileName) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const reader = new FileReader();
|
||||||
|
reader.onload = (event) => {
|
||||||
|
const fileContent: string = (event.target?.result as string) || "{}";
|
||||||
|
try {
|
||||||
|
const contents: ImportContent = JSON.parse(fileContent);
|
||||||
|
const contactTableRows: Array<Contact> = (
|
||||||
|
contents.data?.data as [{ tableName: string; rows: Array<Contact> }]
|
||||||
|
)?.find((table) => table.tableName === "contacts")
|
||||||
|
?.rows as Array<Contact>;
|
||||||
|
const contactRows = contactTableRows.map(
|
||||||
|
// @ts-expect-error for omitting this field that is found in the Dexie format
|
||||||
|
(contact) => R.omit(["$types"], contact) as Contact,
|
||||||
|
);
|
||||||
|
this.$router.push({
|
||||||
|
name: "contact-import",
|
||||||
|
query: { contacts: JSON.stringify(contactRows) },
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
logger.error("Error checking contact imports:", error);
|
||||||
|
this.notify.error(
|
||||||
|
ACCOUNT_VIEW_CONSTANTS.ERRORS.IMPORT_ERROR,
|
||||||
|
TIMEOUTS.STANDARD,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
reader.readAsText(this.inputImportFileName);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -2,12 +2,55 @@
|
|||||||
GiftedDialog.vue to provide a reusable grid layout * for displaying people,
|
GiftedDialog.vue to provide a reusable grid layout * for displaying people,
|
||||||
projects, and special entities with selection. * * @author Matthew Raymer */
|
projects, and special entities with selection. * * @author Matthew Raymer */
|
||||||
<template>
|
<template>
|
||||||
<ul :class="gridClasses">
|
<!-- Quick Search -->
|
||||||
|
<div id="QuickSearch" class="mb-4 flex items-center text-sm">
|
||||||
|
<input
|
||||||
|
v-model="searchTerm"
|
||||||
|
type="text"
|
||||||
|
placeholder="Search…"
|
||||||
|
class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-1.5 placeholder:italic placeholder:text-slate-400 focus:outline-none"
|
||||||
|
@input="handleSearchInput"
|
||||||
|
@keydown.enter="performSearch"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
v-show="isSearching && searchTerm"
|
||||||
|
class="border-y border-slate-400 ps-2 py-1.5 text-center text-slate-400"
|
||||||
|
>
|
||||||
|
<font-awesome
|
||||||
|
icon="spinner"
|
||||||
|
class="fa-spin-pulse leading-[1.1]"
|
||||||
|
></font-awesome>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
:disabled="!searchTerm"
|
||||||
|
class="px-2 py-1.5 rounded-r bg-white border border-l-0 border-slate-400 text-slate-400 disabled:cursor-not-allowed"
|
||||||
|
@click="clearSearch"
|
||||||
|
>
|
||||||
|
<font-awesome
|
||||||
|
:icon="searchTerm ? 'times' : 'magnifying-glass'"
|
||||||
|
class="fa-fw"
|
||||||
|
></font-awesome>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="searchTerm && !isSearching && filteredEntities.length === 0"
|
||||||
|
class="mb-4 text-sm italic text-slate-500 text-center"
|
||||||
|
>
|
||||||
|
“{{ searchTerm }}” doesn't match any
|
||||||
|
{{ entityType === "people" ? "people" : "projects" }}. Try a different
|
||||||
|
search.
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<ul
|
||||||
|
ref="scrollContainer"
|
||||||
|
class="border-t border-slate-300 mb-4 max-h-[60vh] overflow-y-auto"
|
||||||
|
>
|
||||||
<!-- Special entities (You, Unnamed) for people grids -->
|
<!-- Special entities (You, Unnamed) for people grids -->
|
||||||
<template v-if="entityType === 'people'">
|
<template v-if="entityType === 'people'">
|
||||||
<!-- "You" entity -->
|
<!-- "You" entity -->
|
||||||
<SpecialEntityCard
|
<SpecialEntityCard
|
||||||
v-if="showYouEntity"
|
v-if="showYouEntity && !searchTerm.trim()"
|
||||||
entity-type="you"
|
entity-type="you"
|
||||||
label="You"
|
label="You"
|
||||||
icon="hand"
|
icon="hand"
|
||||||
@@ -21,6 +64,7 @@ projects, and special entities with selection. * * @author Matthew Raymer */
|
|||||||
|
|
||||||
<!-- "Unnamed" entity -->
|
<!-- "Unnamed" entity -->
|
||||||
<SpecialEntityCard
|
<SpecialEntityCard
|
||||||
|
v-if="showUnnamedEntity && !searchTerm.trim()"
|
||||||
entity-type="unnamed"
|
entity-type="unnamed"
|
||||||
:label="unnamedEntityName"
|
:label="unnamedEntityName"
|
||||||
icon="circle-question"
|
icon="circle-question"
|
||||||
@@ -32,22 +76,66 @@ projects, and special entities with selection. * * @author Matthew Raymer */
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<!-- Empty state message -->
|
<!-- Empty state message -->
|
||||||
<li v-if="entities.length === 0" :class="emptyStateClasses">
|
<li v-if="hasNoEntities" :class="emptyStateClasses">
|
||||||
{{ emptyStateMessage }}
|
{{ emptyStateMessage }}
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<!-- Entity cards (people or projects) -->
|
<!-- Entity cards (people or projects) -->
|
||||||
<template v-if="entityType === 'people'">
|
<template v-if="entityType === 'people'">
|
||||||
<PersonCard
|
<!-- When showing contacts without search: split into recent and alphabetical -->
|
||||||
v-for="person in displayedEntities as Contact[]"
|
<template v-if="!searchTerm.trim()">
|
||||||
:key="person.did"
|
<!-- Recently Added Section -->
|
||||||
:person="person"
|
<template v-if="recentContacts.length > 0">
|
||||||
:conflicted="isPersonConflicted(person.did)"
|
<li
|
||||||
:show-time-icon="true"
|
class="text-xs font-semibold text-slate-500 uppercase pt-5 pb-1.5 px-2 border-b border-slate-300"
|
||||||
:notify="notify"
|
>
|
||||||
:conflict-context="conflictContext"
|
Recently Added
|
||||||
@person-selected="handlePersonSelected"
|
</li>
|
||||||
/>
|
<PersonCard
|
||||||
|
v-for="person in recentContacts"
|
||||||
|
:key="person.did"
|
||||||
|
:person="person"
|
||||||
|
:conflicted="isPersonConflicted(person.did)"
|
||||||
|
:show-time-icon="true"
|
||||||
|
:notify="notify"
|
||||||
|
:conflict-context="conflictContext"
|
||||||
|
@person-selected="handlePersonSelected"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<!-- Alphabetical Section -->
|
||||||
|
<template v-if="alphabeticalContacts.length > 0">
|
||||||
|
<li
|
||||||
|
class="text-xs font-semibold text-slate-500 uppercase pt-5 pb-1.5 px-2 border-b border-slate-300"
|
||||||
|
>
|
||||||
|
Everyone
|
||||||
|
</li>
|
||||||
|
<PersonCard
|
||||||
|
v-for="person in alphabeticalContacts"
|
||||||
|
:key="person.did"
|
||||||
|
:person="person"
|
||||||
|
:conflicted="isPersonConflicted(person.did)"
|
||||||
|
:show-time-icon="true"
|
||||||
|
:notify="notify"
|
||||||
|
:conflict-context="conflictContext"
|
||||||
|
@person-selected="handlePersonSelected"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<!-- When searching: show filtered results normally -->
|
||||||
|
<template v-else>
|
||||||
|
<PersonCard
|
||||||
|
v-for="person in displayedEntities as Contact[]"
|
||||||
|
:key="person.did"
|
||||||
|
:person="person"
|
||||||
|
:conflicted="isPersonConflicted(person.did)"
|
||||||
|
:show-time-icon="true"
|
||||||
|
:notify="notify"
|
||||||
|
:conflict-context="conflictContext"
|
||||||
|
@person-selected="handlePersonSelected"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template v-else-if="entityType === 'projects'">
|
<template v-else-if="entityType === 'projects'">
|
||||||
@@ -63,27 +151,30 @@ projects, and special entities with selection. * * @author Matthew Raymer */
|
|||||||
@project-selected="handleProjectSelected"
|
@project-selected="handleProjectSelected"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<!-- Show All navigation -->
|
|
||||||
<ShowAllCard
|
|
||||||
v-if="shouldShowAll"
|
|
||||||
:entity-type="entityType"
|
|
||||||
:route-name="showAllRoute"
|
|
||||||
:query-params="showAllQueryParams"
|
|
||||||
/>
|
|
||||||
</ul>
|
</ul>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
|
import { Component, Prop, Vue, Emit, Watch } from "vue-facing-decorator";
|
||||||
|
import { useInfiniteScroll } from "@vueuse/core";
|
||||||
import PersonCard from "./PersonCard.vue";
|
import PersonCard from "./PersonCard.vue";
|
||||||
import ProjectCard from "./ProjectCard.vue";
|
import ProjectCard from "./ProjectCard.vue";
|
||||||
import SpecialEntityCard from "./SpecialEntityCard.vue";
|
import SpecialEntityCard from "./SpecialEntityCard.vue";
|
||||||
import ShowAllCard from "./ShowAllCard.vue";
|
|
||||||
import { Contact } from "../db/tables/contacts";
|
import { Contact } from "../db/tables/contacts";
|
||||||
import { PlanData } from "../interfaces/records";
|
import { PlanData } from "../interfaces/records";
|
||||||
import { NotificationIface } from "../constants/app";
|
import { NotificationIface } from "../constants/app";
|
||||||
import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
|
import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
|
||||||
|
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
||||||
|
import { getHeaders } from "../libs/endorserServer";
|
||||||
|
import { logger } from "../utils/logger";
|
||||||
|
import { TIMEOUTS } from "@/utils/notify";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constants for infinite scroll configuration
|
||||||
|
*/
|
||||||
|
const INITIAL_BATCH_SIZE = 20;
|
||||||
|
const INCREMENT_SIZE = 20;
|
||||||
|
const RECENT_CONTACTS_COUNT = 3;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EntityGrid - Unified grid layout for displaying people or projects
|
* EntityGrid - Unified grid layout for displaying people or projects
|
||||||
@@ -93,7 +184,6 @@ import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
|
|||||||
* - Special entity integration (You, Unnamed)
|
* - Special entity integration (You, Unnamed)
|
||||||
* - Conflict detection integration
|
* - Conflict detection integration
|
||||||
* - Empty state messaging
|
* - Empty state messaging
|
||||||
* - Show All navigation
|
|
||||||
* - Event delegation for entity selection
|
* - Event delegation for entity selection
|
||||||
* - Warning notifications for conflicted entities
|
* - Warning notifications for conflicted entities
|
||||||
* - Template streamlined with computed CSS properties
|
* - Template streamlined with computed CSS properties
|
||||||
@@ -104,21 +194,49 @@ import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
|
|||||||
PersonCard,
|
PersonCard,
|
||||||
ProjectCard,
|
ProjectCard,
|
||||||
SpecialEntityCard,
|
SpecialEntityCard,
|
||||||
ShowAllCard,
|
|
||||||
},
|
},
|
||||||
|
mixins: [PlatformServiceMixin],
|
||||||
})
|
})
|
||||||
export default class EntityGrid extends Vue {
|
export default class EntityGrid extends Vue {
|
||||||
/** Type of entities to display */
|
/** Type of entities to display */
|
||||||
@Prop({ required: true })
|
@Prop({ required: true })
|
||||||
entityType!: "people" | "projects";
|
entityType!: "people" | "projects";
|
||||||
|
|
||||||
/** Array of entities to display */
|
// Search state
|
||||||
@Prop({ required: true })
|
searchTerm = "";
|
||||||
entities!: Contact[] | PlanData[];
|
isSearching = false;
|
||||||
|
searchTimeout: NodeJS.Timeout | null = null;
|
||||||
|
filteredEntities: Contact[] | PlanData[] = [];
|
||||||
|
searchBeforeId: string | undefined = undefined;
|
||||||
|
isLoadingSearchMore = false;
|
||||||
|
|
||||||
/** Maximum number of entities to display */
|
// API server for project searches
|
||||||
@Prop({ default: 10 })
|
apiServer = "";
|
||||||
maxItems!: number;
|
|
||||||
|
// Internal project state (when entities prop not provided for projects)
|
||||||
|
allProjects: PlanData[] = [];
|
||||||
|
loadBeforeId: string | undefined = undefined;
|
||||||
|
isLoadingProjects = false;
|
||||||
|
|
||||||
|
// Infinite scroll state
|
||||||
|
displayedCount = INITIAL_BATCH_SIZE;
|
||||||
|
infiniteScrollReset?: () => void;
|
||||||
|
scrollContainer?: HTMLElement;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Array of entities to display
|
||||||
|
*
|
||||||
|
* For contacts (entityType === 'people'): REQUIRED - Must be a COMPLETE list from local database.
|
||||||
|
* Use $contactsByDateAdded() to ensure all contacts are included.
|
||||||
|
* Client-side filtering assumes the complete list is available.
|
||||||
|
* IMPORTANT: When passing Contact[] arrays, they must be sorted by date added
|
||||||
|
* (newest first) for the "Recently Added" section to display correctly.
|
||||||
|
*
|
||||||
|
* For projects (entityType === 'projects'): OPTIONAL - If not provided, EntityGrid loads
|
||||||
|
* projects internally from the API server. If provided, uses the provided list.
|
||||||
|
*/
|
||||||
|
@Prop({ required: false })
|
||||||
|
entities?: Contact[] | PlanData[];
|
||||||
|
|
||||||
/** Active user's DID */
|
/** Active user's DID */
|
||||||
@Prop({ required: true })
|
@Prop({ required: true })
|
||||||
@@ -140,18 +258,14 @@ export default class EntityGrid extends Vue {
|
|||||||
@Prop({ default: true })
|
@Prop({ default: true })
|
||||||
showYouEntity!: boolean;
|
showYouEntity!: boolean;
|
||||||
|
|
||||||
|
/** Whether to show the "Unnamed" entity for people grids */
|
||||||
|
@Prop({ default: true })
|
||||||
|
showUnnamedEntity!: boolean;
|
||||||
|
|
||||||
/** Whether the "You" entity is selectable */
|
/** Whether the "You" entity is selectable */
|
||||||
@Prop({ default: true })
|
@Prop({ default: true })
|
||||||
youSelectable!: boolean;
|
youSelectable!: boolean;
|
||||||
|
|
||||||
/** Route name for "Show All" navigation */
|
|
||||||
@Prop({ default: "" })
|
|
||||||
showAllRoute!: string;
|
|
||||||
|
|
||||||
/** Query parameters for "Show All" navigation */
|
|
||||||
@Prop({ default: () => ({}) })
|
|
||||||
showAllQueryParams!: Record<string, string>;
|
|
||||||
|
|
||||||
/** Notification function from parent component */
|
/** Notification function from parent component */
|
||||||
@Prop()
|
@Prop()
|
||||||
notify?: (notification: NotificationIface, timeout?: number) => void;
|
notify?: (notification: NotificationIface, timeout?: number) => void;
|
||||||
@@ -160,42 +274,31 @@ export default class EntityGrid extends Vue {
|
|||||||
@Prop({ default: "other party" })
|
@Prop({ default: "other party" })
|
||||||
conflictContext!: string;
|
conflictContext!: string;
|
||||||
|
|
||||||
/** Whether to hide the "Show All" navigation */
|
|
||||||
@Prop({ default: false })
|
|
||||||
hideShowAll!: boolean;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function to determine which entities to display (allows parent control)
|
* Function to determine which entities to display (allows parent control)
|
||||||
*
|
*
|
||||||
* This function prop allows parent components to customize which entities
|
* This function prop allows parent components to customize which entities
|
||||||
* are displayed in the grid, enabling advanced filtering, sorting, and
|
* are displayed in the grid, enabling advanced filtering and sorting.
|
||||||
* display logic beyond the default simple slice behavior.
|
* Note: Infinite scroll is disabled when this prop is provided.
|
||||||
*
|
*
|
||||||
* @param entities - The full array of entities (Contact[] or PlanData[])
|
* @param entities - The full array of entities (Contact[] or PlanData[])
|
||||||
* @param entityType - The type of entities being displayed ("people" or "projects")
|
* @param entityType - The type of entities being displayed ("people" or "projects")
|
||||||
* @param maxItems - The maximum number of items to display (from maxItems prop)
|
|
||||||
* @returns Filtered/sorted array of entities to display
|
* @returns Filtered/sorted array of entities to display
|
||||||
*
|
*
|
||||||
* @example
|
* @example
|
||||||
* // Custom filtering: only show contacts with profile images
|
* // Custom filtering: only show contacts with profile images
|
||||||
* :display-entities-function="(entities, type, max) =>
|
* :display-entities-function="(entities, type) =>
|
||||||
* entities.filter(e => e.profileImageUrl).slice(0, max)"
|
* entities.filter(e => e.profileImageUrl)"
|
||||||
*
|
*
|
||||||
* @example
|
* @example
|
||||||
* // Custom sorting: sort projects by name
|
* // Custom sorting: sort projects by name
|
||||||
* :display-entities-function="(entities, type, max) =>
|
* :display-entities-function="(entities, type) =>
|
||||||
* entities.sort((a, b) => a.name.localeCompare(b.name)).slice(0, max)"
|
* entities.sort((a, b) => a.name.localeCompare(b.name))"
|
||||||
*
|
|
||||||
* @example
|
|
||||||
* // Advanced logic: different limits for different entity types
|
|
||||||
* :display-entities-function="(entities, type, max) =>
|
|
||||||
* type === 'projects' ? entities.slice(0, 5) : entities.slice(0, max)"
|
|
||||||
*/
|
*/
|
||||||
@Prop({ default: null })
|
@Prop({ default: null })
|
||||||
displayEntitiesFunction?: (
|
displayEntitiesFunction?: (
|
||||||
entities: Contact[] | PlanData[],
|
entities: Contact[] | PlanData[],
|
||||||
entityType: "people" | "projects",
|
entityType: "people" | "projects",
|
||||||
maxItems: number,
|
|
||||||
) => Contact[] | PlanData[];
|
) => Contact[] | PlanData[];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -206,33 +309,98 @@ export default class EntityGrid extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed CSS classes for the grid layout
|
* Check if there are no entities to display
|
||||||
*/
|
*/
|
||||||
get gridClasses(): string {
|
get hasNoEntities(): boolean {
|
||||||
const baseClasses = "grid gap-x-2 gap-y-4 text-center mb-4";
|
|
||||||
|
|
||||||
if (this.entityType === "projects") {
|
if (this.entityType === "projects") {
|
||||||
return `${baseClasses} grid-cols-3 md:grid-cols-4`;
|
// For projects: check internal state if no entities prop, otherwise check prop
|
||||||
|
const projectsToCheck = this.entities || this.allProjects;
|
||||||
|
return projectsToCheck.length === 0;
|
||||||
} else {
|
} else {
|
||||||
return `${baseClasses} grid-cols-4 sm:grid-cols-5 md:grid-cols-6`;
|
// For people: entities prop is required
|
||||||
|
return !this.entities || this.entities.length === 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed entities to display - uses function prop if provided, otherwise defaults
|
* Get the entities array to use (prop or internal state)
|
||||||
|
*/
|
||||||
|
get entitiesToUse(): Contact[] | PlanData[] {
|
||||||
|
if (this.entityType === "projects") {
|
||||||
|
// For projects: use prop if provided, otherwise use internal state
|
||||||
|
return this.entities || this.allProjects;
|
||||||
|
} else {
|
||||||
|
// For people: entities prop is required
|
||||||
|
return this.entities || [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Computed entities to display - uses function prop if provided, otherwise uses infinite scroll
|
||||||
|
* When searching, returns filtered results with infinite scroll applied
|
||||||
*/
|
*/
|
||||||
get displayedEntities(): Contact[] | PlanData[] {
|
get displayedEntities(): Contact[] | PlanData[] {
|
||||||
if (this.displayEntitiesFunction) {
|
// If searching, return filtered results with infinite scroll
|
||||||
return this.displayEntitiesFunction(
|
if (this.searchTerm.trim()) {
|
||||||
this.entities,
|
return this.filteredEntities.slice(0, this.displayedCount);
|
||||||
this.entityType,
|
|
||||||
this.maxItems,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Default implementation for backward compatibility
|
// If custom function provided, use it (disables infinite scroll)
|
||||||
const maxDisplay = this.entityType === "projects" ? 7 : this.maxItems;
|
if (this.displayEntitiesFunction) {
|
||||||
return this.entities.slice(0, maxDisplay);
|
return this.displayEntitiesFunction(this.entitiesToUse, this.entityType);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Default: projects use infinite scroll
|
||||||
|
if (this.entityType === "projects") {
|
||||||
|
return (this.entitiesToUse as PlanData[]).slice(0, this.displayedCount);
|
||||||
|
}
|
||||||
|
|
||||||
|
// People: handled by recentContacts + alphabeticalContacts (both use displayedCount)
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the most recently added contacts (when showing contacts and not searching)
|
||||||
|
*
|
||||||
|
* NOTE: This assumes entities are already sorted by date added (newest first).
|
||||||
|
* See the entities prop documentation for details on using $contactsByDateAdded().
|
||||||
|
*/
|
||||||
|
get recentContacts(): Contact[] {
|
||||||
|
if (
|
||||||
|
this.entityType !== "people" ||
|
||||||
|
this.searchTerm.trim() ||
|
||||||
|
!this.entities
|
||||||
|
) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
// Entities are already sorted by date added (newest first)
|
||||||
|
return (this.entities as Contact[]).slice(0, RECENT_CONTACTS_COUNT);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the remaining contacts sorted alphabetically (when showing contacts and not searching)
|
||||||
|
* Uses infinite scroll to control how many are displayed
|
||||||
|
*/
|
||||||
|
get alphabeticalContacts(): Contact[] {
|
||||||
|
if (
|
||||||
|
this.entityType !== "people" ||
|
||||||
|
this.searchTerm.trim() ||
|
||||||
|
!this.entities
|
||||||
|
) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
// Skip the first few (recent contacts) and sort the rest alphabetically
|
||||||
|
// Create a copy to avoid mutating the original array
|
||||||
|
const remaining = this.entities as Contact[];
|
||||||
|
const sorted = [...remaining].sort((a: Contact, b: Contact) => {
|
||||||
|
// Sort alphabetically by name, falling back to DID if name is missing
|
||||||
|
const nameA = (a.name || a.did).toLowerCase();
|
||||||
|
const nameB = (b.name || b.did).toLowerCase();
|
||||||
|
return nameA.localeCompare(nameB);
|
||||||
|
});
|
||||||
|
// Apply infinite scroll: show based on displayedCount (minus the recent contacts)
|
||||||
|
const toShow = Math.max(0, this.displayedCount - RECENT_CONTACTS_COUNT);
|
||||||
|
return sorted.slice(0, toShow);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -246,15 +414,6 @@ export default class EntityGrid extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Whether to show the "Show All" navigation
|
|
||||||
*/
|
|
||||||
get shouldShowAll(): boolean {
|
|
||||||
return (
|
|
||||||
!this.hideShowAll && this.entities.length > 0 && this.showAllRoute !== ""
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Whether the "You" entity is conflicted
|
* Whether the "You" entity is conflicted
|
||||||
*/
|
*/
|
||||||
@@ -328,6 +487,440 @@ export default class EntityGrid extends Vue {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle search input with debouncing
|
||||||
|
*/
|
||||||
|
handleSearchInput(): void {
|
||||||
|
// Show spinner immediately when user types
|
||||||
|
this.isSearching = true;
|
||||||
|
|
||||||
|
// Clear existing timeout
|
||||||
|
if (this.searchTimeout) {
|
||||||
|
clearTimeout(this.searchTimeout);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set new timeout for 500ms delay
|
||||||
|
this.searchTimeout = setTimeout(() => {
|
||||||
|
this.performSearch();
|
||||||
|
}, 500);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Perform the actual search
|
||||||
|
* Routes to server-side search for projects or client-side filtering for contacts
|
||||||
|
*/
|
||||||
|
async performSearch(): Promise<void> {
|
||||||
|
if (!this.searchTerm.trim()) {
|
||||||
|
this.filteredEntities = [];
|
||||||
|
this.displayedCount = INITIAL_BATCH_SIZE;
|
||||||
|
this.searchBeforeId = undefined;
|
||||||
|
this.infiniteScrollReset?.();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.isSearching = true;
|
||||||
|
this.searchBeforeId = undefined; // Reset pagination for new search
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (this.entityType === "projects") {
|
||||||
|
// Server-side search for projects (initial load, no beforeId)
|
||||||
|
const searchLower = this.searchTerm.toLowerCase().trim();
|
||||||
|
await this.fetchProjects(undefined, searchLower);
|
||||||
|
} else {
|
||||||
|
// Client-side filtering for contacts (complete list)
|
||||||
|
await this.performContactSearch();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reset displayed count when search completes
|
||||||
|
this.displayedCount = INITIAL_BATCH_SIZE;
|
||||||
|
this.infiniteScrollReset?.();
|
||||||
|
} finally {
|
||||||
|
this.isSearching = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch projects from API server
|
||||||
|
* Unified method for both loading all projects and searching projects.
|
||||||
|
* If claimContents is provided, performs search and updates filteredEntities.
|
||||||
|
* If claimContents is not provided, loads all projects and updates allProjects.
|
||||||
|
*
|
||||||
|
* @param beforeId - Optional rowId for pagination (loads projects before this ID)
|
||||||
|
* @param claimContents - Optional search term (if provided, performs search; if not, loads all)
|
||||||
|
*/
|
||||||
|
async fetchProjects(
|
||||||
|
beforeId?: string,
|
||||||
|
claimContents?: string,
|
||||||
|
): Promise<void> {
|
||||||
|
if (!this.apiServer) {
|
||||||
|
if (claimContents) {
|
||||||
|
this.filteredEntities = [];
|
||||||
|
} else {
|
||||||
|
this.allProjects = [];
|
||||||
|
}
|
||||||
|
if (this.notify) {
|
||||||
|
this.notify(
|
||||||
|
{
|
||||||
|
group: "alert",
|
||||||
|
type: "danger",
|
||||||
|
title: "Error",
|
||||||
|
text: "API server not configured",
|
||||||
|
},
|
||||||
|
TIMEOUTS.SHORT,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const isSearch = !!claimContents;
|
||||||
|
let url = `${this.apiServer}/api/v2/report/plans`;
|
||||||
|
|
||||||
|
// Build query parameters
|
||||||
|
const params: string[] = [];
|
||||||
|
if (claimContents) {
|
||||||
|
params.push(
|
||||||
|
`claimContents=${encodeURIComponent(claimContents.toLowerCase().trim())}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (beforeId) {
|
||||||
|
params.push(`beforeId=${encodeURIComponent(beforeId)}`);
|
||||||
|
}
|
||||||
|
if (params.length > 0) {
|
||||||
|
url += `?${params.join("&")}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(url, {
|
||||||
|
method: "GET",
|
||||||
|
headers: await getHeaders(this.activeDid),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.status !== 200) {
|
||||||
|
throw new Error(
|
||||||
|
isSearch ? "Failed to search projects" : "Failed to load projects",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const results = await response.json();
|
||||||
|
if (results.data) {
|
||||||
|
const newProjects = results.data.map(
|
||||||
|
(plan: PlanData & { rowId?: string }) => ({
|
||||||
|
...plan,
|
||||||
|
rowId: plan.rowId,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (isSearch) {
|
||||||
|
// Search mode: update filteredEntities
|
||||||
|
if (beforeId) {
|
||||||
|
// Pagination: append new projects to existing search results
|
||||||
|
this.filteredEntities.push(...newProjects);
|
||||||
|
} else {
|
||||||
|
// Initial search: replace array
|
||||||
|
this.filteredEntities = newProjects;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update searchBeforeId for next pagination
|
||||||
|
if (newProjects.length > 0) {
|
||||||
|
const lastProject = newProjects[newProjects.length - 1];
|
||||||
|
this.searchBeforeId = lastProject.rowId || undefined;
|
||||||
|
} else {
|
||||||
|
this.searchBeforeId = undefined; // No more results
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Load mode: update allProjects
|
||||||
|
if (beforeId) {
|
||||||
|
// Pagination: append new projects
|
||||||
|
this.allProjects.push(...newProjects);
|
||||||
|
} else {
|
||||||
|
// Initial load: replace array
|
||||||
|
this.allProjects = newProjects;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update loadBeforeId for next pagination
|
||||||
|
if (newProjects.length > 0) {
|
||||||
|
const lastProject = newProjects[newProjects.length - 1];
|
||||||
|
this.loadBeforeId = lastProject.rowId || undefined;
|
||||||
|
} else {
|
||||||
|
this.loadBeforeId = undefined; // No more results
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// No data in response
|
||||||
|
if (isSearch) {
|
||||||
|
if (!beforeId) {
|
||||||
|
// Only clear on initial search, not pagination
|
||||||
|
this.filteredEntities = [];
|
||||||
|
}
|
||||||
|
this.searchBeforeId = undefined;
|
||||||
|
} else {
|
||||||
|
if (!beforeId) {
|
||||||
|
// Only clear on initial load, not pagination
|
||||||
|
this.allProjects = [];
|
||||||
|
}
|
||||||
|
this.loadBeforeId = undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
logger.error(
|
||||||
|
`Error ${isSearch ? "searching" : "loading"} projects:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
|
if (isSearch) {
|
||||||
|
if (!beforeId) {
|
||||||
|
// Only clear on initial search error, not pagination error
|
||||||
|
this.filteredEntities = [];
|
||||||
|
}
|
||||||
|
this.searchBeforeId = undefined;
|
||||||
|
} else {
|
||||||
|
if (!beforeId) {
|
||||||
|
// Only clear on initial load error, not pagination error
|
||||||
|
this.allProjects = [];
|
||||||
|
}
|
||||||
|
this.loadBeforeId = undefined;
|
||||||
|
}
|
||||||
|
if (this.notify) {
|
||||||
|
this.notify(
|
||||||
|
{
|
||||||
|
group: "alert",
|
||||||
|
type: "danger",
|
||||||
|
title: "Error",
|
||||||
|
text: isSearch
|
||||||
|
? "Failed to search projects. Please try again."
|
||||||
|
: "Failed to load projects. Please try again.",
|
||||||
|
},
|
||||||
|
TIMEOUTS.STANDARD,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Client-side contact search
|
||||||
|
* Assumes entities prop contains complete contact list from local database
|
||||||
|
*/
|
||||||
|
async performContactSearch(): Promise<void> {
|
||||||
|
if (!this.entities) {
|
||||||
|
this.filteredEntities = [];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Simulate async (for consistency with project search)
|
||||||
|
await new Promise((resolve) => setTimeout(resolve, 100));
|
||||||
|
|
||||||
|
const searchLower = this.searchTerm.toLowerCase().trim();
|
||||||
|
|
||||||
|
this.filteredEntities = (this.entities as Contact[])
|
||||||
|
.filter((contact: Contact) => {
|
||||||
|
const name = contact.name?.toLowerCase() || "";
|
||||||
|
const did = contact.did.toLowerCase();
|
||||||
|
return name.includes(searchLower) || did.includes(searchLower);
|
||||||
|
})
|
||||||
|
.sort((a: Contact, b: Contact) => {
|
||||||
|
// Sort alphabetically by name, falling back to DID if name is missing
|
||||||
|
const nameA = (a.name || a.did).toLowerCase();
|
||||||
|
const nameB = (b.name || b.did).toLowerCase();
|
||||||
|
return nameA.localeCompare(nameB);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Contacts don't need pagination (complete list)
|
||||||
|
this.searchBeforeId = undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clear the search
|
||||||
|
*/
|
||||||
|
clearSearch(): void {
|
||||||
|
this.searchTerm = "";
|
||||||
|
this.filteredEntities = [];
|
||||||
|
this.isSearching = false;
|
||||||
|
this.displayedCount = INITIAL_BATCH_SIZE;
|
||||||
|
this.searchBeforeId = undefined;
|
||||||
|
this.infiniteScrollReset?.();
|
||||||
|
|
||||||
|
// Clear any pending timeout
|
||||||
|
if (this.searchTimeout) {
|
||||||
|
clearTimeout(this.searchTimeout);
|
||||||
|
this.searchTimeout = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determine if more entities can be loaded
|
||||||
|
*/
|
||||||
|
canLoadMore(): boolean {
|
||||||
|
if (this.displayEntitiesFunction) {
|
||||||
|
// Custom function disables infinite scroll
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.searchTerm.trim()) {
|
||||||
|
// Search mode: check if more results available
|
||||||
|
if (this.entityType === "projects") {
|
||||||
|
// Projects: can load more if:
|
||||||
|
// 1. We have more already-loaded results to show, OR
|
||||||
|
// 2. We've shown all loaded results AND there's a searchBeforeId to load more
|
||||||
|
const hasMoreLoaded =
|
||||||
|
this.displayedCount < this.filteredEntities.length;
|
||||||
|
const canLoadMoreFromServer =
|
||||||
|
this.displayedCount >= this.filteredEntities.length &&
|
||||||
|
!!this.searchBeforeId &&
|
||||||
|
!this.isLoadingSearchMore;
|
||||||
|
return hasMoreLoaded || canLoadMoreFromServer;
|
||||||
|
} else {
|
||||||
|
// Contacts: client-side filtering returns all results at once
|
||||||
|
return this.displayedCount < this.filteredEntities.length;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Non-search mode
|
||||||
|
if (this.entityType === "projects") {
|
||||||
|
// Projects: check internal state or prop
|
||||||
|
const projectsToCheck = this.entities || this.allProjects;
|
||||||
|
const beforeId = this.entities ? undefined : this.loadBeforeId;
|
||||||
|
|
||||||
|
// Can load more if:
|
||||||
|
// 1. We have more already-loaded results to show, OR
|
||||||
|
// 2. We've shown all loaded results AND there's a beforeId to load more (and not using entities prop)
|
||||||
|
const hasMoreLoaded = this.displayedCount < projectsToCheck.length;
|
||||||
|
const canLoadMoreFromServer =
|
||||||
|
!this.entities &&
|
||||||
|
this.displayedCount >= projectsToCheck.length &&
|
||||||
|
!!beforeId &&
|
||||||
|
!this.isLoadingProjects;
|
||||||
|
|
||||||
|
return hasMoreLoaded || canLoadMoreFromServer;
|
||||||
|
}
|
||||||
|
|
||||||
|
// People: check if more alphabetical contacts available
|
||||||
|
// Total available = recent + all alphabetical
|
||||||
|
if (!this.entities) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
const totalAvailable = RECENT_CONTACTS_COUNT + this.entities.length;
|
||||||
|
return this.displayedCount < totalAvailable;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Initialize infinite scroll on mount
|
||||||
|
*/
|
||||||
|
async mounted(): Promise<void> {
|
||||||
|
// Load apiServer for project searches/loads
|
||||||
|
if (this.entityType === "projects") {
|
||||||
|
const settings = await this.$accountSettings();
|
||||||
|
this.apiServer = settings.apiServer || "";
|
||||||
|
|
||||||
|
// Load projects on mount if entities prop not provided
|
||||||
|
if (!this.entities && this.apiServer) {
|
||||||
|
this.isLoadingProjects = true;
|
||||||
|
try {
|
||||||
|
await this.fetchProjects();
|
||||||
|
} catch (error) {
|
||||||
|
logger.error("Error loading projects on mount:", error);
|
||||||
|
} finally {
|
||||||
|
this.isLoadingProjects = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate entities prop for people
|
||||||
|
if (this.entityType === "people" && !this.entities) {
|
||||||
|
logger.error(
|
||||||
|
"EntityGrid: entities prop is required when entityType is 'people'",
|
||||||
|
);
|
||||||
|
if (this.notify) {
|
||||||
|
this.notify(
|
||||||
|
{
|
||||||
|
group: "alert",
|
||||||
|
type: "danger",
|
||||||
|
title: "Error",
|
||||||
|
text: "Contacts data is required but not provided.",
|
||||||
|
},
|
||||||
|
TIMEOUTS.SHORT,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.$nextTick(() => {
|
||||||
|
const container = this.$refs.scrollContainer as HTMLElement;
|
||||||
|
|
||||||
|
if (container) {
|
||||||
|
const { reset } = useInfiniteScroll(
|
||||||
|
container,
|
||||||
|
async () => {
|
||||||
|
// Search mode: handle search pagination
|
||||||
|
if (this.searchTerm.trim()) {
|
||||||
|
if (this.entityType === "projects") {
|
||||||
|
// Projects: load more search results if available
|
||||||
|
if (
|
||||||
|
this.displayedCount >= this.filteredEntities.length &&
|
||||||
|
this.searchBeforeId &&
|
||||||
|
!this.isLoadingSearchMore
|
||||||
|
) {
|
||||||
|
this.isLoadingSearchMore = true;
|
||||||
|
try {
|
||||||
|
const searchLower = this.searchTerm.toLowerCase().trim();
|
||||||
|
await this.fetchProjects(this.searchBeforeId, searchLower);
|
||||||
|
// After loading more, reset scroll state to allow further loading
|
||||||
|
this.infiniteScrollReset?.();
|
||||||
|
} catch (error) {
|
||||||
|
logger.error("Error loading more search results:", error);
|
||||||
|
// Error already handled in fetchProjects
|
||||||
|
} finally {
|
||||||
|
this.isLoadingSearchMore = false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Show more from already-loaded search results
|
||||||
|
this.displayedCount += INCREMENT_SIZE;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Contacts: show more from already-filtered results
|
||||||
|
this.displayedCount += INCREMENT_SIZE;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Non-search mode
|
||||||
|
if (this.entityType === "projects") {
|
||||||
|
const projectsToCheck = this.entities || this.allProjects;
|
||||||
|
const beforeId = this.entities ? undefined : this.loadBeforeId;
|
||||||
|
|
||||||
|
// If using internal state and need to load more from server
|
||||||
|
if (
|
||||||
|
!this.entities &&
|
||||||
|
this.displayedCount >= projectsToCheck.length &&
|
||||||
|
beforeId &&
|
||||||
|
!this.isLoadingProjects
|
||||||
|
) {
|
||||||
|
this.isLoadingProjects = true;
|
||||||
|
try {
|
||||||
|
await this.fetchProjects(beforeId);
|
||||||
|
// After loading more, reset scroll state to allow further loading
|
||||||
|
this.infiniteScrollReset?.();
|
||||||
|
} catch (error) {
|
||||||
|
logger.error("Error loading more projects:", error);
|
||||||
|
// Error already handled in fetchProjects
|
||||||
|
} finally {
|
||||||
|
this.isLoadingProjects = false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Normal case: increment displayedCount to show more from memory
|
||||||
|
this.displayedCount += INCREMENT_SIZE;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// People: increment displayedCount to show more from memory
|
||||||
|
this.displayedCount += INCREMENT_SIZE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
distance: 50, // pixels from bottom
|
||||||
|
canLoadMore: () => this.canLoadMore(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
this.infiniteScrollReset = reset;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// Emit methods using @Emit decorator
|
// Emit methods using @Emit decorator
|
||||||
|
|
||||||
@Emit("entity-selected")
|
@Emit("entity-selected")
|
||||||
@@ -340,6 +933,47 @@ export default class EntityGrid extends Vue {
|
|||||||
} {
|
} {
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Watch for changes in search term to reset displayed count and pagination
|
||||||
|
*/
|
||||||
|
@Watch("searchTerm")
|
||||||
|
onSearchTermChange(): void {
|
||||||
|
// Reset displayed count and pagination when search term changes
|
||||||
|
this.displayedCount = INITIAL_BATCH_SIZE;
|
||||||
|
this.searchBeforeId = undefined;
|
||||||
|
this.infiniteScrollReset?.();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Watch for changes in entities prop to clear search and reset displayed count
|
||||||
|
*/
|
||||||
|
@Watch("entities")
|
||||||
|
onEntitiesChange(): void {
|
||||||
|
// Clear search when entities change (fresh dialog open)
|
||||||
|
if (this.searchTerm) {
|
||||||
|
this.searchTerm = "";
|
||||||
|
this.filteredEntities = [];
|
||||||
|
this.searchBeforeId = undefined;
|
||||||
|
}
|
||||||
|
this.displayedCount = INITIAL_BATCH_SIZE;
|
||||||
|
this.infiniteScrollReset?.();
|
||||||
|
|
||||||
|
// For projects: if entities prop is provided, clear internal state
|
||||||
|
if (this.entityType === "projects" && this.entities) {
|
||||||
|
this.allProjects = [];
|
||||||
|
this.loadBeforeId = undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Cleanup timeouts when component is destroyed
|
||||||
|
*/
|
||||||
|
beforeUnmount(): void {
|
||||||
|
if (this.searchTimeout) {
|
||||||
|
clearTimeout(this.searchTimeout);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -3,10 +3,9 @@ from GiftedDialog.vue to handle the complete step 1 * entity selection interface
|
|||||||
with dynamic labeling and grid display. * * Features: * - Dynamic step labeling
|
with dynamic labeling and grid display. * * Features: * - Dynamic step labeling
|
||||||
based on context * - EntityGrid integration for unified entity display * -
|
based on context * - EntityGrid integration for unified entity display * -
|
||||||
Conflict detection and prevention * - Special entity handling (You, Unnamed) * -
|
Conflict detection and prevention * - Special entity handling (You, Unnamed) * -
|
||||||
Show All navigation with context preservation * - Cancel functionality * - Event
|
Cancel functionality * - Event delegation for entity selection * - Warning
|
||||||
delegation for entity selection * - Warning notifications for conflicted
|
notifications for conflicted entities * - Template streamlined with computed CSS
|
||||||
entities * - Template streamlined with computed CSS properties * * @author
|
properties * * @author Matthew Raymer */
|
||||||
Matthew Raymer */
|
|
||||||
<template>
|
<template>
|
||||||
<div id="sectionGiftedGiver">
|
<div id="sectionGiftedGiver">
|
||||||
<label class="block font-bold mb-4">
|
<label class="block font-bold mb-4">
|
||||||
@@ -15,19 +14,15 @@ Matthew Raymer */
|
|||||||
|
|
||||||
<EntityGrid
|
<EntityGrid
|
||||||
:entity-type="shouldShowProjects ? 'projects' : 'people'"
|
:entity-type="shouldShowProjects ? 'projects' : 'people'"
|
||||||
:entities="shouldShowProjects ? projects : allContacts"
|
:entities="shouldShowProjects ? projects || undefined : allContacts"
|
||||||
:max-items="10"
|
|
||||||
:active-did="activeDid"
|
:active-did="activeDid"
|
||||||
:all-my-dids="allMyDids"
|
:all-my-dids="allMyDids"
|
||||||
:all-contacts="allContacts"
|
:all-contacts="allContacts"
|
||||||
:conflict-checker="conflictChecker"
|
:conflict-checker="conflictChecker"
|
||||||
:show-you-entity="shouldShowYouEntity"
|
:show-you-entity="shouldShowYouEntity"
|
||||||
:you-selectable="youSelectable"
|
:you-selectable="youSelectable"
|
||||||
:show-all-route="showAllRoute"
|
|
||||||
:show-all-query-params="showAllQueryParams"
|
|
||||||
:notify="notify"
|
:notify="notify"
|
||||||
:conflict-context="conflictContext"
|
:conflict-context="conflictContext"
|
||||||
:hide-show-all="hideShowAll"
|
|
||||||
@entity-selected="handleEntitySelected"
|
@entity-selected="handleEntitySelected"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
@@ -68,7 +63,6 @@ interface EntitySelectionEvent {
|
|||||||
* - EntityGrid integration for unified entity display
|
* - EntityGrid integration for unified entity display
|
||||||
* - Conflict detection and prevention
|
* - Conflict detection and prevention
|
||||||
* - Special entity handling (You, Unnamed)
|
* - Special entity handling (You, Unnamed)
|
||||||
* - Show All navigation with context preservation
|
|
||||||
* - Cancel functionality
|
* - Cancel functionality
|
||||||
* - Event delegation for entity selection
|
* - Event delegation for entity selection
|
||||||
* - Warning notifications for conflicted entities
|
* - Warning notifications for conflicted entities
|
||||||
@@ -100,9 +94,9 @@ export default class EntitySelectionStep extends Vue {
|
|||||||
@Prop({ default: false })
|
@Prop({ default: false })
|
||||||
isFromProjectView!: boolean;
|
isFromProjectView!: boolean;
|
||||||
|
|
||||||
/** Array of available projects */
|
/** Array of available projects (optional - EntityGrid loads internally if not provided) */
|
||||||
@Prop({ required: true })
|
@Prop({ required: false })
|
||||||
projects!: PlanData[];
|
projects?: PlanData[];
|
||||||
|
|
||||||
/** Array of available contacts */
|
/** Array of available contacts */
|
||||||
@Prop({ required: true })
|
@Prop({ required: true })
|
||||||
@@ -154,10 +148,6 @@ export default class EntitySelectionStep extends Vue {
|
|||||||
@Prop()
|
@Prop()
|
||||||
notify?: (notification: NotificationIface, timeout?: number) => void;
|
notify?: (notification: NotificationIface, timeout?: number) => void;
|
||||||
|
|
||||||
/** Whether to hide the "Show All" navigation */
|
|
||||||
@Prop({ default: false })
|
|
||||||
hideShowAll!: boolean;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* CSS classes for the cancel button
|
* CSS classes for the cancel button
|
||||||
*/
|
*/
|
||||||
@@ -222,59 +212,6 @@ export default class EntitySelectionStep extends Vue {
|
|||||||
return !this.conflictChecker(this.activeDid);
|
return !this.conflictChecker(this.activeDid);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Route name for "Show All" navigation
|
|
||||||
*/
|
|
||||||
get showAllRoute(): string {
|
|
||||||
if (this.shouldShowProjects) {
|
|
||||||
return "discover";
|
|
||||||
} else if (this.allContacts.length > 0) {
|
|
||||||
return "contact-gift";
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Query parameters for "Show All" navigation
|
|
||||||
*/
|
|
||||||
get showAllQueryParams(): Record<string, string> {
|
|
||||||
const baseParams = {
|
|
||||||
stepType: this.stepType,
|
|
||||||
giverEntityType: this.giverEntityType,
|
|
||||||
recipientEntityType: this.recipientEntityType,
|
|
||||||
// Form field values to preserve
|
|
||||||
description: this.description,
|
|
||||||
amountInput: this.amountInput,
|
|
||||||
unitCode: this.unitCode,
|
|
||||||
offerId: this.offerId,
|
|
||||||
fromProjectId: this.fromProjectId,
|
|
||||||
toProjectId: this.toProjectId,
|
|
||||||
showProjects: this.showProjects.toString(),
|
|
||||||
isFromProjectView: this.isFromProjectView.toString(),
|
|
||||||
};
|
|
||||||
|
|
||||||
if (this.shouldShowProjects) {
|
|
||||||
// For project contexts, still pass entity type information
|
|
||||||
return baseParams;
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
...baseParams,
|
|
||||||
// Always pass both giver and recipient info for context preservation
|
|
||||||
giverProjectId: this.fromProjectId || "",
|
|
||||||
giverProjectName: this.giver?.name || "",
|
|
||||||
giverProjectImage: this.giver?.image || "",
|
|
||||||
giverProjectHandleId: this.giver?.handleId || "",
|
|
||||||
giverDid: this.giverEntityType === "person" ? this.giver?.did || "" : "",
|
|
||||||
recipientProjectId: this.toProjectId || "",
|
|
||||||
recipientProjectName: this.receiver?.name || "",
|
|
||||||
recipientProjectImage: this.receiver?.image || "",
|
|
||||||
recipientProjectHandleId: this.receiver?.handleId || "",
|
|
||||||
recipientDid:
|
|
||||||
this.recipientEntityType === "person" ? this.receiver?.did || "" : "",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle entity selection from EntityGrid
|
* Handle entity selection from EntityGrid
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -15,7 +15,6 @@
|
|||||||
giverEntityType === 'project' || recipientEntityType === 'project'
|
giverEntityType === 'project' || recipientEntityType === 'project'
|
||||||
"
|
"
|
||||||
:is-from-project-view="isFromProjectView"
|
:is-from-project-view="isFromProjectView"
|
||||||
:projects="projects"
|
|
||||||
:all-contacts="allContacts"
|
:all-contacts="allContacts"
|
||||||
:active-did="activeDid"
|
:active-did="activeDid"
|
||||||
:all-my-dids="allMyDids"
|
:all-my-dids="allMyDids"
|
||||||
@@ -29,7 +28,6 @@
|
|||||||
:unit-code="unitCode"
|
:unit-code="unitCode"
|
||||||
:offer-id="offerId"
|
:offer-id="offerId"
|
||||||
:notify="$notify"
|
:notify="$notify"
|
||||||
:hide-show-all="hideShowAll"
|
|
||||||
@entity-selected="handleEntitySelected"
|
@entity-selected="handleEntitySelected"
|
||||||
@cancel="cancel"
|
@cancel="cancel"
|
||||||
/>
|
/>
|
||||||
@@ -69,7 +67,6 @@ import {
|
|||||||
createAndSubmitGive,
|
createAndSubmitGive,
|
||||||
didInfo,
|
didInfo,
|
||||||
serverMessageForUser,
|
serverMessageForUser,
|
||||||
getHeaders,
|
|
||||||
} from "../libs/endorserServer";
|
} from "../libs/endorserServer";
|
||||||
import * as libsUtil from "../libs/util";
|
import * as libsUtil from "../libs/util";
|
||||||
import { Contact } from "../db/tables/contacts";
|
import { Contact } from "../db/tables/contacts";
|
||||||
@@ -117,7 +114,6 @@ export default class GiftedDialog extends Vue {
|
|||||||
@Prop() fromProjectId = "";
|
@Prop() fromProjectId = "";
|
||||||
@Prop() toProjectId = "";
|
@Prop() toProjectId = "";
|
||||||
@Prop() isFromProjectView = false;
|
@Prop() isFromProjectView = false;
|
||||||
@Prop() hideShowAll = false;
|
|
||||||
@Prop({ default: "person" }) giverEntityType = "person" as
|
@Prop({ default: "person" }) giverEntityType = "person" as
|
||||||
| "person"
|
| "person"
|
||||||
| "project";
|
| "project";
|
||||||
@@ -136,7 +132,6 @@ export default class GiftedDialog extends Vue {
|
|||||||
firstStep = true; // true = Step 1 (giver/recipient selection), false = Step 2 (amount/description)
|
firstStep = true; // true = Step 1 (giver/recipient selection), false = Step 2 (amount/description)
|
||||||
giver?: libsUtil.GiverReceiverInputInfo; // undefined means no identified giver agent
|
giver?: libsUtil.GiverReceiverInputInfo; // undefined means no identified giver agent
|
||||||
offerId = "";
|
offerId = "";
|
||||||
projects: PlanData[] = [];
|
|
||||||
prompt = "";
|
prompt = "";
|
||||||
receiver?: libsUtil.GiverReceiverInputInfo;
|
receiver?: libsUtil.GiverReceiverInputInfo;
|
||||||
stepType = "giver";
|
stepType = "giver";
|
||||||
@@ -233,19 +228,9 @@ export default class GiftedDialog extends Vue {
|
|||||||
apiServer: this.apiServer,
|
apiServer: this.apiServer,
|
||||||
});
|
});
|
||||||
|
|
||||||
this.allContacts = await this.$contacts();
|
this.allContacts = await this.$contactsByDateAdded();
|
||||||
|
|
||||||
this.allMyDids = await retrieveAccountDids();
|
this.allMyDids = await retrieveAccountDids();
|
||||||
|
|
||||||
if (
|
|
||||||
this.giverEntityType === "project" ||
|
|
||||||
this.recipientEntityType === "project"
|
|
||||||
) {
|
|
||||||
await this.loadProjects();
|
|
||||||
} else {
|
|
||||||
// Clear projects array when not needed
|
|
||||||
this.projects = [];
|
|
||||||
}
|
|
||||||
} catch (err: unknown) {
|
} catch (err: unknown) {
|
||||||
logger.error("Error retrieving settings from database:", err);
|
logger.error("Error retrieving settings from database:", err);
|
||||||
this.safeNotify.error(
|
this.safeNotify.error(
|
||||||
@@ -491,27 +476,6 @@ export default class GiftedDialog extends Vue {
|
|||||||
this.firstStep = false;
|
this.firstStep = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
async loadProjects() {
|
|
||||||
try {
|
|
||||||
const response = await fetch(this.apiServer + "/api/v2/report/plans", {
|
|
||||||
method: "GET",
|
|
||||||
headers: await getHeaders(this.activeDid),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (response.status !== 200) {
|
|
||||||
throw new Error("Failed to load projects");
|
|
||||||
}
|
|
||||||
|
|
||||||
const results = await response.json();
|
|
||||||
if (results.data) {
|
|
||||||
this.projects = results.data;
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
logger.error("Error loading projects:", error);
|
|
||||||
this.safeNotify.error("Failed to load projects", TIMEOUTS.STANDARD);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
selectProject(project: PlanData) {
|
selectProject(project: PlanData) {
|
||||||
this.giver = {
|
this.giver = {
|
||||||
did: project.handleId,
|
did: project.handleId,
|
||||||
|
|||||||
130
src/components/MeetingProjectDialog.vue
Normal file
130
src/components/MeetingProjectDialog.vue
Normal file
@@ -0,0 +1,130 @@
|
|||||||
|
<template>
|
||||||
|
<div v-if="visible" class="dialog-overlay">
|
||||||
|
<div class="dialog">
|
||||||
|
<!-- Header -->
|
||||||
|
<h2 class="text-lg font-semibold leading-[1.25] mb-4">Select Project</h2>
|
||||||
|
|
||||||
|
<!-- EntityGrid for projects -->
|
||||||
|
<EntityGrid
|
||||||
|
:entity-type="'projects'"
|
||||||
|
:active-did="activeDid"
|
||||||
|
:all-my-dids="allMyDids"
|
||||||
|
:all-contacts="allContacts"
|
||||||
|
:conflict-checker="() => false"
|
||||||
|
:show-you-entity="false"
|
||||||
|
:show-unnamed-entity="false"
|
||||||
|
:notify="notify"
|
||||||
|
:conflict-context="'project'"
|
||||||
|
@entity-selected="handleEntitySelected"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<!-- Cancel Button -->
|
||||||
|
<div class="flex gap-2 mt-4">
|
||||||
|
<button
|
||||||
|
class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-2 rounded-md"
|
||||||
|
@click="handleCancel"
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts">
|
||||||
|
import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
|
||||||
|
import EntityGrid from "./EntityGrid.vue";
|
||||||
|
import { Contact } from "../db/tables/contacts";
|
||||||
|
import { PlanData } from "../interfaces/records";
|
||||||
|
import { NotificationIface } from "../constants/app";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* MeetingProjectDialog - Dialog for selecting a project link for a meeting
|
||||||
|
*
|
||||||
|
* Features:
|
||||||
|
* - EntityGrid integration for project selection
|
||||||
|
* - No special entities (You, Unnamed)
|
||||||
|
* - Immediate assignment on project selection
|
||||||
|
* - Cancel button to close without selection
|
||||||
|
*/
|
||||||
|
@Component({
|
||||||
|
components: {
|
||||||
|
EntityGrid,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
export default class MeetingProjectDialog extends Vue {
|
||||||
|
/** Whether the dialog is visible */
|
||||||
|
visible = false;
|
||||||
|
|
||||||
|
/** Active user's DID */
|
||||||
|
@Prop({ required: true })
|
||||||
|
activeDid!: string;
|
||||||
|
|
||||||
|
/** All user's DIDs */
|
||||||
|
@Prop({ required: true })
|
||||||
|
allMyDids!: string[];
|
||||||
|
|
||||||
|
/** All contacts */
|
||||||
|
@Prop({ required: true })
|
||||||
|
allContacts!: Contact[];
|
||||||
|
|
||||||
|
/** Notification function from parent component */
|
||||||
|
@Prop()
|
||||||
|
notify?: (notification: NotificationIface, timeout?: number) => void;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle entity selection from EntityGrid
|
||||||
|
* Immediately assigns the selected project and closes the dialog
|
||||||
|
*/
|
||||||
|
handleEntitySelected(event: {
|
||||||
|
type: "person" | "project";
|
||||||
|
data: Contact | PlanData;
|
||||||
|
}) {
|
||||||
|
const project = event.data as PlanData;
|
||||||
|
this.emitAssign(project);
|
||||||
|
this.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle cancel button click
|
||||||
|
*/
|
||||||
|
handleCancel(): void {
|
||||||
|
this.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Open the dialog
|
||||||
|
*/
|
||||||
|
open(): void {
|
||||||
|
this.visible = true;
|
||||||
|
this.emitOpen();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Close the dialog
|
||||||
|
*/
|
||||||
|
close(): void {
|
||||||
|
this.visible = false;
|
||||||
|
this.emitClose();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Emit methods using @Emit decorator
|
||||||
|
|
||||||
|
@Emit("assign")
|
||||||
|
emitAssign(project: PlanData): PlanData {
|
||||||
|
return project;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Emit("open")
|
||||||
|
emitOpen(): void {
|
||||||
|
// Emit when dialog opens
|
||||||
|
}
|
||||||
|
|
||||||
|
@Emit("close")
|
||||||
|
emitClose(): void {
|
||||||
|
// Emit when dialog closes
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped></style>
|
||||||
@@ -223,7 +223,6 @@
|
|||||||
ref="bulkMembersDialog"
|
ref="bulkMembersDialog"
|
||||||
:active-did="activeDid"
|
:active-did="activeDid"
|
||||||
:api-server="apiServer"
|
:api-server="apiServer"
|
||||||
:dialog-type="isOrganizer ? 'admit' : 'visibility'"
|
|
||||||
:is-organizer="isOrganizer"
|
:is-organizer="isOrganizer"
|
||||||
@close="closeBulkMembersDialogCallback"
|
@close="closeBulkMembersDialogCallback"
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -3,30 +3,25 @@ GiftedDialog.vue to handle person entity display * with selection states and
|
|||||||
conflict detection. * * @author Matthew Raymer */
|
conflict detection. * * @author Matthew Raymer */
|
||||||
<template>
|
<template>
|
||||||
<li :class="cardClasses" @click="handleClick">
|
<li :class="cardClasses" @click="handleClick">
|
||||||
<div class="relative w-fit mx-auto">
|
<div>
|
||||||
<EntityIcon
|
<EntityIcon
|
||||||
v-if="person.did"
|
v-if="person.did"
|
||||||
:contact="person"
|
:contact="person"
|
||||||
class="!size-[3rem] mx-auto border border-slate-300 bg-white overflow-hidden rounded-full mb-1"
|
class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
|
||||||
/>
|
/>
|
||||||
<font-awesome
|
<font-awesome
|
||||||
v-else
|
v-else
|
||||||
icon="circle-question"
|
icon="circle-question"
|
||||||
class="text-slate-400 text-5xl mb-1"
|
class="text-slate-400 text-5xl mb-1 shrink-0"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<!-- Time icon overlay for contacts -->
|
|
||||||
<div
|
|
||||||
v-if="person.did && showTimeIcon"
|
|
||||||
class="rounded-full bg-slate-400 absolute bottom-0 right-0 p-1 translate-x-1/3"
|
|
||||||
>
|
|
||||||
<font-awesome icon="clock" class="block text-white text-xs w-[1em]" />
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h3 :class="nameClasses">
|
<div class="overflow-hidden">
|
||||||
{{ displayName }}
|
<h3 :class="nameClasses">
|
||||||
</h3>
|
{{ displayName }}
|
||||||
|
</h3>
|
||||||
|
<p class="text-xs text-slate-500 truncate">{{ person.did }}</p>
|
||||||
|
</div>
|
||||||
</li>
|
</li>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -81,29 +76,32 @@ export default class PersonCard extends Vue {
|
|||||||
* Computed CSS classes for the card
|
* Computed CSS classes for the card
|
||||||
*/
|
*/
|
||||||
get cardClasses(): string {
|
get cardClasses(): string {
|
||||||
|
const baseCardClasses =
|
||||||
|
"flex items-center gap-2 px-2 py-1.5 border-b border-slate-300";
|
||||||
|
|
||||||
if (!this.selectable || this.conflicted) {
|
if (!this.selectable || this.conflicted) {
|
||||||
return "opacity-50 cursor-not-allowed";
|
return `${baseCardClasses} *:opacity-50 cursor-not-allowed`;
|
||||||
}
|
}
|
||||||
return "cursor-pointer hover:bg-slate-50";
|
|
||||||
|
return `${baseCardClasses} cursor-pointer hover:bg-slate-50`;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed CSS classes for the person name
|
* Computed CSS classes for the person name
|
||||||
*/
|
*/
|
||||||
get nameClasses(): string {
|
get nameClasses(): string {
|
||||||
const baseClasses =
|
const baseNameClasses = "text-sm font-semibold truncate";
|
||||||
"text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden";
|
|
||||||
|
|
||||||
if (this.conflicted) {
|
if (this.conflicted) {
|
||||||
return `${baseClasses} text-slate-400`;
|
return `${baseNameClasses} text-slate-500`;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add italic styling for entities without set names
|
// Add italic styling for entities without set names
|
||||||
if (!this.person.name) {
|
if (!this.person.name) {
|
||||||
return `${baseClasses} italic text-slate-500`;
|
return `${baseNameClasses} italic text-slate-500`;
|
||||||
}
|
}
|
||||||
|
|
||||||
return baseClasses;
|
return baseNameClasses;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -2,25 +2,26 @@
|
|||||||
GiftedDialog.vue to handle project entity display * with selection states and
|
GiftedDialog.vue to handle project entity display * with selection states and
|
||||||
issuer information. * * @author Matthew Raymer */
|
issuer information. * * @author Matthew Raymer */
|
||||||
<template>
|
<template>
|
||||||
<li class="cursor-pointer" @click="handleClick">
|
<li
|
||||||
<div class="relative w-fit mx-auto">
|
class="flex items-center gap-2 px-2 py-1.5 border-b border-slate-300 hover:bg-slate-50 cursor-pointer"
|
||||||
<ProjectIcon
|
@click="handleClick"
|
||||||
:entity-id="project.handleId"
|
>
|
||||||
:icon-size="48"
|
<ProjectIcon
|
||||||
:image-url="project.image"
|
:entity-id="project.handleId"
|
||||||
class="!size-[3rem] mx-auto border border-slate-300 bg-white overflow-hidden rounded-full mb-1"
|
:icon-size="30"
|
||||||
/>
|
:image-url="project.image"
|
||||||
</div>
|
class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
|
||||||
|
/>
|
||||||
|
|
||||||
<h3
|
<div class="overflow-hidden">
|
||||||
class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
|
<h3 class="text-sm font-semibold truncate">
|
||||||
>
|
{{ project.name || unnamedProject }}
|
||||||
{{ project.name || unnamedProject }}
|
</h3>
|
||||||
</h3>
|
|
||||||
|
|
||||||
<div class="text-xs text-slate-500 truncate">
|
<div class="text-xs text-slate-500 truncate">
|
||||||
<font-awesome icon="user" class="fa-fw text-slate-400" />
|
<font-awesome icon="user" class="text-slate-400" />
|
||||||
{{ issuerDisplayName }}
|
{{ issuerDisplayName }}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
117
src/components/ProjectRepresentativeDialog.vue
Normal file
117
src/components/ProjectRepresentativeDialog.vue
Normal file
@@ -0,0 +1,117 @@
|
|||||||
|
<template>
|
||||||
|
<div v-if="visible" class="dialog-overlay">
|
||||||
|
<div class="dialog">
|
||||||
|
<!-- Header -->
|
||||||
|
<h2 class="text-lg font-semibold leading-[1.25] mb-4">
|
||||||
|
Select Representative
|
||||||
|
</h2>
|
||||||
|
|
||||||
|
<!-- EntityGrid for contacts -->
|
||||||
|
<EntityGrid
|
||||||
|
:entity-type="'people'"
|
||||||
|
:entities="allContacts"
|
||||||
|
:active-did="activeDid"
|
||||||
|
:all-my-dids="allMyDids"
|
||||||
|
:all-contacts="allContacts"
|
||||||
|
:conflict-checker="() => false"
|
||||||
|
:show-you-entity="false"
|
||||||
|
:show-unnamed-entity="false"
|
||||||
|
:notify="notify"
|
||||||
|
:conflict-context="'representative'"
|
||||||
|
@entity-selected="handleEntitySelected"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<!-- Cancel Button -->
|
||||||
|
<div class="flex gap-2 mt-4">
|
||||||
|
<button
|
||||||
|
class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-2 rounded-md"
|
||||||
|
@click="handleCancel"
|
||||||
|
>
|
||||||
|
Cancel
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts">
|
||||||
|
import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
|
||||||
|
import EntityGrid from "./EntityGrid.vue";
|
||||||
|
import { Contact } from "../db/tables/contacts";
|
||||||
|
import { NotificationIface } from "../constants/app";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ProjectRepresentativeDialog - Dialog for selecting an authorized representative
|
||||||
|
*
|
||||||
|
* Features:
|
||||||
|
* - EntityGrid integration for contact selection
|
||||||
|
* - No special entities (You, Unnamed)
|
||||||
|
* - Immediate assignment on contact selection
|
||||||
|
* - Cancel button to close without selection
|
||||||
|
*/
|
||||||
|
@Component({
|
||||||
|
components: {
|
||||||
|
EntityGrid,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
export default class ProjectRepresentativeDialog extends Vue {
|
||||||
|
/** Whether the dialog is visible */
|
||||||
|
visible = false;
|
||||||
|
|
||||||
|
/** Array of available contacts */
|
||||||
|
@Prop({ required: true })
|
||||||
|
allContacts!: Contact[];
|
||||||
|
|
||||||
|
/** Active user's DID */
|
||||||
|
@Prop({ required: true })
|
||||||
|
activeDid!: string;
|
||||||
|
|
||||||
|
/** All user's DIDs */
|
||||||
|
@Prop({ required: true })
|
||||||
|
allMyDids!: string[];
|
||||||
|
|
||||||
|
/** Notification function from parent component */
|
||||||
|
@Prop()
|
||||||
|
notify?: (notification: NotificationIface, timeout?: number) => void;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle entity selection from EntityGrid
|
||||||
|
* Immediately assigns the selected contact and closes the dialog
|
||||||
|
*/
|
||||||
|
handleEntitySelected(event: { type: "person" | "project"; data: Contact }) {
|
||||||
|
const contact = event.data as Contact;
|
||||||
|
this.emitAssign(contact);
|
||||||
|
this.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle cancel button click
|
||||||
|
*/
|
||||||
|
handleCancel(): void {
|
||||||
|
this.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Open the dialog
|
||||||
|
*/
|
||||||
|
open(): void {
|
||||||
|
this.visible = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Close the dialog
|
||||||
|
*/
|
||||||
|
close(): void {
|
||||||
|
this.visible = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Emit methods using @Emit decorator
|
||||||
|
|
||||||
|
@Emit("assign")
|
||||||
|
emitAssign(contact: Contact): Contact {
|
||||||
|
return contact;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped></style>
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
/** * ShowAllCard.vue - Show All navigation card component * * Extracted from
|
|
||||||
GiftedDialog.vue to handle "Show All" navigation * for both people and projects
|
|
||||||
entity types. * * @author Matthew Raymer */
|
|
||||||
<template>
|
|
||||||
<li class="cursor-pointer">
|
|
||||||
<router-link :to="navigationRoute" class="block text-center">
|
|
||||||
<font-awesome icon="circle-right" class="text-blue-500 text-5xl mb-1" />
|
|
||||||
<h3
|
|
||||||
class="text-xs text-slate-500 font-medium italic text-ellipsis whitespace-nowrap overflow-hidden"
|
|
||||||
>
|
|
||||||
Show All
|
|
||||||
</h3>
|
|
||||||
</router-link>
|
|
||||||
</li>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import { Component, Prop, Vue } from "vue-facing-decorator";
|
|
||||||
import { RouteLocationRaw } from "vue-router";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ShowAllCard - Displays "Show All" navigation for entity grids
|
|
||||||
*
|
|
||||||
* Features:
|
|
||||||
* - Provides navigation to full entity listings
|
|
||||||
* - Supports different routes based on entity type
|
|
||||||
* - Maintains context through query parameters
|
|
||||||
* - Consistent visual styling with other cards
|
|
||||||
*/
|
|
||||||
@Component({ name: "ShowAllCard" })
|
|
||||||
export default class ShowAllCard extends Vue {
|
|
||||||
/** Type of entities being shown */
|
|
||||||
@Prop({ required: true })
|
|
||||||
entityType!: "people" | "projects";
|
|
||||||
|
|
||||||
/** Route name to navigate to */
|
|
||||||
@Prop({ required: true })
|
|
||||||
routeName!: string;
|
|
||||||
|
|
||||||
/** Query parameters to pass to the route */
|
|
||||||
@Prop({ default: () => ({}) })
|
|
||||||
queryParams!: Record<string, string>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Computed navigation route with query parameters
|
|
||||||
*/
|
|
||||||
get navigationRoute(): RouteLocationRaw {
|
|
||||||
return {
|
|
||||||
name: this.routeName,
|
|
||||||
query: this.queryParams,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
/* Ensure router-link styling is consistent */
|
|
||||||
a {
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
a:hover .fa-circle-right {
|
|
||||||
transform: scale(1.1);
|
|
||||||
transition: transform 0.2s ease;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -63,23 +63,24 @@ export default class SpecialEntityCard extends Vue {
|
|||||||
conflictContext!: string;
|
conflictContext!: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed CSS classes for the card container
|
* Computed CSS classes for the card
|
||||||
*/
|
*/
|
||||||
get cardClasses(): string {
|
get cardClasses(): string {
|
||||||
const baseClasses = "block";
|
const baseCardClasses =
|
||||||
|
"flex items-center gap-2 px-2 py-1.5 border-b border-slate-300";
|
||||||
|
|
||||||
if (!this.selectable || this.conflicted) {
|
if (!this.selectable || this.conflicted) {
|
||||||
return `${baseClasses} cursor-not-allowed opacity-50`;
|
return `${baseCardClasses} *:opacity-50 cursor-not-allowed`;
|
||||||
}
|
}
|
||||||
|
|
||||||
return `${baseClasses} cursor-pointer`;
|
return `${baseCardClasses} cursor-pointer hover:bg-slate-50`;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed CSS classes for the icon
|
* Computed CSS classes for the icon
|
||||||
*/
|
*/
|
||||||
get iconClasses(): string {
|
get iconClasses(): string {
|
||||||
const baseClasses = "text-5xl mb-1";
|
const baseClasses = "text-[2rem]";
|
||||||
|
|
||||||
if (this.conflicted) {
|
if (this.conflicted) {
|
||||||
return `${baseClasses} text-slate-400`;
|
return `${baseClasses} text-slate-400`;
|
||||||
@@ -101,7 +102,7 @@ export default class SpecialEntityCard extends Vue {
|
|||||||
*/
|
*/
|
||||||
get nameClasses(): string {
|
get nameClasses(): string {
|
||||||
const baseClasses =
|
const baseClasses =
|
||||||
"text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden";
|
"text-sm font-semibold text-ellipsis whitespace-nowrap overflow-hidden";
|
||||||
|
|
||||||
if (this.conflicted) {
|
if (this.conflicted) {
|
||||||
return `${baseClasses} text-slate-400`;
|
return `${baseClasses} text-slate-400`;
|
||||||
|
|||||||
@@ -1,772 +0,0 @@
|
|||||||
<template>
|
|
||||||
<section
|
|
||||||
v-if="notificationsSupported"
|
|
||||||
id="sectionDailyNotifications"
|
|
||||||
class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8"
|
|
||||||
aria-labelledby="dailyNotificationsHeading"
|
|
||||||
>
|
|
||||||
<h2 id="dailyNotificationsHeading" class="mb-2 font-bold">
|
|
||||||
Daily Notifications
|
|
||||||
<button
|
|
||||||
class="text-slate-400 fa-fw cursor-pointer"
|
|
||||||
aria-label="Learn more about native notifications"
|
|
||||||
@click.stop="showNativeNotificationInfo"
|
|
||||||
>
|
|
||||||
<font-awesome icon="circle-question" aria-hidden="true" />
|
|
||||||
</button>
|
|
||||||
</h2>
|
|
||||||
|
|
||||||
<div class="flex items-center justify-between">
|
|
||||||
<div>Daily Notification</div>
|
|
||||||
<!-- Toggle switch -->
|
|
||||||
<div
|
|
||||||
class="relative ml-2 cursor-pointer"
|
|
||||||
role="switch"
|
|
||||||
:aria-checked="nativeNotificationEnabled"
|
|
||||||
:aria-label="
|
|
||||||
nativeNotificationEnabled
|
|
||||||
? 'Disable daily notifications'
|
|
||||||
: 'Enable daily notifications'
|
|
||||||
"
|
|
||||||
tabindex="0"
|
|
||||||
@click="toggleNativeNotification"
|
|
||||||
>
|
|
||||||
<!-- input -->
|
|
||||||
<input
|
|
||||||
:checked="nativeNotificationEnabled"
|
|
||||||
type="checkbox"
|
|
||||||
class="sr-only"
|
|
||||||
tabindex="-1"
|
|
||||||
readonly
|
|
||||||
/>
|
|
||||||
<!-- line -->
|
|
||||||
<div
|
|
||||||
class="block bg-slate-500 w-14 h-8 rounded-full transition"
|
|
||||||
:class="{
|
|
||||||
'bg-blue-600': nativeNotificationEnabled,
|
|
||||||
}"
|
|
||||||
></div>
|
|
||||||
<!-- dot -->
|
|
||||||
<div
|
|
||||||
class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
|
|
||||||
:class="{
|
|
||||||
'left-7 bg-white': nativeNotificationEnabled,
|
|
||||||
}"
|
|
||||||
></div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Show "Open Settings" button when permissions are denied -->
|
|
||||||
<div
|
|
||||||
v-if="
|
|
||||||
notificationsSupported &&
|
|
||||||
notificationStatus &&
|
|
||||||
notificationStatus.permissions.notifications === 'denied'
|
|
||||||
"
|
|
||||||
class="mt-2"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
class="w-full px-3 py-2 bg-blue-600 text-white rounded text-sm font-medium"
|
|
||||||
@click="openNotificationSettings"
|
|
||||||
>
|
|
||||||
Open Settings
|
|
||||||
</button>
|
|
||||||
<p class="text-xs text-slate-500 mt-1 text-center">
|
|
||||||
Enable notifications in Settings > App info > Notifications
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Time input section - show when enabled OR when no time is set -->
|
|
||||||
<div
|
|
||||||
v-if="nativeNotificationEnabled || !nativeNotificationTimeStorage"
|
|
||||||
class="mt-2"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
v-if="nativeNotificationEnabled"
|
|
||||||
class="flex items-center justify-between mb-2"
|
|
||||||
>
|
|
||||||
<span
|
|
||||||
>Scheduled for:
|
|
||||||
<span v-if="nativeNotificationTime">{{
|
|
||||||
nativeNotificationTime
|
|
||||||
}}</span>
|
|
||||||
<span v-else class="text-slate-500">Not set</span></span
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
class="text-blue-500 text-sm"
|
|
||||||
@click="editNativeNotificationTime"
|
|
||||||
>
|
|
||||||
{{ showTimeEdit ? "Cancel" : "Edit Time" }}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Time input (shown when editing or when no time is set) -->
|
|
||||||
<div v-if="showTimeEdit || !nativeNotificationTimeStorage" class="mt-2">
|
|
||||||
<label class="block text-sm text-slate-600 mb-1">
|
|
||||||
Notification Time
|
|
||||||
</label>
|
|
||||||
<div class="flex items-center gap-2">
|
|
||||||
<input
|
|
||||||
v-model="nativeNotificationTimeStorage"
|
|
||||||
type="time"
|
|
||||||
class="rounded border border-slate-400 px-2 py-2"
|
|
||||||
@change="onTimeChange"
|
|
||||||
/>
|
|
||||||
<button
|
|
||||||
v-if="showTimeEdit || nativeNotificationTimeStorage"
|
|
||||||
class="px-3 py-2 bg-blue-600 text-white rounded"
|
|
||||||
@click="saveTimeChange"
|
|
||||||
>
|
|
||||||
Save
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<p
|
|
||||||
v-if="!nativeNotificationTimeStorage"
|
|
||||||
class="text-xs text-slate-500 mt-1"
|
|
||||||
>
|
|
||||||
Set a time before enabling notifications
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Loading state -->
|
|
||||||
<div v-if="loading" class="mt-2 text-sm text-slate-500">Loading...</div>
|
|
||||||
</section>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
/**
|
|
||||||
* DailyNotificationSection Component
|
|
||||||
*
|
|
||||||
* A self-contained component for managing daily notification scheduling
|
|
||||||
* in AccountViewView. This component handles platform detection, permission
|
|
||||||
* requests, scheduling, and state management for daily notifications.
|
|
||||||
*
|
|
||||||
* Features:
|
|
||||||
* - Platform capability detection (hides on unsupported platforms)
|
|
||||||
* - Permission request flow
|
|
||||||
* - Schedule/cancel notifications
|
|
||||||
* - Time editing with HTML5 time input
|
|
||||||
* - Settings persistence
|
|
||||||
* - Plugin state synchronization
|
|
||||||
*
|
|
||||||
* @author Generated for TimeSafari Daily Notification Integration
|
|
||||||
* @component
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
|
||||||
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
|
||||||
import { logger } from "@/utils/logger";
|
|
||||||
import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
|
|
||||||
import type {
|
|
||||||
NotificationStatus,
|
|
||||||
PermissionStatus,
|
|
||||||
} from "@/services/PlatformService";
|
|
||||||
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
|
||||||
import type { NotificationIface } from "@/constants/app";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Convert 24-hour time format ("09:00") to 12-hour display format ("9:00 AM")
|
|
||||||
*/
|
|
||||||
function formatTimeForDisplay(time24: string): string {
|
|
||||||
if (!time24) return "";
|
|
||||||
const [hours, minutes] = time24.split(":");
|
|
||||||
const hourNum = parseInt(hours);
|
|
||||||
const isPM = hourNum >= 12;
|
|
||||||
const displayHour =
|
|
||||||
hourNum === 0 ? 12 : hourNum > 12 ? hourNum - 12 : hourNum;
|
|
||||||
return `${displayHour}:${minutes} ${isPM ? "PM" : "AM"}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
name: "DailyNotificationSection",
|
|
||||||
mixins: [PlatformServiceMixin],
|
|
||||||
})
|
|
||||||
export default class DailyNotificationSection extends Vue {
|
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
// Component state
|
|
||||||
notificationsSupported: boolean = false;
|
|
||||||
nativeNotificationEnabled: boolean = false;
|
|
||||||
nativeNotificationTime: string = ""; // Display format: "9:00 AM"
|
|
||||||
nativeNotificationTimeStorage: string = ""; // Plugin format: "09:00"
|
|
||||||
nativeNotificationTitle: string = "Daily Update";
|
|
||||||
nativeNotificationMessage: string = "Your daily notification is ready!";
|
|
||||||
showTimeEdit: boolean = false;
|
|
||||||
loading: boolean = false;
|
|
||||||
notificationStatus: NotificationStatus | null = null;
|
|
||||||
|
|
||||||
// Notify helpers
|
|
||||||
private notify!: ReturnType<typeof createNotifyHelpers>;
|
|
||||||
|
|
||||||
async created(): Promise<void> {
|
|
||||||
this.notify = createNotifyHelpers(this.$notify);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialize component state on mount
|
|
||||||
* Checks platform support and syncs with plugin state
|
|
||||||
*
|
|
||||||
* **Token Refresh on Mount:**
|
|
||||||
* - Refreshes native fetcher configuration to ensure plugin has valid token
|
|
||||||
* - This handles cases where app was closed for extended periods
|
|
||||||
* - Token refresh happens automatically without user interaction
|
|
||||||
*
|
|
||||||
* **App Resume Listener:**
|
|
||||||
* - Listens for Capacitor 'resume' event to refresh token when app comes to foreground
|
|
||||||
* - Ensures plugin always has fresh token for background prefetch operations
|
|
||||||
* - Cleaned up in `beforeDestroy()` lifecycle hook
|
|
||||||
*/
|
|
||||||
async mounted(): Promise<void> {
|
|
||||||
await this.initializeState();
|
|
||||||
// Refresh native fetcher configuration on mount
|
|
||||||
// This ensures plugin has valid token even if app was closed for extended periods
|
|
||||||
await this.refreshNativeFetcherConfig();
|
|
||||||
// Listen for app resume events to refresh token when app comes to foreground
|
|
||||||
// This is part of the proactive token refresh strategy
|
|
||||||
document.addEventListener("resume", this.handleAppResume);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cleanup on component destroy
|
|
||||||
*/
|
|
||||||
beforeDestroy(): void {
|
|
||||||
document.removeEventListener("resume", this.handleAppResume);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle app resume event - refresh native fetcher configuration
|
|
||||||
*
|
|
||||||
* This method is called when the app comes to foreground (via Capacitor 'resume' event).
|
|
||||||
* It proactively refreshes the JWT token to ensure the plugin has valid authentication
|
|
||||||
* for background prefetch operations.
|
|
||||||
*
|
|
||||||
* **Why refresh on resume?**
|
|
||||||
* - Tokens expire after 72 hours
|
|
||||||
* - App may have been closed for extended periods
|
|
||||||
* - Refreshing ensures plugin has valid token for next prefetch cycle
|
|
||||||
* - No user interaction required - happens automatically
|
|
||||||
*
|
|
||||||
* @see {@link refreshNativeFetcherConfig} For implementation details
|
|
||||||
*/
|
|
||||||
async handleAppResume(): Promise<void> {
|
|
||||||
logger.debug(
|
|
||||||
"[DailyNotificationSection] App resumed, refreshing native fetcher config",
|
|
||||||
);
|
|
||||||
await this.refreshNativeFetcherConfig();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Refresh native fetcher configuration with fresh JWT token
|
|
||||||
*
|
|
||||||
* This method ensures the daily notification plugin has a valid authentication token
|
|
||||||
* for background prefetch operations. It's called proactively to prevent token expiration
|
|
||||||
* issues during offline periods.
|
|
||||||
*
|
|
||||||
* **Refresh Triggers:**
|
|
||||||
* - Component mount (when notification settings page loads)
|
|
||||||
* - App resume (when app comes to foreground)
|
|
||||||
* - Notification enabled (when user enables daily notifications)
|
|
||||||
*
|
|
||||||
* **Token Refresh Strategy (Hybrid Approach):**
|
|
||||||
* - Tokens are valid for 72 hours (see `accessTokenForBackground`)
|
|
||||||
* - Tokens are refreshed proactively when app is already open
|
|
||||||
* - If token expires while offline, plugin uses cached content
|
|
||||||
* - Next time app opens, token is automatically refreshed
|
|
||||||
*
|
|
||||||
* **Why This Approach?**
|
|
||||||
* - No app wake-up required (tokens refresh when app is already open)
|
|
||||||
* - Works offline (72-hour validity supports extended offline periods)
|
|
||||||
* - Automatic (no user interaction required)
|
|
||||||
* - Includes starred plans (fetcher receives user's starred plans for prefetch)
|
|
||||||
* - Graceful degradation (if refresh fails, cached content still works)
|
|
||||||
*
|
|
||||||
* **Error Handling:**
|
|
||||||
* - Errors are logged but not shown to user (background operation)
|
|
||||||
* - Returns early if notifications not supported or disabled
|
|
||||||
* - Returns early if API server not configured
|
|
||||||
* - Failures don't interrupt user experience
|
|
||||||
*
|
|
||||||
* @returns Promise that resolves when refresh completes (or fails silently)
|
|
||||||
*
|
|
||||||
* @example
|
|
||||||
* ```typescript
|
|
||||||
* // Called automatically on mount/resume
|
|
||||||
* await this.refreshNativeFetcherConfig();
|
|
||||||
* ```
|
|
||||||
*
|
|
||||||
* @see {@link CapacitorPlatformService.configureNativeFetcher} For token generation
|
|
||||||
* @see {@link accessTokenForBackground} For 72-hour token generation
|
|
||||||
*/
|
|
||||||
async refreshNativeFetcherConfig(): Promise<void> {
|
|
||||||
try {
|
|
||||||
const platformService = PlatformServiceFactory.getInstance();
|
|
||||||
|
|
||||||
// Early return: Only refresh if notifications are supported and enabled
|
|
||||||
// This prevents unnecessary work when notifications aren't being used
|
|
||||||
if (!this.notificationsSupported || !this.nativeNotificationEnabled) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get settings for API server and starred plans
|
|
||||||
// API server tells plugin where to fetch content from
|
|
||||||
// Starred plans tell plugin which plans to prefetch
|
|
||||||
const settings = await this.$accountSettings();
|
|
||||||
const apiServer = settings.apiServer || "";
|
|
||||||
|
|
||||||
if (!apiServer) {
|
|
||||||
logger.warn(
|
|
||||||
"[DailyNotificationSection] No API server configured, skipping native fetcher refresh",
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get starred plans from settings
|
|
||||||
// These are passed to the plugin so it knows which plans to prefetch
|
|
||||||
const starredPlanHandleIds = settings.starredPlanHandleIds || [];
|
|
||||||
|
|
||||||
// Configure native fetcher with fresh token
|
|
||||||
// The jwt parameter is ignored - configureNativeFetcher generates it automatically
|
|
||||||
// This ensures we always have a fresh token with current expiration time
|
|
||||||
await platformService.configureNativeFetcher({
|
|
||||||
apiServer,
|
|
||||||
jwt: "", // Will be generated automatically by configureNativeFetcher
|
|
||||||
starredPlanHandleIds,
|
|
||||||
});
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
"[DailyNotificationSection] Native fetcher configuration refreshed",
|
|
||||||
);
|
|
||||||
} catch (error) {
|
|
||||||
// Don't show error to user - this is a background operation
|
|
||||||
// Failures are logged for debugging but don't interrupt user experience
|
|
||||||
// If refresh fails, plugin will use existing token (if still valid) or cached content
|
|
||||||
logger.error(
|
|
||||||
"[DailyNotificationSection] Failed to refresh native fetcher config:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialize component state
|
|
||||||
* Checks platform support and syncs with plugin state
|
|
||||||
*/
|
|
||||||
async initializeState(): Promise<void> {
|
|
||||||
try {
|
|
||||||
this.loading = true;
|
|
||||||
const platformService = PlatformServiceFactory.getInstance();
|
|
||||||
|
|
||||||
// Check if notifications are supported on this platform
|
|
||||||
// This also verifies plugin availability (returns null if plugin unavailable)
|
|
||||||
const status = await platformService.getDailyNotificationStatus();
|
|
||||||
if (status === null) {
|
|
||||||
// Notifications not supported or plugin unavailable - don't initialize
|
|
||||||
this.notificationsSupported = false;
|
|
||||||
logger.warn(
|
|
||||||
"[DailyNotificationSection] Notifications not supported or plugin unavailable",
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.notificationsSupported = true;
|
|
||||||
this.notificationStatus = status;
|
|
||||||
|
|
||||||
// Plugin state is the source of truth
|
|
||||||
if (status.isScheduled && status.scheduledTime) {
|
|
||||||
// Plugin has a scheduled notification - sync UI to match
|
|
||||||
this.nativeNotificationEnabled = true;
|
|
||||||
this.nativeNotificationTimeStorage = status.scheduledTime;
|
|
||||||
this.nativeNotificationTime = formatTimeForDisplay(
|
|
||||||
status.scheduledTime,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
// No plugin schedule - UI defaults to disabled
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
this.nativeNotificationTimeStorage = "";
|
|
||||||
this.nativeNotificationTime = "";
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
logger.error("[DailyNotificationSection] Failed to initialize:", error);
|
|
||||||
this.notificationsSupported = false;
|
|
||||||
} finally {
|
|
||||||
this.loading = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Toggle notification on/off
|
|
||||||
*/
|
|
||||||
async toggleNativeNotification(): Promise<void> {
|
|
||||||
// Prevent multiple simultaneous toggles
|
|
||||||
if (this.loading) {
|
|
||||||
logger.warn(
|
|
||||||
"[DailyNotificationSection] Toggle ignored - operation in progress",
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`[DailyNotificationSection] Toggling notification: ${this.nativeNotificationEnabled} -> ${!this.nativeNotificationEnabled}`,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (this.nativeNotificationEnabled) {
|
|
||||||
await this.disableNativeNotification();
|
|
||||||
} else {
|
|
||||||
await this.enableNativeNotification();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Enable daily notification
|
|
||||||
*/
|
|
||||||
async enableNativeNotification(): Promise<void> {
|
|
||||||
try {
|
|
||||||
this.loading = true;
|
|
||||||
const platformService = PlatformServiceFactory.getInstance();
|
|
||||||
|
|
||||||
// Check if we have a time set
|
|
||||||
if (!this.nativeNotificationTimeStorage) {
|
|
||||||
this.notify.error(
|
|
||||||
"Please set a notification time first",
|
|
||||||
TIMEOUTS.SHORT,
|
|
||||||
);
|
|
||||||
this.loading = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check permissions first - this also verifies plugin availability
|
|
||||||
let permissions: PermissionStatus | null;
|
|
||||||
try {
|
|
||||||
permissions = await platformService.checkNotificationPermissions();
|
|
||||||
logger.info(
|
|
||||||
`[DailyNotificationSection] Permission check result:`,
|
|
||||||
permissions,
|
|
||||||
);
|
|
||||||
} catch (error) {
|
|
||||||
// Plugin may not be available or there's an error
|
|
||||||
logger.error(
|
|
||||||
"[DailyNotificationSection] Failed to check permissions (plugin may be unavailable):",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Unable to check notification permissions. The notification plugin may not be installed.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (permissions === null) {
|
|
||||||
// Platform doesn't support notifications or plugin unavailable
|
|
||||||
logger.warn(
|
|
||||||
"[DailyNotificationSection] Notifications not supported or plugin unavailable",
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Notifications are not supported on this platform or the plugin is not installed.",
|
|
||||||
TIMEOUTS.SHORT,
|
|
||||||
);
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`[DailyNotificationSection] Permission state: ${permissions.notifications}`,
|
|
||||||
);
|
|
||||||
|
|
||||||
// If permissions are explicitly denied, don't try to request again
|
|
||||||
// (this prevents the plugin crash when handling denied permissions)
|
|
||||||
// Android won't show the dialog again if permissions are permanently denied
|
|
||||||
if (permissions.notifications === "denied") {
|
|
||||||
logger.warn(
|
|
||||||
"[DailyNotificationSection] Permissions already denied, directing user to settings",
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Notification permissions were denied. Tap 'Open Settings' to enable them.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only request if permissions are in "prompt" state (not denied, not granted)
|
|
||||||
// This ensures we only call requestPermissions when Android will actually show a dialog
|
|
||||||
if (permissions.notifications === "prompt") {
|
|
||||||
logger.info(
|
|
||||||
"[DailyNotificationSection] Permission state is 'prompt', requesting permissions...",
|
|
||||||
);
|
|
||||||
try {
|
|
||||||
const result = await platformService.requestNotificationPermissions();
|
|
||||||
logger.info(
|
|
||||||
`[DailyNotificationSection] Permission request result:`,
|
|
||||||
result,
|
|
||||||
);
|
|
||||||
if (result === null) {
|
|
||||||
// Plugin unavailable or request failed
|
|
||||||
logger.error(
|
|
||||||
"[DailyNotificationSection] Permission request returned null",
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Unable to request notification permissions. The plugin may not be available.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (!result.notifications) {
|
|
||||||
// Permission request was denied
|
|
||||||
logger.warn(
|
|
||||||
"[DailyNotificationSection] Permission request denied by user",
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Notification permissions are required. Tap 'Open Settings' to enable them.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// Permissions granted - continue
|
|
||||||
logger.info(
|
|
||||||
"[DailyNotificationSection] Permissions granted successfully",
|
|
||||||
);
|
|
||||||
} catch (error) {
|
|
||||||
// Handle permission request errors (including plugin crashes)
|
|
||||||
logger.error(
|
|
||||||
"[DailyNotificationSection] Permission request failed:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Unable to request notification permissions. Tap 'Open Settings' to enable them.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else if (permissions.notifications !== "granted") {
|
|
||||||
// Unexpected state - shouldn't happen, but handle gracefully
|
|
||||||
logger.warn(
|
|
||||||
`[DailyNotificationSection] Unexpected permission state: ${permissions.notifications}`,
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Unable to determine notification permission status. Tap 'Open Settings' to check.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
return;
|
|
||||||
} else {
|
|
||||||
logger.info("[DailyNotificationSection] Permissions already granted");
|
|
||||||
}
|
|
||||||
|
|
||||||
// Permissions are granted - continue with scheduling
|
|
||||||
|
|
||||||
// Schedule notification via PlatformService
|
|
||||||
await platformService.scheduleDailyNotification({
|
|
||||||
time: this.nativeNotificationTimeStorage, // "09:00" in local time
|
|
||||||
title: this.nativeNotificationTitle,
|
|
||||||
body: this.nativeNotificationMessage,
|
|
||||||
sound: true,
|
|
||||||
priority: "high",
|
|
||||||
});
|
|
||||||
|
|
||||||
// Update UI state
|
|
||||||
this.nativeNotificationEnabled = true;
|
|
||||||
|
|
||||||
// Refresh native fetcher configuration with fresh token
|
|
||||||
// This ensures plugin has valid authentication when notifications are first enabled
|
|
||||||
// Token will be valid for 72 hours, supporting offline prefetch operations
|
|
||||||
await this.refreshNativeFetcherConfig();
|
|
||||||
|
|
||||||
this.notify.success(
|
|
||||||
"Daily notification scheduled successfully",
|
|
||||||
TIMEOUTS.SHORT,
|
|
||||||
);
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[DailyNotificationSection] Failed to enable notification:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Failed to schedule notification. Please try again.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
} finally {
|
|
||||||
this.loading = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Disable daily notification
|
|
||||||
*/
|
|
||||||
async disableNativeNotification(): Promise<void> {
|
|
||||||
try {
|
|
||||||
this.loading = true;
|
|
||||||
const platformService = PlatformServiceFactory.getInstance();
|
|
||||||
|
|
||||||
// Cancel notification via PlatformService
|
|
||||||
await platformService.cancelDailyNotification();
|
|
||||||
|
|
||||||
// Update UI state
|
|
||||||
this.nativeNotificationEnabled = false;
|
|
||||||
this.nativeNotificationTime = "";
|
|
||||||
this.nativeNotificationTimeStorage = "";
|
|
||||||
this.showTimeEdit = false;
|
|
||||||
|
|
||||||
this.notify.success("Daily notification disabled", TIMEOUTS.SHORT);
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[DailyNotificationSection] Failed to disable notification:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Failed to disable notification. Please try again.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
} finally {
|
|
||||||
this.loading = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Show/hide time edit input
|
|
||||||
*/
|
|
||||||
editNativeNotificationTime(): void {
|
|
||||||
this.showTimeEdit = !this.showTimeEdit;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle time input change
|
|
||||||
*/
|
|
||||||
onTimeChange(): void {
|
|
||||||
// Time is already in nativeNotificationTimeStorage via v-model
|
|
||||||
// Just update display format
|
|
||||||
if (this.nativeNotificationTimeStorage) {
|
|
||||||
this.nativeNotificationTime = formatTimeForDisplay(
|
|
||||||
this.nativeNotificationTimeStorage,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Save time change and update notification schedule
|
|
||||||
*/
|
|
||||||
async saveTimeChange(): Promise<void> {
|
|
||||||
if (!this.nativeNotificationTimeStorage) {
|
|
||||||
this.notify.error("Please select a time", TIMEOUTS.SHORT);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update display format
|
|
||||||
this.nativeNotificationTime = formatTimeForDisplay(
|
|
||||||
this.nativeNotificationTimeStorage,
|
|
||||||
);
|
|
||||||
|
|
||||||
// If notification is enabled, update the schedule
|
|
||||||
if (this.nativeNotificationEnabled) {
|
|
||||||
await this.updateNotificationTime(this.nativeNotificationTimeStorage);
|
|
||||||
} else {
|
|
||||||
// Just update local state (time preference stored in component)
|
|
||||||
this.showTimeEdit = false;
|
|
||||||
this.notify.success("Notification time saved", TIMEOUTS.SHORT);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update notification time
|
|
||||||
* If notification is enabled, immediately updates the schedule
|
|
||||||
*/
|
|
||||||
async updateNotificationTime(newTime: string): Promise<void> {
|
|
||||||
// newTime is in "HH:mm" format from HTML5 time input
|
|
||||||
if (!this.nativeNotificationEnabled) {
|
|
||||||
// If notification is disabled, just update local state
|
|
||||||
this.nativeNotificationTimeStorage = newTime;
|
|
||||||
this.nativeNotificationTime = formatTimeForDisplay(newTime);
|
|
||||||
this.showTimeEdit = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Notification is enabled - update the schedule
|
|
||||||
try {
|
|
||||||
this.loading = true;
|
|
||||||
const platformService = PlatformServiceFactory.getInstance();
|
|
||||||
|
|
||||||
// 1. Cancel existing notification
|
|
||||||
await platformService.cancelDailyNotification();
|
|
||||||
|
|
||||||
// 2. Schedule with new time
|
|
||||||
await platformService.scheduleDailyNotification({
|
|
||||||
time: newTime, // "09:00" in local time
|
|
||||||
title: this.nativeNotificationTitle,
|
|
||||||
body: this.nativeNotificationMessage,
|
|
||||||
sound: true,
|
|
||||||
priority: "high",
|
|
||||||
});
|
|
||||||
|
|
||||||
// 3. Update local state
|
|
||||||
this.nativeNotificationTimeStorage = newTime;
|
|
||||||
this.nativeNotificationTime = formatTimeForDisplay(newTime);
|
|
||||||
|
|
||||||
this.notify.success(
|
|
||||||
"Notification time updated successfully",
|
|
||||||
TIMEOUTS.SHORT,
|
|
||||||
);
|
|
||||||
this.showTimeEdit = false;
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[DailyNotificationSection] Failed to update notification time:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Failed to update notification time. Please try again.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
} finally {
|
|
||||||
this.loading = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Show info dialog about native notifications
|
|
||||||
*/
|
|
||||||
showNativeNotificationInfo(): void {
|
|
||||||
// TODO: Implement info dialog or navigate to help page
|
|
||||||
this.notify.info(
|
|
||||||
"Daily notifications use your device's native notification system. They work even when the app is closed.",
|
|
||||||
TIMEOUTS.STANDARD,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open app notification settings
|
|
||||||
*/
|
|
||||||
async openNotificationSettings(): Promise<void> {
|
|
||||||
try {
|
|
||||||
const platformService = PlatformServiceFactory.getInstance();
|
|
||||||
const result = await platformService.openAppNotificationSettings();
|
|
||||||
if (result === null) {
|
|
||||||
this.notify.error(
|
|
||||||
"Unable to open settings. Please go to Settings > Apps > TimeSafari > Notifications manually.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
this.notify.success("Opening notification settings...", TIMEOUTS.SHORT);
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[DailyNotificationSection] Failed to open notification settings:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
this.notify.error(
|
|
||||||
"Unable to open settings. Please go to Settings > Apps > TimeSafari > Notifications manually.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
.dot {
|
|
||||||
transition: left 0.2s ease;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@@ -57,7 +57,12 @@ export interface OfferToPlanSummaryRecord extends OfferSummaryRecord {
|
|||||||
planName: string;
|
planName: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
// a summary record; the VC is not currently part of this record
|
/**
|
||||||
|
* A summary record
|
||||||
|
* The VC is not currently part of this record.
|
||||||
|
*
|
||||||
|
* If you change this, you may want to update NewActivityView.vue to handle differences correctly.
|
||||||
|
*/
|
||||||
export interface PlanSummaryRecord {
|
export interface PlanSummaryRecord {
|
||||||
agentDid?: string;
|
agentDid?: string;
|
||||||
description: string;
|
description: string;
|
||||||
@@ -76,7 +81,9 @@ export interface PlanSummaryRecord {
|
|||||||
|
|
||||||
export interface PlanSummaryAndPreviousClaim {
|
export interface PlanSummaryAndPreviousClaim {
|
||||||
plan: PlanSummaryRecord;
|
plan: PlanSummaryRecord;
|
||||||
wrappedClaimBefore: GenericCredWrapper<PlanActionClaim>;
|
// This can be undefined, eg. if a project is starred after the stored last-seen-change-jwt ID.
|
||||||
|
// The endorser-ch test code shows some cases.
|
||||||
|
wrappedClaimBefore?: GenericCredWrapper<PlanActionClaim>;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -104,71 +104,6 @@ export const accessToken = async (did?: string) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
|
||||||
* Generate a longer-lived access token for background operations
|
|
||||||
*
|
|
||||||
* This function creates JWT tokens with extended validity (default 72 hours) for use
|
|
||||||
* in background prefetch operations. The longer expiration period allows the daily
|
|
||||||
* notification plugin to work offline for extended periods without requiring the app
|
|
||||||
* to be in the foreground to refresh tokens.
|
|
||||||
*
|
|
||||||
* **Token Refresh Strategy (Hybrid Approach):**
|
|
||||||
* - Tokens are valid for 72 hours (configurable)
|
|
||||||
* - Tokens are refreshed proactively when:
|
|
||||||
* - App comes to foreground (via Capacitor 'resume' event)
|
|
||||||
* - Component mounts (DailyNotificationSection)
|
|
||||||
* - Notifications are enabled
|
|
||||||
* - If token expires while offline, plugin uses cached content
|
|
||||||
* - Next time app opens, token is automatically refreshed
|
|
||||||
*
|
|
||||||
* **Why 72 Hours?**
|
|
||||||
* - Balances security (read-only prefetch operations) with offline capability
|
|
||||||
* - Reduces need for app to wake itself for token refresh
|
|
||||||
* - Allows plugin to work offline for extended periods (e.g., weekend trips)
|
|
||||||
* - Longer than typical prefetch windows (5 minutes before notification)
|
|
||||||
*
|
|
||||||
* **Security Considerations:**
|
|
||||||
* - Tokens are used only for read-only prefetch operations
|
|
||||||
* - Tokens are stored securely in plugin's Room database
|
|
||||||
* - Tokens are refreshed proactively to minimize exposure window
|
|
||||||
* - No private keys are exposed to native code
|
|
||||||
*
|
|
||||||
* @param {string} did - User DID (Decentralized Identifier) for token issuer
|
|
||||||
* @param {number} expirationMinutes - Optional expiration in minutes (defaults to 72 hours = 4320 minutes)
|
|
||||||
* @return {Promise<string>} JWT token with extended validity, or empty string if no DID provided
|
|
||||||
*
|
|
||||||
* @example
|
|
||||||
* ```typescript
|
|
||||||
* // Generate token with default 72-hour expiration
|
|
||||||
* const token = await accessTokenForBackground("did:ethr:0x...");
|
|
||||||
*
|
|
||||||
* // Generate token with custom expiration (24 hours)
|
|
||||||
* const token24h = await accessTokenForBackground("did:ethr:0x...", 24 * 60);
|
|
||||||
* ```
|
|
||||||
*
|
|
||||||
* @see {@link accessToken} For short-lived tokens (1 minute) for regular API requests
|
|
||||||
* @see {@link createEndorserJwtForDid} For JWT creation implementation
|
|
||||||
*/
|
|
||||||
export const accessTokenForBackground = async (
|
|
||||||
did?: string,
|
|
||||||
expirationMinutes?: number,
|
|
||||||
): Promise<string> => {
|
|
||||||
if (!did) {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
// Use provided expiration or default to 72 hours (4320 minutes)
|
|
||||||
// This allows background prefetch operations to work offline for extended periods
|
|
||||||
const expirationSeconds = expirationMinutes
|
|
||||||
? expirationMinutes * 60
|
|
||||||
: 72 * 60 * 60; // Default 72 hours
|
|
||||||
|
|
||||||
const nowEpoch = Math.floor(Date.now() / 1000);
|
|
||||||
const endEpoch = nowEpoch + expirationSeconds;
|
|
||||||
const tokenPayload = { exp: endEpoch, iat: nowEpoch, iss: did };
|
|
||||||
return createEndorserJwtForDid(did, tokenPayload);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Extract JWT from various URL formats
|
* Extract JWT from various URL formats
|
||||||
* @param jwtUrlText The URL containing the JWT
|
* @param jwtUrlText The URL containing the JWT
|
||||||
|
|||||||
@@ -1686,7 +1686,10 @@ export async function register(
|
|||||||
"Registration thrown error:",
|
"Registration thrown error:",
|
||||||
errorMessage || JSON.stringify(err),
|
errorMessage || JSON.stringify(err),
|
||||||
);
|
);
|
||||||
return { error: errorMessage || "Got a server error when registering." };
|
return {
|
||||||
|
error:
|
||||||
|
(errorMessage as string) || "Got a server error when registering.",
|
||||||
|
};
|
||||||
}
|
}
|
||||||
return { error: "Got a server error when registering." };
|
return { error: "Got a server error when registering." };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,68 +32,6 @@ export interface PlatformCapabilities {
|
|||||||
isNativeApp: boolean;
|
isNativeApp: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Permission status for notifications
|
|
||||||
*/
|
|
||||||
export interface PermissionStatus {
|
|
||||||
/** Notification permission status */
|
|
||||||
notifications: "granted" | "denied" | "prompt";
|
|
||||||
/** Exact alarms permission status (Android only) */
|
|
||||||
exactAlarms?: "granted" | "denied" | "prompt";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Result of permission request
|
|
||||||
*/
|
|
||||||
export interface PermissionResult {
|
|
||||||
/** Whether notification permission was granted */
|
|
||||||
notifications: boolean;
|
|
||||||
/** Whether exact alarms permission was granted (Android only) */
|
|
||||||
exactAlarms?: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Status of scheduled daily notifications
|
|
||||||
*/
|
|
||||||
export interface NotificationStatus {
|
|
||||||
/** Whether a notification is currently scheduled */
|
|
||||||
isScheduled: boolean;
|
|
||||||
/** Scheduled time in "HH:mm" format (24-hour) */
|
|
||||||
scheduledTime?: string;
|
|
||||||
/** Last time the notification was triggered (ISO string) */
|
|
||||||
lastTriggered?: string;
|
|
||||||
/** Current permission status */
|
|
||||||
permissions: PermissionStatus;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Options for scheduling a daily notification
|
|
||||||
*/
|
|
||||||
export interface ScheduleOptions {
|
|
||||||
/** Time in "HH:mm" format (24-hour) in local time */
|
|
||||||
time: string;
|
|
||||||
/** Notification title */
|
|
||||||
title: string;
|
|
||||||
/** Notification body text */
|
|
||||||
body: string;
|
|
||||||
/** Whether to play sound (default: true) */
|
|
||||||
sound?: boolean;
|
|
||||||
/** Notification priority */
|
|
||||||
priority?: "high" | "normal" | "low";
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Configuration for native fetcher background operations
|
|
||||||
*/
|
|
||||||
export interface NativeFetcherConfig {
|
|
||||||
/** API server URL */
|
|
||||||
apiServer: string;
|
|
||||||
/** JWT token for authentication */
|
|
||||||
jwt: string;
|
|
||||||
/** Array of starred plan handle IDs */
|
|
||||||
starredPlanHandleIds: string[];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Platform-agnostic interface for handling platform-specific operations.
|
* Platform-agnostic interface for handling platform-specific operations.
|
||||||
* Provides a common API for file system operations, camera interactions,
|
* Provides a common API for file system operations, camera interactions,
|
||||||
@@ -271,58 +209,6 @@ export interface PlatformService {
|
|||||||
*/
|
*/
|
||||||
retrieveSettingsForActiveAccount(): Promise<Record<string, unknown> | null>;
|
retrieveSettingsForActiveAccount(): Promise<Record<string, unknown> | null>;
|
||||||
|
|
||||||
// Daily notification operations
|
|
||||||
/**
|
|
||||||
* Get the status of scheduled daily notifications
|
|
||||||
* @returns Promise resolving to notification status, or null if not supported
|
|
||||||
*/
|
|
||||||
getDailyNotificationStatus(): Promise<NotificationStatus | null>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check notification permissions
|
|
||||||
* @returns Promise resolving to permission status, or null if not supported
|
|
||||||
*/
|
|
||||||
checkNotificationPermissions(): Promise<PermissionStatus | null>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request notification permissions
|
|
||||||
* @returns Promise resolving to permission result, or null if not supported
|
|
||||||
*/
|
|
||||||
requestNotificationPermissions(): Promise<PermissionResult | null>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Schedule a daily notification
|
|
||||||
* @param options - Notification scheduling options
|
|
||||||
* @returns Promise that resolves when scheduled, or rejects if not supported
|
|
||||||
*/
|
|
||||||
scheduleDailyNotification(options: ScheduleOptions): Promise<void>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cancel scheduled daily notification
|
|
||||||
* @returns Promise that resolves when cancelled, or rejects if not supported
|
|
||||||
*/
|
|
||||||
cancelDailyNotification(): Promise<void>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Configure native fetcher for background operations
|
|
||||||
* @param config - Native fetcher configuration
|
|
||||||
* @returns Promise that resolves when configured, or null if not supported
|
|
||||||
*/
|
|
||||||
configureNativeFetcher(config: NativeFetcherConfig): Promise<void | null>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update starred plans for background fetcher
|
|
||||||
* @param plans - Starred plan IDs
|
|
||||||
* @returns Promise that resolves when updated, or null if not supported
|
|
||||||
*/
|
|
||||||
updateStarredPlans(plans: { planIds: string[] }): Promise<void | null>;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open the app's notification settings in the system settings
|
|
||||||
* @returns Promise that resolves when the settings page is opened, or null if not supported
|
|
||||||
*/
|
|
||||||
openAppNotificationSettings(): Promise<void | null>;
|
|
||||||
|
|
||||||
// --- PWA/Web-only methods (optional, only implemented on web) ---
|
// --- PWA/Web-only methods (optional, only implemented on web) ---
|
||||||
/**
|
/**
|
||||||
* Registers the service worker for PWA support (web only)
|
* Registers the service worker for PWA support (web only)
|
||||||
|
|||||||
@@ -20,11 +20,6 @@ import {
|
|||||||
ImageResult,
|
ImageResult,
|
||||||
PlatformService,
|
PlatformService,
|
||||||
PlatformCapabilities,
|
PlatformCapabilities,
|
||||||
NotificationStatus,
|
|
||||||
PermissionStatus,
|
|
||||||
PermissionResult,
|
|
||||||
ScheduleOptions,
|
|
||||||
NativeFetcherConfig,
|
|
||||||
} from "../PlatformService";
|
} from "../PlatformService";
|
||||||
import { logger } from "../../utils/logger";
|
import { logger } from "../../utils/logger";
|
||||||
import { BaseDatabaseService } from "./BaseDatabaseService";
|
import { BaseDatabaseService } from "./BaseDatabaseService";
|
||||||
@@ -96,16 +91,92 @@ export class CapacitorPlatformService
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Create/Open database
|
// Try to create/Open database connection
|
||||||
this.db = await this.sqlite.createConnection(
|
try {
|
||||||
this.dbName,
|
this.db = await this.sqlite.createConnection(
|
||||||
false,
|
this.dbName,
|
||||||
"no-encryption",
|
false,
|
||||||
1,
|
"no-encryption",
|
||||||
false,
|
1,
|
||||||
);
|
false,
|
||||||
|
);
|
||||||
|
} catch (createError: unknown) {
|
||||||
|
// If connection already exists, try to retrieve it or handle gracefully
|
||||||
|
const errorMessage =
|
||||||
|
createError instanceof Error
|
||||||
|
? createError.message
|
||||||
|
: String(createError);
|
||||||
|
const errorObj =
|
||||||
|
typeof createError === "object" && createError !== null
|
||||||
|
? (createError as { errorMessage?: string; message?: string })
|
||||||
|
: {};
|
||||||
|
|
||||||
await this.db.open();
|
const fullErrorMessage =
|
||||||
|
errorObj.errorMessage || errorObj.message || errorMessage;
|
||||||
|
|
||||||
|
if (fullErrorMessage.includes("already exists")) {
|
||||||
|
logger.debug(
|
||||||
|
"[CapacitorPlatformService] Connection already exists on native side, attempting to retrieve",
|
||||||
|
);
|
||||||
|
// Check if connection exists in JavaScript Map
|
||||||
|
const isConnResult = await this.sqlite.isConnection(
|
||||||
|
this.dbName,
|
||||||
|
false,
|
||||||
|
);
|
||||||
|
if (isConnResult.result) {
|
||||||
|
// Connection exists in Map, retrieve it
|
||||||
|
this.db = await this.sqlite.retrieveConnection(this.dbName, false);
|
||||||
|
logger.debug(
|
||||||
|
"[CapacitorPlatformService] Successfully retrieved existing connection from Map",
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
// Connection exists on native side but not in JavaScript Map
|
||||||
|
// This can happen when the app is restarted but native connections persist
|
||||||
|
// Try to close the native connection first, then create a new one
|
||||||
|
logger.debug(
|
||||||
|
"[CapacitorPlatformService] Connection exists natively but not in Map, closing and recreating",
|
||||||
|
);
|
||||||
|
try {
|
||||||
|
await this.sqlite.closeConnection(this.dbName, false);
|
||||||
|
} catch (closeError) {
|
||||||
|
// Ignore close errors - connection might not be properly tracked
|
||||||
|
logger.debug(
|
||||||
|
"[CapacitorPlatformService] Error closing connection (may be expected):",
|
||||||
|
closeError,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
// Now try to create the connection again
|
||||||
|
this.db = await this.sqlite.createConnection(
|
||||||
|
this.dbName,
|
||||||
|
false,
|
||||||
|
"no-encryption",
|
||||||
|
1,
|
||||||
|
false,
|
||||||
|
);
|
||||||
|
logger.debug(
|
||||||
|
"[CapacitorPlatformService] Successfully created connection after cleanup",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Re-throw if it's a different error
|
||||||
|
throw createError;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Open the connection if it's not already open
|
||||||
|
try {
|
||||||
|
await this.db.open();
|
||||||
|
} catch (openError: unknown) {
|
||||||
|
const openErrorMessage =
|
||||||
|
openError instanceof Error ? openError.message : String(openError);
|
||||||
|
// If already open, that's fine - continue
|
||||||
|
if (!openErrorMessage.includes("already open")) {
|
||||||
|
throw openError;
|
||||||
|
}
|
||||||
|
logger.debug(
|
||||||
|
"[CapacitorPlatformService] Database connection already open",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// Set journal mode to WAL for better performance
|
// Set journal mode to WAL for better performance
|
||||||
// await this.db.execute("PRAGMA journal_mode=WAL;");
|
// await this.db.execute("PRAGMA journal_mode=WAL;");
|
||||||
@@ -1338,445 +1409,6 @@ export class CapacitorPlatformService
|
|||||||
// --- PWA/Web-only methods (no-op for Capacitor) ---
|
// --- PWA/Web-only methods (no-op for Capacitor) ---
|
||||||
public registerServiceWorker(): void {}
|
public registerServiceWorker(): void {}
|
||||||
|
|
||||||
// Daily notification operations
|
|
||||||
/**
|
|
||||||
* Get the status of scheduled daily notifications
|
|
||||||
* @see PlatformService.getDailyNotificationStatus
|
|
||||||
*/
|
|
||||||
async getDailyNotificationStatus(): Promise<NotificationStatus | null> {
|
|
||||||
try {
|
|
||||||
// Dynamic import to avoid build issues if plugin unavailable
|
|
||||||
const { DailyNotification } = await import(
|
|
||||||
"@timesafari/daily-notification-plugin"
|
|
||||||
);
|
|
||||||
|
|
||||||
const pluginStatus = await DailyNotification.getNotificationStatus();
|
|
||||||
|
|
||||||
// Get permissions separately
|
|
||||||
const permissions = await DailyNotification.checkPermissions();
|
|
||||||
|
|
||||||
// Map plugin PermissionState to our PermissionStatus format
|
|
||||||
const notificationsPermission = permissions.notifications;
|
|
||||||
let notifications: "granted" | "denied" | "prompt";
|
|
||||||
|
|
||||||
if (notificationsPermission === "granted") {
|
|
||||||
notifications = "granted";
|
|
||||||
} else if (notificationsPermission === "denied") {
|
|
||||||
notifications = "denied";
|
|
||||||
} else {
|
|
||||||
notifications = "prompt";
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle lastNotificationTime which can be a Promise<number>
|
|
||||||
let lastTriggered: string | undefined;
|
|
||||||
const lastNotificationTime = pluginStatus.lastNotificationTime;
|
|
||||||
if (lastNotificationTime) {
|
|
||||||
const timeValue = await Promise.resolve(lastNotificationTime);
|
|
||||||
if (typeof timeValue === "number") {
|
|
||||||
lastTriggered = new Date(timeValue).toISOString();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
isScheduled: pluginStatus.isScheduled ?? false,
|
|
||||||
scheduledTime: pluginStatus.settings?.time,
|
|
||||||
lastTriggered,
|
|
||||||
permissions: {
|
|
||||||
notifications,
|
|
||||||
exactAlarms: undefined, // Plugin doesn't expose this in status
|
|
||||||
},
|
|
||||||
};
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to get notification status:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check notification permissions
|
|
||||||
* @see PlatformService.checkNotificationPermissions
|
|
||||||
*/
|
|
||||||
async checkNotificationPermissions(): Promise<PermissionStatus | null> {
|
|
||||||
try {
|
|
||||||
const { DailyNotification } = await import(
|
|
||||||
"@timesafari/daily-notification-plugin"
|
|
||||||
);
|
|
||||||
|
|
||||||
const permissions = await DailyNotification.checkPermissions();
|
|
||||||
|
|
||||||
// Log the raw permission state for debugging
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Raw permission state from plugin:`,
|
|
||||||
permissions,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Map plugin PermissionState to our PermissionStatus format
|
|
||||||
const notificationsPermission = permissions.notifications;
|
|
||||||
let notifications: "granted" | "denied" | "prompt";
|
|
||||||
|
|
||||||
// Handle all possible PermissionState values
|
|
||||||
if (notificationsPermission === "granted") {
|
|
||||||
notifications = "granted";
|
|
||||||
} else if (
|
|
||||||
notificationsPermission === "denied" ||
|
|
||||||
notificationsPermission === "ephemeral"
|
|
||||||
) {
|
|
||||||
notifications = "denied";
|
|
||||||
} else {
|
|
||||||
// Treat "prompt", "prompt-with-rationale", "unknown", "provisional" as "prompt"
|
|
||||||
// This allows Android to show the permission dialog
|
|
||||||
notifications = "prompt";
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Mapped permission state: ${notifications} (from ${notificationsPermission})`,
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
|
||||||
notifications,
|
|
||||||
exactAlarms: undefined, // Plugin doesn't expose this directly
|
|
||||||
};
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to check permissions:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request notification permissions
|
|
||||||
* @see PlatformService.requestNotificationPermissions
|
|
||||||
*/
|
|
||||||
async requestNotificationPermissions(): Promise<PermissionResult | null> {
|
|
||||||
try {
|
|
||||||
const { DailyNotification } = await import(
|
|
||||||
"@timesafari/daily-notification-plugin"
|
|
||||||
);
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Requesting notification permissions...`,
|
|
||||||
);
|
|
||||||
|
|
||||||
const result = await DailyNotification.requestPermissions();
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Permission request result:`,
|
|
||||||
result,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Map plugin PermissionState to boolean
|
|
||||||
const notificationsGranted = result.notifications === "granted";
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Mapped permission result: ${notificationsGranted} (from ${result.notifications})`,
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
|
||||||
notifications: notificationsGranted,
|
|
||||||
exactAlarms: undefined, // Plugin doesn't expose this directly
|
|
||||||
};
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to request permissions:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Schedule a daily notification
|
|
||||||
* @see PlatformService.scheduleDailyNotification
|
|
||||||
*/
|
|
||||||
async scheduleDailyNotification(options: ScheduleOptions): Promise<void> {
|
|
||||||
try {
|
|
||||||
const { DailyNotification } = await import(
|
|
||||||
"@timesafari/daily-notification-plugin"
|
|
||||||
);
|
|
||||||
|
|
||||||
await DailyNotification.scheduleDailyNotification({
|
|
||||||
time: options.time,
|
|
||||||
title: options.title,
|
|
||||||
body: options.body,
|
|
||||||
sound: options.sound ?? true,
|
|
||||||
priority: options.priority ?? "high",
|
|
||||||
});
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Scheduled daily notification for ${options.time}`,
|
|
||||||
);
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to schedule notification:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cancel scheduled daily notification
|
|
||||||
* @see PlatformService.cancelDailyNotification
|
|
||||||
*/
|
|
||||||
async cancelDailyNotification(): Promise<void> {
|
|
||||||
try {
|
|
||||||
const { DailyNotification } = await import(
|
|
||||||
"@timesafari/daily-notification-plugin"
|
|
||||||
);
|
|
||||||
|
|
||||||
await DailyNotification.cancelAllNotifications();
|
|
||||||
|
|
||||||
logger.info("[CapacitorPlatformService] Cancelled daily notification");
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to cancel notification:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Configure native fetcher for background operations
|
|
||||||
*
|
|
||||||
* This method configures the daily notification plugin's native content fetcher
|
|
||||||
* with authentication credentials for background prefetch operations. It automatically
|
|
||||||
* retrieves the active DID from the database and generates a fresh JWT token with
|
|
||||||
* 72-hour expiration.
|
|
||||||
*
|
|
||||||
* **Authentication Flow:**
|
|
||||||
* 1. Retrieves active DID from `active_identity` table (single source of truth)
|
|
||||||
* 2. Generates JWT token with 72-hour expiration using `accessTokenForBackground()`
|
|
||||||
* 3. Configures plugin with API server URL, active DID, and JWT token
|
|
||||||
* 4. Plugin stores token in its Room database for background workers
|
|
||||||
*
|
|
||||||
* **Token Management:**
|
|
||||||
* - Tokens are valid for 72 hours (4320 minutes)
|
|
||||||
* - Tokens are refreshed proactively when app comes to foreground
|
|
||||||
* - If token expires while offline, plugin uses cached content
|
|
||||||
* - Token refresh happens automatically via `DailyNotificationSection.refreshNativeFetcherConfig()`
|
|
||||||
*
|
|
||||||
* **Offline-First Design:**
|
|
||||||
* - 72-hour validity supports extended offline periods
|
|
||||||
* - Plugin can prefetch content when online and use cached content when offline
|
|
||||||
* - No app wake-up required for token refresh (happens when app is already open)
|
|
||||||
*
|
|
||||||
* **Error Handling:**
|
|
||||||
* - Returns `null` if active DID not found (no user logged in)
|
|
||||||
* - Returns `null` if JWT generation fails
|
|
||||||
* - Logs errors but doesn't throw (allows graceful degradation)
|
|
||||||
*
|
|
||||||
* @param config - Native fetcher configuration
|
|
||||||
* @param config.apiServer - API server URL (optional, uses default if not provided)
|
|
||||||
* @param config.jwt - JWT token (ignored, generated automatically)
|
|
||||||
* @param config.starredPlanHandleIds - Array of starred plan handle IDs for prefetch
|
|
||||||
* @returns Promise that resolves when configured, or `null` if configuration failed
|
|
||||||
*
|
|
||||||
* @example
|
|
||||||
* ```typescript
|
|
||||||
* await platformService.configureNativeFetcher({
|
|
||||||
* apiServer: "https://api.endorser.ch",
|
|
||||||
* jwt: "", // Generated automatically
|
|
||||||
* starredPlanHandleIds: ["plan-123", "plan-456"]
|
|
||||||
* });
|
|
||||||
* ```
|
|
||||||
*
|
|
||||||
* @see {@link accessTokenForBackground} For JWT token generation
|
|
||||||
* @see {@link DailyNotificationSection.refreshNativeFetcherConfig} For proactive token refresh
|
|
||||||
* @see PlatformService.configureNativeFetcher
|
|
||||||
*/
|
|
||||||
async configureNativeFetcher(
|
|
||||||
config: NativeFetcherConfig,
|
|
||||||
): Promise<void | null> {
|
|
||||||
try {
|
|
||||||
const { DailyNotification } = await import(
|
|
||||||
"@timesafari/daily-notification-plugin"
|
|
||||||
);
|
|
||||||
|
|
||||||
// Step 1: Get activeDid from database (single source of truth)
|
|
||||||
// This ensures we're using the correct user identity for authentication
|
|
||||||
const activeIdentity = await this.getActiveIdentity();
|
|
||||||
const activeDid = activeIdentity.activeDid;
|
|
||||||
|
|
||||||
if (!activeDid) {
|
|
||||||
logger.warn(
|
|
||||||
"[CapacitorPlatformService] No activeDid found, cannot configure native fetcher",
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Step 2: Generate JWT token for background operations
|
|
||||||
// Use 72-hour expiration for offline-first prefetch operations
|
|
||||||
// This allows the plugin to work offline for extended periods
|
|
||||||
const { accessTokenForBackground } = await import(
|
|
||||||
"../../libs/crypto/index"
|
|
||||||
);
|
|
||||||
// Use 72 hours (4320 minutes) for background prefetch tokens
|
|
||||||
// This is longer than passkey expiration to support offline scenarios
|
|
||||||
const expirationMinutes = 72 * 60; // 72 hours
|
|
||||||
const jwtToken = await accessTokenForBackground(
|
|
||||||
activeDid,
|
|
||||||
expirationMinutes,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!jwtToken) {
|
|
||||||
logger.error("[CapacitorPlatformService] Failed to generate JWT token");
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Step 3: Get API server from config or use default
|
|
||||||
// This ensures the plugin knows where to fetch content from
|
|
||||||
const apiServer =
|
|
||||||
config.apiServer ||
|
|
||||||
(await import("../../constants/app")).DEFAULT_ENDORSER_API_SERVER;
|
|
||||||
|
|
||||||
// Step 4: Configure plugin with credentials
|
|
||||||
// Plugin stores these in its Room database for background workers
|
|
||||||
await DailyNotification.configureNativeFetcher({
|
|
||||||
apiBaseUrl: apiServer,
|
|
||||||
activeDid,
|
|
||||||
jwtToken,
|
|
||||||
});
|
|
||||||
|
|
||||||
logger.info("[CapacitorPlatformService] Configured native fetcher", {
|
|
||||||
activeDid,
|
|
||||||
apiServer,
|
|
||||||
tokenExpirationHours: 72,
|
|
||||||
tokenExpirationMinutes: expirationMinutes,
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to configure native fetcher:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update starred plans for background fetcher
|
|
||||||
* @see PlatformService.updateStarredPlans
|
|
||||||
*/
|
|
||||||
async updateStarredPlans(plans: { planIds: string[] }): Promise<void | null> {
|
|
||||||
try {
|
|
||||||
const { DailyNotification } = await import(
|
|
||||||
"@timesafari/daily-notification-plugin"
|
|
||||||
);
|
|
||||||
|
|
||||||
await DailyNotification.updateStarredPlans({
|
|
||||||
planIds: plans.planIds,
|
|
||||||
});
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Updated starred plans: ${plans.planIds.length} plans`,
|
|
||||||
);
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to update starred plans:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open the app's notification settings in the system settings
|
|
||||||
* @see PlatformService.openAppNotificationSettings
|
|
||||||
*/
|
|
||||||
async openAppNotificationSettings(): Promise<void | null> {
|
|
||||||
try {
|
|
||||||
const platform = Capacitor.getPlatform();
|
|
||||||
|
|
||||||
if (platform === "android") {
|
|
||||||
// Android: Open app details settings page
|
|
||||||
// From there, users can navigate to "Notifications" section
|
|
||||||
// This is more reliable than trying to open notification settings directly
|
|
||||||
const packageName = "app.timesafari.app"; // Full application ID from build.gradle
|
|
||||||
|
|
||||||
// Use APPLICATION_DETAILS_SETTINGS which opens the app's settings page
|
|
||||||
// Users can then navigate to "Notifications" section
|
|
||||||
// Try multiple URL formats to ensure compatibility
|
|
||||||
const intentUrl1 = `intent:#Intent;action=android.settings.APPLICATION_DETAILS_SETTINGS;data=package:${packageName};end`;
|
|
||||||
const intentUrl2 = `intent://settings/app_detail?package=${packageName}#Intent;scheme=android-app;end`;
|
|
||||||
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Opening Android app settings for ${packageName}`,
|
|
||||||
);
|
|
||||||
|
|
||||||
// Log current permission state before opening settings
|
|
||||||
try {
|
|
||||||
const currentPerms = await this.checkNotificationPermissions();
|
|
||||||
logger.info(
|
|
||||||
`[CapacitorPlatformService] Current permission state before opening settings:`,
|
|
||||||
currentPerms,
|
|
||||||
);
|
|
||||||
} catch (e) {
|
|
||||||
logger.warn(
|
|
||||||
`[CapacitorPlatformService] Could not check permissions before opening settings:`,
|
|
||||||
e,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try multiple approaches to ensure it works
|
|
||||||
try {
|
|
||||||
// Method 1: Direct window.location.href (most reliable)
|
|
||||||
window.location.href = intentUrl1;
|
|
||||||
|
|
||||||
// Method 2: Fallback with window.open
|
|
||||||
setTimeout(() => {
|
|
||||||
try {
|
|
||||||
window.open(intentUrl1, "_blank");
|
|
||||||
} catch (e) {
|
|
||||||
logger.warn(
|
|
||||||
"[CapacitorPlatformService] window.open fallback failed:",
|
|
||||||
e,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}, 100);
|
|
||||||
|
|
||||||
// Method 3: Alternative format
|
|
||||||
setTimeout(() => {
|
|
||||||
try {
|
|
||||||
window.location.href = intentUrl2;
|
|
||||||
} catch (e) {
|
|
||||||
logger.warn(
|
|
||||||
"[CapacitorPlatformService] Alternative format failed:",
|
|
||||||
e,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}, 200);
|
|
||||||
} catch (e) {
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to open intent URL:",
|
|
||||||
e,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} else if (platform === "ios") {
|
|
||||||
// iOS: Use app settings URL scheme
|
|
||||||
const settingsUrl = `app-settings:`;
|
|
||||||
window.location.href = settingsUrl;
|
|
||||||
|
|
||||||
logger.info("[CapacitorPlatformService] Opening iOS app settings");
|
|
||||||
} else {
|
|
||||||
logger.warn(
|
|
||||||
`[CapacitorPlatformService] Cannot open settings on platform: ${platform}`,
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[CapacitorPlatformService] Failed to open app notification settings:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Database utility methods - inherited from BaseDatabaseService
|
// Database utility methods - inherited from BaseDatabaseService
|
||||||
// generateInsertStatement, updateDefaultSettings, updateActiveDid,
|
// generateInsertStatement, updateDefaultSettings, updateActiveDid,
|
||||||
// getActiveIdentity, insertNewDidIntoSettings, updateDidSpecificSettings,
|
// getActiveIdentity, insertNewDidIntoSettings, updateDidSpecificSettings,
|
||||||
|
|||||||
@@ -22,13 +22,6 @@
|
|||||||
|
|
||||||
import { CapacitorPlatformService } from "./CapacitorPlatformService";
|
import { CapacitorPlatformService } from "./CapacitorPlatformService";
|
||||||
import { logger } from "../../utils/logger";
|
import { logger } from "../../utils/logger";
|
||||||
import {
|
|
||||||
NotificationStatus,
|
|
||||||
PermissionStatus,
|
|
||||||
PermissionResult,
|
|
||||||
ScheduleOptions,
|
|
||||||
NativeFetcherConfig,
|
|
||||||
} from "../PlatformService";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Electron-specific platform service implementation.
|
* Electron-specific platform service implementation.
|
||||||
@@ -173,88 +166,4 @@ export class ElectronPlatformService extends CapacitorPlatformService {
|
|||||||
|
|
||||||
// --- PWA/Web-only methods (no-op for Electron) ---
|
// --- PWA/Web-only methods (no-op for Electron) ---
|
||||||
public registerServiceWorker(): void {}
|
public registerServiceWorker(): void {}
|
||||||
|
|
||||||
// Daily notification operations
|
|
||||||
// Override CapacitorPlatformService methods to return null/throw errors
|
|
||||||
// since Electron doesn't support native daily notifications
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the status of scheduled daily notifications
|
|
||||||
* @see PlatformService.getDailyNotificationStatus
|
|
||||||
* @returns null - notifications not supported on Electron platform
|
|
||||||
*/
|
|
||||||
async getDailyNotificationStatus(): Promise<NotificationStatus | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check notification permissions
|
|
||||||
* @see PlatformService.checkNotificationPermissions
|
|
||||||
* @returns null - notifications not supported on Electron platform
|
|
||||||
*/
|
|
||||||
async checkNotificationPermissions(): Promise<PermissionStatus | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request notification permissions
|
|
||||||
* @see PlatformService.requestNotificationPermissions
|
|
||||||
* @returns null - notifications not supported on Electron platform
|
|
||||||
*/
|
|
||||||
async requestNotificationPermissions(): Promise<PermissionResult | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Schedule a daily notification
|
|
||||||
* @see PlatformService.scheduleDailyNotification
|
|
||||||
* @throws Error - notifications not supported on Electron platform
|
|
||||||
*/
|
|
||||||
async scheduleDailyNotification(_options: ScheduleOptions): Promise<void> {
|
|
||||||
throw new Error(
|
|
||||||
"Daily notifications are not supported on Electron platform",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cancel scheduled daily notification
|
|
||||||
* @see PlatformService.cancelDailyNotification
|
|
||||||
* @throws Error - notifications not supported on Electron platform
|
|
||||||
*/
|
|
||||||
async cancelDailyNotification(): Promise<void> {
|
|
||||||
throw new Error(
|
|
||||||
"Daily notifications are not supported on Electron platform",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Configure native fetcher for background operations
|
|
||||||
* @see PlatformService.configureNativeFetcher
|
|
||||||
* @returns null - native fetcher not supported on Electron platform
|
|
||||||
*/
|
|
||||||
async configureNativeFetcher(
|
|
||||||
_config: NativeFetcherConfig,
|
|
||||||
): Promise<void | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update starred plans for background fetcher
|
|
||||||
* @see PlatformService.updateStarredPlans
|
|
||||||
* @returns null - native fetcher not supported on Electron platform
|
|
||||||
*/
|
|
||||||
async updateStarredPlans(_plans: {
|
|
||||||
planIds: string[];
|
|
||||||
}): Promise<void | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open the app's notification settings in the system settings
|
|
||||||
* @see PlatformService.openAppNotificationSettings
|
|
||||||
* @returns null - not supported on Electron platform
|
|
||||||
*/
|
|
||||||
async openAppNotificationSettings(): Promise<void | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,11 +2,6 @@ import {
|
|||||||
ImageResult,
|
ImageResult,
|
||||||
PlatformService,
|
PlatformService,
|
||||||
PlatformCapabilities,
|
PlatformCapabilities,
|
||||||
NotificationStatus,
|
|
||||||
PermissionStatus,
|
|
||||||
PermissionResult,
|
|
||||||
ScheduleOptions,
|
|
||||||
NativeFetcherConfig,
|
|
||||||
} from "../PlatformService";
|
} from "../PlatformService";
|
||||||
import { logger } from "../../utils/logger";
|
import { logger } from "../../utils/logger";
|
||||||
import { QueryExecResult } from "@/interfaces/database";
|
import { QueryExecResult } from "@/interfaces/database";
|
||||||
@@ -682,81 +677,4 @@ export class WebPlatformService
|
|||||||
// generateInsertStatement, updateDefaultSettings, updateActiveDid,
|
// generateInsertStatement, updateDefaultSettings, updateActiveDid,
|
||||||
// getActiveIdentity, insertNewDidIntoSettings, updateDidSpecificSettings,
|
// getActiveIdentity, insertNewDidIntoSettings, updateDidSpecificSettings,
|
||||||
// retrieveSettingsForActiveAccount are all inherited from BaseDatabaseService
|
// retrieveSettingsForActiveAccount are all inherited from BaseDatabaseService
|
||||||
|
|
||||||
// Daily notification operations
|
|
||||||
/**
|
|
||||||
* Get the status of scheduled daily notifications
|
|
||||||
* @see PlatformService.getDailyNotificationStatus
|
|
||||||
* @returns null - notifications not supported on web platform
|
|
||||||
*/
|
|
||||||
async getDailyNotificationStatus(): Promise<NotificationStatus | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check notification permissions
|
|
||||||
* @see PlatformService.checkNotificationPermissions
|
|
||||||
* @returns null - notifications not supported on web platform
|
|
||||||
*/
|
|
||||||
async checkNotificationPermissions(): Promise<PermissionStatus | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request notification permissions
|
|
||||||
* @see PlatformService.requestNotificationPermissions
|
|
||||||
* @returns null - notifications not supported on web platform
|
|
||||||
*/
|
|
||||||
async requestNotificationPermissions(): Promise<PermissionResult | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Schedule a daily notification
|
|
||||||
* @see PlatformService.scheduleDailyNotification
|
|
||||||
* @throws Error - notifications not supported on web platform
|
|
||||||
*/
|
|
||||||
async scheduleDailyNotification(_options: ScheduleOptions): Promise<void> {
|
|
||||||
throw new Error("Daily notifications are not supported on web platform");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cancel scheduled daily notification
|
|
||||||
* @see PlatformService.cancelDailyNotification
|
|
||||||
* @throws Error - notifications not supported on web platform
|
|
||||||
*/
|
|
||||||
async cancelDailyNotification(): Promise<void> {
|
|
||||||
throw new Error("Daily notifications are not supported on web platform");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Configure native fetcher for background operations
|
|
||||||
* @see PlatformService.configureNativeFetcher
|
|
||||||
* @returns null - native fetcher not supported on web platform
|
|
||||||
*/
|
|
||||||
async configureNativeFetcher(
|
|
||||||
_config: NativeFetcherConfig,
|
|
||||||
): Promise<void | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Update starred plans for background fetcher
|
|
||||||
* @see PlatformService.updateStarredPlans
|
|
||||||
* @returns null - native fetcher not supported on web platform
|
|
||||||
*/
|
|
||||||
async updateStarredPlans(_plans: {
|
|
||||||
planIds: string[];
|
|
||||||
}): Promise<void | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open the app's notification settings in the system settings
|
|
||||||
* @see PlatformService.openAppNotificationSettings
|
|
||||||
* @returns null - not supported on web platform
|
|
||||||
*/
|
|
||||||
async openAppNotificationSettings(): Promise<void | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,6 @@
|
|||||||
<EntityGrid
|
<EntityGrid
|
||||||
entity-type="people"
|
entity-type="people"
|
||||||
:entities="people"
|
:entities="people"
|
||||||
:max-items="5"
|
|
||||||
:active-did="activeDid"
|
:active-did="activeDid"
|
||||||
:all-my-dids="allMyDids"
|
:all-my-dids="allMyDids"
|
||||||
:all-contacts="people"
|
:all-contacts="people"
|
||||||
@@ -39,7 +38,6 @@
|
|||||||
<EntityGrid
|
<EntityGrid
|
||||||
entity-type="projects"
|
entity-type="projects"
|
||||||
:entities="projects"
|
:entities="projects"
|
||||||
:max-items="3"
|
|
||||||
:active-did="activeDid"
|
:active-did="activeDid"
|
||||||
:all-my-dids="allMyDids"
|
:all-my-dids="allMyDids"
|
||||||
:all-contacts="people"
|
:all-contacts="people"
|
||||||
@@ -152,11 +150,8 @@ export default class EntityGridFunctionPropTest extends Vue {
|
|||||||
customPeopleFunction = (
|
customPeopleFunction = (
|
||||||
entities: Contact[],
|
entities: Contact[],
|
||||||
_entityType: string,
|
_entityType: string,
|
||||||
maxItems: number,
|
|
||||||
): Contact[] => {
|
): Contact[] => {
|
||||||
return entities
|
return entities.filter((person) => person.profileImageUrl);
|
||||||
.filter((person) => person.profileImageUrl)
|
|
||||||
.slice(0, maxItems);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -165,7 +160,6 @@ export default class EntityGridFunctionPropTest extends Vue {
|
|||||||
customProjectsFunction = (
|
customProjectsFunction = (
|
||||||
entities: PlanData[],
|
entities: PlanData[],
|
||||||
_entityType: string,
|
_entityType: string,
|
||||||
_maxItems: number,
|
|
||||||
): PlanData[] => {
|
): PlanData[] => {
|
||||||
return entities.sort((a, b) => a.name.localeCompare(b.name)).slice(0, 3);
|
return entities.sort((a, b) => a.name.localeCompare(b.name)).slice(0, 3);
|
||||||
};
|
};
|
||||||
@@ -200,16 +194,16 @@ export default class EntityGridFunctionPropTest extends Vue {
|
|||||||
*/
|
*/
|
||||||
get displayedPeopleCount(): number {
|
get displayedPeopleCount(): number {
|
||||||
if (this.useCustomFunction) {
|
if (this.useCustomFunction) {
|
||||||
return this.customPeopleFunction(this.people, "people", 5).length;
|
return this.customPeopleFunction(this.people, "people").length;
|
||||||
}
|
}
|
||||||
return Math.min(5, this.people.length);
|
return Math.min(10, this.people.length); // Initial batch size for infinite scroll
|
||||||
}
|
}
|
||||||
|
|
||||||
get displayedProjectsCount(): number {
|
get displayedProjectsCount(): number {
|
||||||
if (this.useCustomFunction) {
|
if (this.useCustomFunction) {
|
||||||
return this.customProjectsFunction(this.projects, "projects", 3).length;
|
return this.customProjectsFunction(this.projects, "projects").length;
|
||||||
}
|
}
|
||||||
return Math.min(7, this.projects.length);
|
return Math.min(10, this.projects.length); // Initial batch size for infinite scroll
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -970,6 +970,20 @@ export const PlatformServiceMixin = {
|
|||||||
return this.$normalizeContacts(rawContacts);
|
return this.$normalizeContacts(rawContacts);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Load all contacts sorted by when they were added (by ID)
|
||||||
|
* Always fetches fresh data from database for consistency
|
||||||
|
* Handles JSON string/object duality for contactMethods field
|
||||||
|
* @returns Promise<Contact[]> Array of normalized contact objects sorted by addition date (newest first)
|
||||||
|
*/
|
||||||
|
async $contactsByDateAdded(): Promise<Contact[]> {
|
||||||
|
const rawContacts = (await this.$query(
|
||||||
|
"SELECT * FROM contacts ORDER BY id DESC",
|
||||||
|
)) as ContactMaybeWithJsonStrings[];
|
||||||
|
|
||||||
|
return this.$normalizeContacts(rawContacts);
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ultra-concise shortcut for getting number of contacts
|
* Ultra-concise shortcut for getting number of contacts
|
||||||
* @returns Promise<number> Total number of contacts
|
* @returns Promise<number> Total number of contacts
|
||||||
@@ -1353,6 +1367,9 @@ export const PlatformServiceMixin = {
|
|||||||
contact.profileImageUrl !== undefined
|
contact.profileImageUrl !== undefined
|
||||||
? contact.profileImageUrl
|
? contact.profileImageUrl
|
||||||
: null,
|
: null,
|
||||||
|
notes: contact.notes !== undefined ? contact.notes : null,
|
||||||
|
iViewContent:
|
||||||
|
contact.iViewContent !== undefined ? contact.iViewContent : null,
|
||||||
contactMethods:
|
contactMethods:
|
||||||
contact.contactMethods !== undefined
|
contact.contactMethods !== undefined
|
||||||
? Array.isArray(contact.contactMethods)
|
? Array.isArray(contact.contactMethods)
|
||||||
@@ -1363,8 +1380,8 @@ export const PlatformServiceMixin = {
|
|||||||
|
|
||||||
await this.$dbExec(
|
await this.$dbExec(
|
||||||
`INSERT OR REPLACE INTO contacts
|
`INSERT OR REPLACE INTO contacts
|
||||||
(did, name, publicKeyBase64, seesMe, registered, nextPubKeyHashB64, profileImageUrl, contactMethods)
|
(did, name, publicKeyBase64, seesMe, registered, nextPubKeyHashB64, profileImageUrl, notes, iViewContent, contactMethods)
|
||||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
||||||
[
|
[
|
||||||
safeContact.did,
|
safeContact.did,
|
||||||
safeContact.name,
|
safeContact.name,
|
||||||
@@ -1373,6 +1390,8 @@ export const PlatformServiceMixin = {
|
|||||||
safeContact.registered,
|
safeContact.registered,
|
||||||
safeContact.nextPubKeyHashB64,
|
safeContact.nextPubKeyHashB64,
|
||||||
safeContact.profileImageUrl,
|
safeContact.profileImageUrl,
|
||||||
|
safeContact.notes,
|
||||||
|
safeContact.iViewContent,
|
||||||
safeContact.contactMethods,
|
safeContact.contactMethods,
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
@@ -2057,6 +2076,7 @@ declare module "@vue/runtime-core" {
|
|||||||
|
|
||||||
// Specialized shortcuts - contacts cached, settings fresh
|
// Specialized shortcuts - contacts cached, settings fresh
|
||||||
$contacts(): Promise<Contact[]>;
|
$contacts(): Promise<Contact[]>;
|
||||||
|
$contactsByDateAdded(): Promise<Contact[]>;
|
||||||
$contactCount(): Promise<number>;
|
$contactCount(): Promise<number>;
|
||||||
$settings(defaults?: Settings): Promise<Settings>;
|
$settings(defaults?: Settings): Promise<Settings>;
|
||||||
$accountSettings(did?: string, defaults?: Settings): Promise<Settings>;
|
$accountSettings(did?: string, defaults?: Settings): Promise<Settings>;
|
||||||
|
|||||||
@@ -161,9 +161,6 @@
|
|||||||
</section>
|
</section>
|
||||||
<PushNotificationPermission ref="pushNotificationPermission" />
|
<PushNotificationPermission ref="pushNotificationPermission" />
|
||||||
|
|
||||||
<!-- Daily Notifications (Native) -->
|
|
||||||
<DailyNotificationSection />
|
|
||||||
|
|
||||||
<!-- User Profile -->
|
<!-- User Profile -->
|
||||||
<section
|
<section
|
||||||
v-if="isRegistered"
|
v-if="isRegistered"
|
||||||
@@ -378,45 +375,6 @@
|
|||||||
Switch Identifier
|
Switch Identifier
|
||||||
</router-link>
|
</router-link>
|
||||||
|
|
||||||
<div id="sectionImportContactsSettings" class="mt-4">
|
|
||||||
<h2 class="text-slate-500 text-sm font-bold">Import Contacts</h2>
|
|
||||||
|
|
||||||
<div class="ml-4 mt-2">
|
|
||||||
<input type="file" class="ml-2" @change="uploadImportFile" />
|
|
||||||
<transition
|
|
||||||
enter-active-class="transform ease-out duration-300 transition"
|
|
||||||
enter-from-class="translate-y-2 opacity-0 sm:translate-y-4"
|
|
||||||
enter-to-class="translate-y-0 opacity-100 sm:translate-y-0"
|
|
||||||
leave-active-class="transition ease-in duration-500"
|
|
||||||
leave-from-class="opacity-100"
|
|
||||||
leave-to-class="opacity-0"
|
|
||||||
>
|
|
||||||
<div v-if="showContactImport()" class="mt-4">
|
|
||||||
<!-- Bulk import has an error
|
|
||||||
<div class="flex justify-center">
|
|
||||||
<button
|
|
||||||
class="block text-center text-md bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-6"
|
|
||||||
@click="confirmSubmitImportFile()"
|
|
||||||
>
|
|
||||||
Overwrite Settings & Contacts
|
|
||||||
<br />
|
|
||||||
(which doesn't include Identifier Data)
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
-->
|
|
||||||
<div class="flex justify-center">
|
|
||||||
<button
|
|
||||||
class="block text-center text-md bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-6"
|
|
||||||
@click="checkContactImports()"
|
|
||||||
>
|
|
||||||
Import Contacts
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</transition>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<label
|
<label
|
||||||
for="toggleShowAmounts"
|
for="toggleShowAmounts"
|
||||||
class="flex items-center justify-between cursor-pointer my-4"
|
class="flex items-center justify-between cursor-pointer my-4"
|
||||||
@@ -773,9 +731,7 @@ import "dexie-export-import";
|
|||||||
import { ImportProgress } from "dexie-export-import";
|
import { ImportProgress } from "dexie-export-import";
|
||||||
import { LeafletMouseEvent } from "leaflet";
|
import { LeafletMouseEvent } from "leaflet";
|
||||||
import * as L from "leaflet";
|
import * as L from "leaflet";
|
||||||
import * as R from "ramda";
|
|
||||||
import { IIdentifier } from "@veramo/core";
|
import { IIdentifier } from "@veramo/core";
|
||||||
import { ref } from "vue";
|
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
import { RouteLocationNormalizedLoaded, Router } from "vue-router";
|
import { RouteLocationNormalizedLoaded, Router } from "vue-router";
|
||||||
import { copyToClipboard } from "../services/ClipboardService";
|
import { copyToClipboard } from "../services/ClipboardService";
|
||||||
@@ -793,7 +749,6 @@ import IdentitySection from "@/components/IdentitySection.vue";
|
|||||||
import RegistrationNotice from "@/components/RegistrationNotice.vue";
|
import RegistrationNotice from "@/components/RegistrationNotice.vue";
|
||||||
import LocationSearchSection from "@/components/LocationSearchSection.vue";
|
import LocationSearchSection from "@/components/LocationSearchSection.vue";
|
||||||
import UsageLimitsSection from "@/components/UsageLimitsSection.vue";
|
import UsageLimitsSection from "@/components/UsageLimitsSection.vue";
|
||||||
import DailyNotificationSection from "@/components/notifications/DailyNotificationSection.vue";
|
|
||||||
import {
|
import {
|
||||||
AppString,
|
AppString,
|
||||||
DEFAULT_IMAGE_API_SERVER,
|
DEFAULT_IMAGE_API_SERVER,
|
||||||
@@ -803,7 +758,6 @@ import {
|
|||||||
NotificationIface,
|
NotificationIface,
|
||||||
PASSKEYS_ENABLED,
|
PASSKEYS_ENABLED,
|
||||||
} from "../constants/app";
|
} from "../constants/app";
|
||||||
import { Contact } from "../db/tables/contacts";
|
|
||||||
import {
|
import {
|
||||||
DEFAULT_PASSKEY_EXPIRATION_MINUTES,
|
DEFAULT_PASSKEY_EXPIRATION_MINUTES,
|
||||||
BoundingBox,
|
BoundingBox,
|
||||||
@@ -827,11 +781,7 @@ import { PlatformServiceMixin } from "../utils/PlatformServiceMixin";
|
|||||||
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
||||||
import { ACCOUNT_VIEW_CONSTANTS } from "@/constants/accountView";
|
import { ACCOUNT_VIEW_CONSTANTS } from "@/constants/accountView";
|
||||||
import { showSeedPhraseReminder } from "@/utils/seedPhraseReminder";
|
import { showSeedPhraseReminder } from "@/utils/seedPhraseReminder";
|
||||||
import {
|
import { AccountSettings, isApiError } from "@/interfaces/accountView";
|
||||||
AccountSettings,
|
|
||||||
isApiError,
|
|
||||||
ImportContent,
|
|
||||||
} from "@/interfaces/accountView";
|
|
||||||
// Profile data interface (inlined from ProfileService)
|
// Profile data interface (inlined from ProfileService)
|
||||||
interface ProfileData {
|
interface ProfileData {
|
||||||
description: string;
|
description: string;
|
||||||
@@ -840,8 +790,6 @@ interface ProfileData {
|
|||||||
includeLocation: boolean;
|
includeLocation: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
const inputImportFileNameRef = ref<Blob>();
|
|
||||||
|
|
||||||
interface UserNameDialogRef {
|
interface UserNameDialogRef {
|
||||||
open: (cb: (name?: string) => void) => void;
|
open: (cb: (name?: string) => void) => void;
|
||||||
}
|
}
|
||||||
@@ -862,7 +810,6 @@ interface UserNameDialogRef {
|
|||||||
RegistrationNotice,
|
RegistrationNotice,
|
||||||
LocationSearchSection,
|
LocationSearchSection,
|
||||||
UsageLimitsSection,
|
UsageLimitsSection,
|
||||||
DailyNotificationSection,
|
|
||||||
},
|
},
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
})
|
})
|
||||||
@@ -1374,65 +1321,6 @@ export default class AccountViewView extends Vue {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async uploadImportFile(event: Event): Promise<void> {
|
|
||||||
inputImportFileNameRef.value = (
|
|
||||||
event.target as HTMLInputElement
|
|
||||||
).files?.[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
showContactImport(): boolean {
|
|
||||||
return !!inputImportFileNameRef.value;
|
|
||||||
}
|
|
||||||
|
|
||||||
confirmSubmitImportFile(): void {
|
|
||||||
if (inputImportFileNameRef.value != null) {
|
|
||||||
this.notify.confirm(
|
|
||||||
ACCOUNT_VIEW_CONSTANTS.WARNINGS.IMPORT_REPLACE_WARNING,
|
|
||||||
this.submitImportFile,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Asynchronously imports the database from a downloadable JSON file.
|
|
||||||
*
|
|
||||||
* @throws Will notify the user if there is an export error.
|
|
||||||
*/
|
|
||||||
async submitImportFile(): Promise<void> {
|
|
||||||
if (inputImportFileNameRef.value != null) {
|
|
||||||
// TODO: implement this for SQLite
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async checkContactImports(): Promise<void> {
|
|
||||||
const reader = new FileReader();
|
|
||||||
reader.onload = (event) => {
|
|
||||||
const fileContent: string = (event.target?.result as string) || "{}";
|
|
||||||
try {
|
|
||||||
const contents: ImportContent = JSON.parse(fileContent);
|
|
||||||
const contactTableRows: Array<Contact> = (
|
|
||||||
contents.data?.data as [{ tableName: string; rows: Array<Contact> }]
|
|
||||||
)?.find((table) => table.tableName === "contacts")
|
|
||||||
?.rows as Array<Contact>;
|
|
||||||
const contactRows = contactTableRows.map(
|
|
||||||
// @ts-expect-error for omitting this field that is found in the Dexie format
|
|
||||||
(contact) => R.omit(["$types"], contact) as Contact,
|
|
||||||
);
|
|
||||||
(this.$router as Router).push({
|
|
||||||
name: "contact-import",
|
|
||||||
query: { contacts: JSON.stringify(contactRows) },
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
logger.error("Error checking contact imports:", error);
|
|
||||||
this.notify.error(
|
|
||||||
ACCOUNT_VIEW_CONSTANTS.ERRORS.IMPORT_ERROR,
|
|
||||||
TIMEOUTS.STANDARD,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
reader.readAsText(inputImportFileNameRef.value as Blob);
|
|
||||||
}
|
|
||||||
|
|
||||||
private progressCallback(progress: ImportProgress): boolean {
|
private progressCallback(progress: ImportProgress): boolean {
|
||||||
logger.log(
|
logger.log(
|
||||||
`Import progress: ${progress.completedRows} of ${progress.totalRows} rows completed.`,
|
`Import progress: ${progress.completedRows} of ${progress.totalRows} rows completed.`,
|
||||||
|
|||||||
@@ -338,9 +338,10 @@ export default class ContactEditView extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Save to database via PlatformServiceMixin
|
// Save to database via PlatformServiceMixin
|
||||||
|
// Normalize empty strings to null to preserve database consistency
|
||||||
await this.$updateContact(this.contact?.did || "", {
|
await this.$updateContact(this.contact?.did || "", {
|
||||||
name: this.contactName,
|
name: this.contactName?.trim() || null,
|
||||||
notes: this.contactNotes,
|
notes: this.contactNotes?.trim() || null,
|
||||||
contactMethods: contactMethods,
|
contactMethods: contactMethods,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -20,12 +20,12 @@
|
|||||||
</button>
|
</button>
|
||||||
|
|
||||||
<!-- Help button -->
|
<!-- Help button -->
|
||||||
<button
|
<router-link
|
||||||
|
:to="{ name: 'help' }"
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
||||||
@click="goToHelp()"
|
|
||||||
>
|
>
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
<font-awesome icon="question" class="block text-center w-[1em]" />
|
||||||
</button>
|
</router-link>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Identity Details -->
|
<!-- Identity Details -->
|
||||||
|
|||||||
@@ -898,7 +898,13 @@ export default class HomeView extends Vue {
|
|||||||
this.starredPlanHandleIds,
|
this.starredPlanHandleIds,
|
||||||
this.lastAckedStarredPlanChangesJwtId,
|
this.lastAckedStarredPlanChangesJwtId,
|
||||||
);
|
);
|
||||||
this.numNewStarredProjectChanges = starredProjectChanges.data.length;
|
// filter out any data elements where there is no wrappedClaimBefore
|
||||||
|
const filteredNewStarredProjectChanges =
|
||||||
|
starredProjectChanges.data.filter(
|
||||||
|
(change) => change.wrappedClaimBefore !== undefined,
|
||||||
|
);
|
||||||
|
this.numNewStarredProjectChanges =
|
||||||
|
filteredNewStarredProjectChanges.length;
|
||||||
this.newStarredProjectChangesHitLimit = starredProjectChanges.hitLimit;
|
this.newStarredProjectChangesHitLimit = starredProjectChanges.hitLimit;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Don't show errors for starred project changes as it's a secondary feature
|
// Don't show errors for starred project changes as it's a secondary feature
|
||||||
|
|||||||
@@ -284,7 +284,10 @@
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-else>The changes did not affect essential project data.</div>
|
<div v-else>
|
||||||
|
The changes are not important, like it was saved by accident or
|
||||||
|
you've seen it all before.
|
||||||
|
</div>
|
||||||
<!-- New line that appears on hover -->
|
<!-- New line that appears on hover -->
|
||||||
<div
|
<div
|
||||||
class="absolute left-0 w-full text-left text-gray-500 text-sm hidden group-hover:flex cursor-pointer items-center"
|
class="absolute left-0 w-full text-left text-gray-500 text-sm hidden group-hover:flex cursor-pointer items-center"
|
||||||
@@ -589,13 +592,13 @@ export default class NewActivityView extends Vue {
|
|||||||
|
|
||||||
for (const planChange of planChanges) {
|
for (const planChange of planChanges) {
|
||||||
const currentPlan: PlanSummaryRecord = planChange.plan;
|
const currentPlan: PlanSummaryRecord = planChange.plan;
|
||||||
const wrappedClaim: GenericCredWrapper<PlanActionClaim> =
|
const wrappedClaim: GenericCredWrapper<PlanActionClaim> | undefined =
|
||||||
planChange.wrappedClaimBefore;
|
planChange.wrappedClaimBefore;
|
||||||
|
|
||||||
// Extract the actual claim from the wrapped claim
|
// Extract the actual claim from the wrapped claim
|
||||||
let previousClaim: PlanActionClaim;
|
let previousClaim: PlanActionClaim | undefined;
|
||||||
|
|
||||||
const embeddedClaim: PlanActionClaim = wrappedClaim.claim;
|
const embeddedClaim: PlanActionClaim | undefined = wrappedClaim?.claim;
|
||||||
if (
|
if (
|
||||||
embeddedClaim &&
|
embeddedClaim &&
|
||||||
typeof embeddedClaim === "object" &&
|
typeof embeddedClaim === "object" &&
|
||||||
@@ -609,7 +612,9 @@ export default class NewActivityView extends Vue {
|
|||||||
previousClaim = embeddedClaim;
|
previousClaim = embeddedClaim;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!previousClaim || !currentPlan.handleId) {
|
if (!previousClaim) {
|
||||||
|
// Can happen when a project is starred after the stored last-seen-change-jwt ID
|
||||||
|
// so we'll just leave the message saying there are no important differences.
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -60,12 +60,60 @@
|
|||||||
</div>
|
</div>
|
||||||
<ImageMethodDialog ref="imageDialog" default-camera-mode="environment" />
|
<ImageMethodDialog ref="imageDialog" default-camera-mode="environment" />
|
||||||
|
|
||||||
<input
|
<!-- Authorized Representative Selection -->
|
||||||
v-model="agentDid"
|
<div class="w-full flex items-stretch my-4">
|
||||||
type="text"
|
<div
|
||||||
placeholder="Other Authorized Representative"
|
class="flex items-center gap-2 grow border border-slate-400 border-r-0 last:border-r px-3 py-2 rounded-l last:rounded overflow-hidden cursor-pointer hover:bg-slate-100"
|
||||||
class="mt-4 block w-full rounded border border-slate-400 px-3 py-2"
|
@click="openRepresentativeDialog"
|
||||||
|
>
|
||||||
|
<div>
|
||||||
|
<EntityIcon
|
||||||
|
v-if="selectedRepresentative"
|
||||||
|
:contact="selectedRepresentative"
|
||||||
|
class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
|
||||||
|
/>
|
||||||
|
<font-awesome v-else icon="user" class="text-slate-400" />
|
||||||
|
</div>
|
||||||
|
<div class="overflow-hidden">
|
||||||
|
<div
|
||||||
|
:class="{
|
||||||
|
'text-sm font-semibold': selectedRepresentative,
|
||||||
|
'text-slate-400': !selectedRepresentative,
|
||||||
|
}"
|
||||||
|
class="truncate"
|
||||||
|
>
|
||||||
|
{{
|
||||||
|
selectedRepresentative
|
||||||
|
? selectedRepresentative.name || AppString.NO_CONTACT_NAME
|
||||||
|
: "Assign Authorized Representative…"
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
v-if="selectedRepresentative"
|
||||||
|
class="text-xs text-slate-500 truncate"
|
||||||
|
>
|
||||||
|
{{ agentDid }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
v-if="selectedRepresentative"
|
||||||
|
class="text-rose-600 px-3 py-2 border border-slate-400 border-l-0 rounded-r hover:bg-rose-600 hover:text-white hover:border-rose-600"
|
||||||
|
@click="unsetRepresentative"
|
||||||
|
>
|
||||||
|
<font-awesome icon="trash-can" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<ProjectRepresentativeDialog
|
||||||
|
ref="representativeDialog"
|
||||||
|
:all-contacts="allContacts"
|
||||||
|
:active-did="activeDid"
|
||||||
|
:all-my-dids="allMyDids"
|
||||||
|
:notify="$notify"
|
||||||
|
@assign="handleRepresentativeAssigned"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<div class="mb-4">
|
<div class="mb-4">
|
||||||
<p v-if="shouldShowOwnershipWarning">
|
<p v-if="shouldShowOwnershipWarning">
|
||||||
<span class="text-red-500">Beware!</span>
|
<span class="text-red-500">Beware!</span>
|
||||||
@@ -232,9 +280,12 @@ import { LMap, LMarker, LTileLayer } from "@vue-leaflet/vue-leaflet";
|
|||||||
import { RouteLocationNormalizedLoaded, Router } from "vue-router";
|
import { RouteLocationNormalizedLoaded, Router } from "vue-router";
|
||||||
import { LeafletMouseEvent } from "leaflet";
|
import { LeafletMouseEvent } from "leaflet";
|
||||||
|
|
||||||
|
import EntityIcon from "../components/EntityIcon.vue";
|
||||||
import ImageMethodDialog from "../components/ImageMethodDialog.vue";
|
import ImageMethodDialog from "../components/ImageMethodDialog.vue";
|
||||||
|
import ProjectRepresentativeDialog from "../components/ProjectRepresentativeDialog.vue";
|
||||||
import QuickNav from "../components/QuickNav.vue";
|
import QuickNav from "../components/QuickNav.vue";
|
||||||
import {
|
import {
|
||||||
|
AppString,
|
||||||
DEFAULT_IMAGE_API_SERVER,
|
DEFAULT_IMAGE_API_SERVER,
|
||||||
DEFAULT_PARTNER_API_SERVER,
|
DEFAULT_PARTNER_API_SERVER,
|
||||||
NotificationIface,
|
NotificationIface,
|
||||||
@@ -268,6 +319,7 @@ import {
|
|||||||
retrieveAccountCount,
|
retrieveAccountCount,
|
||||||
retrieveFullyDecryptedAccount,
|
retrieveFullyDecryptedAccount,
|
||||||
} from "../libs/util";
|
} from "../libs/util";
|
||||||
|
import { Contact } from "../db/tables/contacts";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
EventTemplate,
|
EventTemplate,
|
||||||
@@ -323,7 +375,15 @@ import { logger } from "../utils/logger";
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: { ImageMethodDialog, LMap, LMarker, LTileLayer, QuickNav },
|
components: {
|
||||||
|
EntityIcon,
|
||||||
|
ImageMethodDialog,
|
||||||
|
ProjectRepresentativeDialog,
|
||||||
|
LMap,
|
||||||
|
LMarker,
|
||||||
|
LTileLayer,
|
||||||
|
QuickNav,
|
||||||
|
},
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
})
|
})
|
||||||
export default class NewEditProjectView extends Vue {
|
export default class NewEditProjectView extends Vue {
|
||||||
@@ -334,6 +394,9 @@ export default class NewEditProjectView extends Vue {
|
|||||||
// Notification helpers
|
// Notification helpers
|
||||||
private notify!: ReturnType<typeof createNotifyHelpers>;
|
private notify!: ReturnType<typeof createNotifyHelpers>;
|
||||||
|
|
||||||
|
// Constants
|
||||||
|
AppString = AppString;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Display error notification to user
|
* Display error notification to user
|
||||||
* Provides consistent error messaging with 5-second timeout
|
* Provides consistent error messaging with 5-second timeout
|
||||||
@@ -346,6 +409,8 @@ export default class NewEditProjectView extends Vue {
|
|||||||
// Component state properties
|
// Component state properties
|
||||||
activeDid = "";
|
activeDid = "";
|
||||||
agentDid = "";
|
agentDid = "";
|
||||||
|
allContacts: Array<Contact> = [];
|
||||||
|
allMyDids: string[] = [];
|
||||||
apiServer = "";
|
apiServer = "";
|
||||||
endDateInput?: string;
|
endDateInput?: string;
|
||||||
endTimeInput?: string;
|
endTimeInput?: string;
|
||||||
@@ -392,16 +457,24 @@ export default class NewEditProjectView extends Vue {
|
|||||||
const activeIdentity = await (this as any).$getActiveIdentity();
|
const activeIdentity = await (this as any).$getActiveIdentity();
|
||||||
this.activeDid = activeIdentity.activeDid || "";
|
this.activeDid = activeIdentity.activeDid || "";
|
||||||
|
|
||||||
|
// Get all user's DIDs
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
this.allMyDids = await (this as any).$getAllAccountDids();
|
||||||
|
|
||||||
|
// Load contacts sorted by date added (newest first) for consistent "Recently Added" display
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
this.allContacts = await (this as any).$contactsByDateAdded();
|
||||||
|
|
||||||
this.apiServer = settings.apiServer || "";
|
this.apiServer = settings.apiServer || "";
|
||||||
this.showGeneralAdvanced = !!settings.showGeneralAdvanced;
|
this.showGeneralAdvanced = !!settings.showGeneralAdvanced;
|
||||||
|
|
||||||
this.projectId = (this.$route.query["projectId"] as string) || "";
|
this.projectId = (this.$route.query["projectId"] as string) || "";
|
||||||
|
|
||||||
if (this.projectId) {
|
if (this.isSavedProject()) {
|
||||||
if (this.numAccounts === 0) {
|
if (this.numAccounts === 0) {
|
||||||
this.notify.error(NOTIFY_PROJECT_ACCOUNT_LOADING_ERROR.message);
|
this.notify.error(NOTIFY_PROJECT_ACCOUNT_LOADING_ERROR.message);
|
||||||
} else {
|
} else {
|
||||||
this.loadProject(this.activeDid);
|
this.loadProject(this.activeDid, this.projectId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -411,11 +484,9 @@ export default class NewEditProjectView extends Vue {
|
|||||||
* Retrieves project information from the API and populates form fields
|
* Retrieves project information from the API and populates form fields
|
||||||
* @param userDid - User's decentralized identifier
|
* @param userDid - User's decentralized identifier
|
||||||
*/
|
*/
|
||||||
async loadProject(userDid: string) {
|
async loadProject(userDid: string, projectId: string) {
|
||||||
const url =
|
const url =
|
||||||
this.apiServer +
|
this.apiServer + "/api/claim/byHandle/" + encodeURIComponent(projectId);
|
||||||
"/api/claim/byHandle/" +
|
|
||||||
encodeURIComponent(this.projectId);
|
|
||||||
const headers = await getHeaders(userDid);
|
const headers = await getHeaders(userDid);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -432,6 +503,12 @@ export default class NewEditProjectView extends Vue {
|
|||||||
}
|
}
|
||||||
if (this.fullClaim?.agent?.identifier) {
|
if (this.fullClaim?.agent?.identifier) {
|
||||||
this.agentDid = this.fullClaim.agent.identifier;
|
this.agentDid = this.fullClaim.agent.identifier;
|
||||||
|
if (this.activeDid !== this.projectIssuerDid) {
|
||||||
|
this.agentDid = this.projectIssuerDid;
|
||||||
|
this.notify.warning(
|
||||||
|
"You were previously the agent, so the agent has been set to the previous owner. You can change it.",
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (this.fullClaim.startTime) {
|
if (this.fullClaim.startTime) {
|
||||||
const localDateTime = DateTime.fromISO(
|
const localDateTime = DateTime.fromISO(
|
||||||
@@ -536,7 +613,7 @@ export default class NewEditProjectView extends Vue {
|
|||||||
private async saveProject() {
|
private async saveProject() {
|
||||||
// Make a claim
|
// Make a claim
|
||||||
const vcClaim: PlanActionClaim = this.fullClaim;
|
const vcClaim: PlanActionClaim = this.fullClaim;
|
||||||
if (this.projectId) {
|
if (this.isSavedProject()) {
|
||||||
vcClaim.lastClaimId = this.lastClaimJwtId;
|
vcClaim.lastClaimId = this.lastClaimJwtId;
|
||||||
}
|
}
|
||||||
if (this.agentDid) {
|
if (this.agentDid) {
|
||||||
@@ -870,6 +947,10 @@ export default class NewEditProjectView extends Vue {
|
|||||||
this.longitude = event.latlng.lng;
|
this.longitude = event.latlng.lng;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private isSavedProject(): boolean {
|
||||||
|
return !!this.projectId;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed property for character count display
|
* Computed property for character count display
|
||||||
* Shows current description length and maximum character limit
|
* Shows current description length and maximum character limit
|
||||||
@@ -885,6 +966,7 @@ export default class NewEditProjectView extends Vue {
|
|||||||
*/
|
*/
|
||||||
get shouldShowOwnershipWarning(): boolean {
|
get shouldShowOwnershipWarning(): boolean {
|
||||||
return (
|
return (
|
||||||
|
this.isSavedProject() &&
|
||||||
this.activeDid !== this.projectIssuerDid &&
|
this.activeDid !== this.projectIssuerDid &&
|
||||||
this.agentDid !== this.projectIssuerDid
|
this.agentDid !== this.projectIssuerDid
|
||||||
);
|
);
|
||||||
@@ -961,5 +1043,37 @@ export default class NewEditProjectView extends Vue {
|
|||||||
get shouldShowSpinner(): boolean {
|
get shouldShowSpinner(): boolean {
|
||||||
return !this.isHiddenSpinner;
|
return !this.isHiddenSpinner;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Computed property for selected representative contact
|
||||||
|
* Derives the contact from agentDid by finding it in allContacts
|
||||||
|
*/
|
||||||
|
get selectedRepresentative(): Contact | null {
|
||||||
|
if (!this.agentDid) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return this.allContacts.find((c) => c.did === this.agentDid) || null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Open the representative selection dialog
|
||||||
|
*/
|
||||||
|
openRepresentativeDialog(): void {
|
||||||
|
(this.$refs.representativeDialog as ProjectRepresentativeDialog).open();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle representative assignment from dialog
|
||||||
|
*/
|
||||||
|
handleRepresentativeAssigned(contact: Contact): void {
|
||||||
|
this.agentDid = contact.did;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unset the representative and revert to initial state
|
||||||
|
*/
|
||||||
|
unsetRepresentative(): void {
|
||||||
|
this.agentDid = "";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -186,16 +186,59 @@
|
|||||||
<div>
|
<div>
|
||||||
<label
|
<label
|
||||||
for="projectLink"
|
for="projectLink"
|
||||||
class="block text-sm font-medium text-gray-700"
|
class="block text-sm font-medium text-gray-700 mb-1"
|
||||||
>Project Link</label
|
>Project Link</label
|
||||||
>
|
>
|
||||||
<input
|
<div class="w-full flex items-stretch">
|
||||||
id="projectLink"
|
<div
|
||||||
v-model="newOrUpdatedMeetingInputs.projectLink"
|
class="flex items-center gap-2 grow border border-slate-400 border-r-0 last:border-r px-3 py-2 rounded-l last:rounded overflow-hidden cursor-pointer hover:bg-slate-100"
|
||||||
type="text"
|
@click="openProjectLinkDialog"
|
||||||
class="mt-1 block w-full rounded-md border border-gray-300 px-3 py-2 shadow-sm focus:border-blue-500 focus:outline-none"
|
>
|
||||||
placeholder="Project ID"
|
<div>
|
||||||
/>
|
<ProjectIcon
|
||||||
|
v-if="selectedProject"
|
||||||
|
:entity-id="selectedProject.handleId"
|
||||||
|
:icon-size="30"
|
||||||
|
:image-url="selectedProject.image"
|
||||||
|
class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
|
||||||
|
/>
|
||||||
|
<font-awesome
|
||||||
|
v-else
|
||||||
|
icon="folder-open"
|
||||||
|
class="text-slate-400"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="overflow-hidden">
|
||||||
|
<div
|
||||||
|
:class="{
|
||||||
|
'text-sm font-semibold': selectedProject,
|
||||||
|
'text-slate-400': !selectedProject,
|
||||||
|
}"
|
||||||
|
class="truncate"
|
||||||
|
>
|
||||||
|
{{
|
||||||
|
selectedProject
|
||||||
|
? selectedProject.name || "Unnamed Project"
|
||||||
|
: "Select Project…"
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
v-if="selectedProject"
|
||||||
|
class="text-xs text-slate-500 truncate"
|
||||||
|
>
|
||||||
|
<font-awesome icon="user" class="text-slate-400" />
|
||||||
|
{{ selectedProjectIssuerName }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
v-if="selectedProject"
|
||||||
|
class="text-rose-600 px-3 py-2 border border-slate-400 border-l-0 rounded-r hover:bg-rose-600 hover:text-white hover:border-rose-600"
|
||||||
|
@click="unsetProjectLink"
|
||||||
|
>
|
||||||
|
<font-awesome icon="trash-can" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
@@ -224,6 +267,17 @@
|
|||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<MeetingProjectDialog
|
||||||
|
ref="meetingProjectDialog"
|
||||||
|
:active-did="activeDid"
|
||||||
|
:all-my-dids="allMyDids"
|
||||||
|
:all-contacts="allContacts"
|
||||||
|
:notify="$notify"
|
||||||
|
@assign="handleProjectLinkAssigned"
|
||||||
|
@open="handleDialogOpen"
|
||||||
|
@close="handleDialogClose"
|
||||||
|
/>
|
||||||
|
|
||||||
<!-- Members Section -->
|
<!-- Members Section -->
|
||||||
<div
|
<div
|
||||||
v-if="!isLoading && currentMeeting != null && !!currentMeeting.password"
|
v-if="!isLoading && currentMeeting != null && !!currentMeeting.password"
|
||||||
@@ -254,6 +308,7 @@
|
|||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<MembersList
|
<MembersList
|
||||||
|
ref="membersList"
|
||||||
:password="currentMeeting.password || ''"
|
:password="currentMeeting.password || ''"
|
||||||
:show-organizer-tools="true"
|
:show-organizer-tools="true"
|
||||||
class="mt-4"
|
class="mt-4"
|
||||||
@@ -292,10 +347,13 @@ import { RouteLocationNormalizedLoaded, Router } from "vue-router";
|
|||||||
import QuickNav from "../components/QuickNav.vue";
|
import QuickNav from "../components/QuickNav.vue";
|
||||||
import TopMessage from "../components/TopMessage.vue";
|
import TopMessage from "../components/TopMessage.vue";
|
||||||
import MembersList from "../components/MembersList.vue";
|
import MembersList from "../components/MembersList.vue";
|
||||||
|
import MeetingProjectDialog from "../components/MeetingProjectDialog.vue";
|
||||||
|
import ProjectIcon from "../components/ProjectIcon.vue";
|
||||||
import {
|
import {
|
||||||
errorStringForLog,
|
errorStringForLog,
|
||||||
getHeaders,
|
getHeaders,
|
||||||
serverMessageForUser,
|
serverMessageForUser,
|
||||||
|
didInfo,
|
||||||
} from "../libs/endorserServer";
|
} from "../libs/endorserServer";
|
||||||
import { encryptMessage } from "../libs/crypto";
|
import { encryptMessage } from "../libs/crypto";
|
||||||
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
||||||
@@ -309,6 +367,8 @@ import {
|
|||||||
NOTIFY_MEETING_DELETED,
|
NOTIFY_MEETING_DELETED,
|
||||||
NOTIFY_MEETING_LINK_COPIED,
|
NOTIFY_MEETING_LINK_COPIED,
|
||||||
} from "@/constants/notifications";
|
} from "@/constants/notifications";
|
||||||
|
import { PlanData } from "../interfaces/records";
|
||||||
|
import { Contact } from "../db/tables/contacts";
|
||||||
interface ServerMeeting {
|
interface ServerMeeting {
|
||||||
groupId: number; // from the server
|
groupId: number; // from the server
|
||||||
name: string; // to & from the server
|
name: string; // to & from the server
|
||||||
@@ -331,6 +391,8 @@ interface MeetingSetupInputs {
|
|||||||
QuickNav,
|
QuickNav,
|
||||||
TopMessage,
|
TopMessage,
|
||||||
MembersList,
|
MembersList,
|
||||||
|
MeetingProjectDialog,
|
||||||
|
ProjectIcon,
|
||||||
},
|
},
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
})
|
})
|
||||||
@@ -354,6 +416,9 @@ export default class OnboardMeetingView extends Vue {
|
|||||||
isRegistered = false;
|
isRegistered = false;
|
||||||
showDeleteConfirm = false;
|
showDeleteConfirm = false;
|
||||||
fullName = "";
|
fullName = "";
|
||||||
|
allContacts: Contact[] = [];
|
||||||
|
allMyDids: string[] = [];
|
||||||
|
selectedProjectData: PlanData | null = null;
|
||||||
get minDateTime() {
|
get minDateTime() {
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
now.setMinutes(now.getMinutes() + 5); // Set minimum 5 minutes in the future
|
now.setMinutes(now.getMinutes() + 5); // Set minimum 5 minutes in the future
|
||||||
@@ -370,7 +435,17 @@ export default class OnboardMeetingView extends Vue {
|
|||||||
this.fullName = settings?.firstName || "";
|
this.fullName = settings?.firstName || "";
|
||||||
this.isRegistered = !!settings?.isRegistered;
|
this.isRegistered = !!settings?.isRegistered;
|
||||||
|
|
||||||
|
// Load contacts and DIDs for dialog
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
this.allContacts = await (this as any).$contactsByDateAdded();
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
this.allMyDids = await (this as any).$getAllAccountDids();
|
||||||
|
|
||||||
await this.fetchCurrentMeeting();
|
await this.fetchCurrentMeeting();
|
||||||
|
|
||||||
|
// Ensure selected project is loaded if projectLink exists
|
||||||
|
await this.ensureSelectedProjectLoaded();
|
||||||
|
|
||||||
this.isLoading = false;
|
this.isLoading = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -442,6 +517,54 @@ export default class OnboardMeetingView extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ensure the selected project is loaded if projectLink exists
|
||||||
|
*/
|
||||||
|
async ensureSelectedProjectLoaded(): Promise<void> {
|
||||||
|
const projectLink =
|
||||||
|
this.currentMeeting?.projectLink ||
|
||||||
|
this.newOrUpdatedMeetingInputs?.projectLink;
|
||||||
|
|
||||||
|
if (!projectLink) {
|
||||||
|
this.selectedProjectData = null;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.fetchProjectByHandleId(projectLink);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fetch a single project by handleId
|
||||||
|
* @param handleId - The project handleId to fetch
|
||||||
|
*/
|
||||||
|
async fetchProjectByHandleId(handleId: string): Promise<void> {
|
||||||
|
try {
|
||||||
|
const headers = await getHeaders(this.activeDid);
|
||||||
|
const url = `${this.apiServer}/api/v2/report/plans?handleId=${encodeURIComponent(handleId)}`;
|
||||||
|
const resp = await this.axios.get(url, { headers });
|
||||||
|
|
||||||
|
if (resp.status === 200 && resp.data.data && resp.data.data.length > 0) {
|
||||||
|
const project = resp.data.data[0];
|
||||||
|
this.selectedProjectData = {
|
||||||
|
name: project.name,
|
||||||
|
description: project.description,
|
||||||
|
image: project.image,
|
||||||
|
handleId: project.handleId,
|
||||||
|
issuerDid: project.issuerDid,
|
||||||
|
rowId: project.rowId,
|
||||||
|
};
|
||||||
|
} else {
|
||||||
|
this.selectedProjectData = null;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
this.$logAndConsole(
|
||||||
|
"Error fetching project by handleId: " + errorStringForLog(error),
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
this.selectedProjectData = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async createMeeting() {
|
async createMeeting() {
|
||||||
this.isLoading = true;
|
this.isLoading = true;
|
||||||
|
|
||||||
@@ -576,7 +699,7 @@ export default class OnboardMeetingView extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
startEditing() {
|
async startEditing() {
|
||||||
// Populate form with existing meeting data
|
// Populate form with existing meeting data
|
||||||
if (this.currentMeeting) {
|
if (this.currentMeeting) {
|
||||||
const localExpiresAt = new Date(this.currentMeeting.expiresAt);
|
const localExpiresAt = new Date(this.currentMeeting.expiresAt);
|
||||||
@@ -587,6 +710,10 @@ export default class OnboardMeetingView extends Vue {
|
|||||||
password: this.currentMeeting.password || "",
|
password: this.currentMeeting.password || "",
|
||||||
projectLink: this.currentMeeting.projectLink || "",
|
projectLink: this.currentMeeting.projectLink || "",
|
||||||
};
|
};
|
||||||
|
// Ensure selected project is loaded if projectLink exists
|
||||||
|
if (this.currentMeeting.projectLink) {
|
||||||
|
await this.ensureSelectedProjectLoaded();
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
this.$logError(
|
this.$logError(
|
||||||
"There is no current meeting to edit. We should never get here.",
|
"There is no current meeting to edit. We should never get here.",
|
||||||
@@ -594,9 +721,15 @@ export default class OnboardMeetingView extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
cancelEditing() {
|
async cancelEditing() {
|
||||||
// Reset form data
|
// Reset form data
|
||||||
this.newOrUpdatedMeetingInputs = null;
|
this.newOrUpdatedMeetingInputs = null;
|
||||||
|
// Restore selected project from currentMeeting if it exists
|
||||||
|
if (this.currentMeeting?.projectLink) {
|
||||||
|
await this.ensureSelectedProjectLoaded();
|
||||||
|
} else {
|
||||||
|
this.selectedProjectData = null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async updateMeeting() {
|
async updateMeeting() {
|
||||||
@@ -710,5 +843,78 @@ export default class OnboardMeetingView extends Vue {
|
|||||||
this.notify.error("Failed to copy meeting link to clipboard.");
|
this.notify.error("Failed to copy meeting link to clipboard.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Computed property for selected project
|
||||||
|
* Returns the separately stored selected project data
|
||||||
|
*/
|
||||||
|
get selectedProject(): PlanData | null {
|
||||||
|
return this.selectedProjectData;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Computed property for selected project issuer display name
|
||||||
|
* Uses didInfo to format the issuer name similar to ProjectCard
|
||||||
|
*/
|
||||||
|
get selectedProjectIssuerName(): string {
|
||||||
|
if (!this.selectedProject) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
return didInfo(
|
||||||
|
this.selectedProject.issuerDid,
|
||||||
|
this.activeDid,
|
||||||
|
this.allMyDids,
|
||||||
|
this.allContacts,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Open the project link selection dialog
|
||||||
|
*/
|
||||||
|
openProjectLinkDialog(): void {
|
||||||
|
(this.$refs.meetingProjectDialog as MeetingProjectDialog).open();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle project assignment from dialog
|
||||||
|
*/
|
||||||
|
handleProjectLinkAssigned(project: PlanData): void {
|
||||||
|
// Store the selected project directly
|
||||||
|
this.selectedProjectData = project;
|
||||||
|
|
||||||
|
if (this.newOrUpdatedMeetingInputs) {
|
||||||
|
this.newOrUpdatedMeetingInputs.projectLink = project.handleId;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Unset the project link and revert to initial state
|
||||||
|
*/
|
||||||
|
unsetProjectLink(): void {
|
||||||
|
this.selectedProjectData = null;
|
||||||
|
if (this.newOrUpdatedMeetingInputs) {
|
||||||
|
this.newOrUpdatedMeetingInputs.projectLink = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle dialog open event - stop auto-refresh in MembersList
|
||||||
|
*/
|
||||||
|
handleDialogOpen(): void {
|
||||||
|
const membersList = this.$refs.membersList as MembersList;
|
||||||
|
if (membersList) {
|
||||||
|
membersList.stopAutoRefresh();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Handle dialog close event - start auto-refresh in MembersList
|
||||||
|
*/
|
||||||
|
handleDialogClose(): void {
|
||||||
|
const membersList = this.$refs.membersList as MembersList;
|
||||||
|
if (membersList) {
|
||||||
|
membersList.startAutoRefresh();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -57,6 +57,9 @@
|
|||||||
<button :class="sqlLinkClasses" @click="setAccountsQuery">
|
<button :class="sqlLinkClasses" @click="setAccountsQuery">
|
||||||
Accounts
|
Accounts
|
||||||
</button>
|
</button>
|
||||||
|
<button :class="sqlLinkClasses" @click="setActiveIdentityQuery">
|
||||||
|
Active DID
|
||||||
|
</button>
|
||||||
<button :class="sqlLinkClasses" @click="setContactsQuery">
|
<button :class="sqlLinkClasses" @click="setContactsQuery">
|
||||||
Contacts
|
Contacts
|
||||||
</button>
|
</button>
|
||||||
@@ -525,6 +528,11 @@ export default class Help extends Vue {
|
|||||||
this.executeSql();
|
this.executeSql();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setActiveIdentityQuery() {
|
||||||
|
this.sqlQuery = "SELECT * FROM active_identity;";
|
||||||
|
this.executeSql();
|
||||||
|
}
|
||||||
|
|
||||||
setContactsQuery() {
|
setContactsQuery() {
|
||||||
this.sqlQuery = "SELECT * FROM contacts;";
|
this.sqlQuery = "SELECT * FROM contacts;";
|
||||||
this.executeSql();
|
this.executeSql();
|
||||||
|
|||||||
@@ -1,23 +1,4 @@
|
|||||||
import { defineConfig } from "vite";
|
import { defineConfig } from "vite";
|
||||||
import { createBuildConfig } from "./vite.config.common.mts";
|
import { createBuildConfig } from "./vite.config.common.mts";
|
||||||
|
|
||||||
export default defineConfig(async () => {
|
export default defineConfig(async () => createBuildConfig('capacitor'));
|
||||||
const baseConfig = await createBuildConfig('capacitor');
|
|
||||||
|
|
||||||
return {
|
|
||||||
...baseConfig,
|
|
||||||
build: {
|
|
||||||
...baseConfig.build,
|
|
||||||
rollupOptions: {
|
|
||||||
...baseConfig.build?.rollupOptions,
|
|
||||||
// Externalize Capacitor plugins that are bundled natively
|
|
||||||
external: [
|
|
||||||
"@timesafari/daily-notification-plugin"
|
|
||||||
],
|
|
||||||
output: {
|
|
||||||
...baseConfig.build?.rollupOptions?.output,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
});
|
|
||||||
Reference in New Issue
Block a user