Compare commits
1 Commits
star-proje
...
remove-can
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eca6dfe9d7 |
91
package-lock.json
generated
91
package-lock.json
generated
@@ -27,7 +27,6 @@
|
|||||||
"@ethersproject/hdnode": "^5.7.0",
|
"@ethersproject/hdnode": "^5.7.0",
|
||||||
"@ethersproject/wallet": "^5.8.0",
|
"@ethersproject/wallet": "^5.8.0",
|
||||||
"@fortawesome/fontawesome-svg-core": "^6.5.1",
|
"@fortawesome/fontawesome-svg-core": "^6.5.1",
|
||||||
"@fortawesome/free-regular-svg-icons": "^6.7.2",
|
|
||||||
"@fortawesome/free-solid-svg-icons": "^6.5.1",
|
"@fortawesome/free-solid-svg-icons": "^6.5.1",
|
||||||
"@fortawesome/vue-fontawesome": "^3.0.6",
|
"@fortawesome/vue-fontawesome": "^3.0.6",
|
||||||
"@jlongster/sql.js": "^1.6.7",
|
"@jlongster/sql.js": "^1.6.7",
|
||||||
@@ -91,7 +90,6 @@
|
|||||||
"vue": "3.5.13",
|
"vue": "3.5.13",
|
||||||
"vue-axios": "^3.5.2",
|
"vue-axios": "^3.5.2",
|
||||||
"vue-facing-decorator": "3.0.4",
|
"vue-facing-decorator": "3.0.4",
|
||||||
"vue-markdown-render": "^2.2.1",
|
|
||||||
"vue-picture-cropper": "^0.7.0",
|
"vue-picture-cropper": "^0.7.0",
|
||||||
"vue-qrcode-reader": "^5.5.3",
|
"vue-qrcode-reader": "^5.5.3",
|
||||||
"vue-router": "^4.5.0",
|
"vue-router": "^4.5.0",
|
||||||
@@ -108,7 +106,6 @@
|
|||||||
"@types/js-yaml": "^4.0.9",
|
"@types/js-yaml": "^4.0.9",
|
||||||
"@types/leaflet": "^1.9.8",
|
"@types/leaflet": "^1.9.8",
|
||||||
"@types/luxon": "^3.4.2",
|
"@types/luxon": "^3.4.2",
|
||||||
"@types/markdown-it": "^14.1.2",
|
|
||||||
"@types/node": "^20.14.11",
|
"@types/node": "^20.14.11",
|
||||||
"@types/node-fetch": "^2.6.12",
|
"@types/node-fetch": "^2.6.12",
|
||||||
"@types/ramda": "^0.29.11",
|
"@types/ramda": "^0.29.11",
|
||||||
@@ -6789,17 +6786,6 @@
|
|||||||
"node": ">=6"
|
"node": ">=6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@fortawesome/free-regular-svg-icons": {
|
|
||||||
"version": "6.7.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.7.2.tgz",
|
|
||||||
"integrity": "sha512-7Z/ur0gvCMW8G93dXIQOkQqHo2M5HLhYrRVC0//fakJXxcF1VmMPsxnG6Ee8qEylA8b8Q3peQXWMNZ62lYF28g==",
|
|
||||||
"dependencies": {
|
|
||||||
"@fortawesome/fontawesome-common-types": "6.7.2"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=6"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@fortawesome/free-solid-svg-icons": {
|
"node_modules/@fortawesome/free-solid-svg-icons": {
|
||||||
"version": "6.7.2",
|
"version": "6.7.2",
|
||||||
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.7.2.tgz",
|
"resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.7.2.tgz",
|
||||||
@@ -10161,12 +10147,6 @@
|
|||||||
"@types/geojson": "*"
|
"@types/geojson": "*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@types/linkify-it": {
|
|
||||||
"version": "5.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
|
|
||||||
"integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
|
|
||||||
"dev": true
|
|
||||||
},
|
|
||||||
"node_modules/@types/luxon": {
|
"node_modules/@types/luxon": {
|
||||||
"version": "3.7.1",
|
"version": "3.7.1",
|
||||||
"resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.1.tgz",
|
"resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.1.tgz",
|
||||||
@@ -10174,22 +10154,6 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/@types/markdown-it": {
|
|
||||||
"version": "14.1.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
|
|
||||||
"integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
|
|
||||||
"dev": true,
|
|
||||||
"dependencies": {
|
|
||||||
"@types/linkify-it": "^5",
|
|
||||||
"@types/mdurl": "^2"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@types/mdurl": {
|
|
||||||
"version": "2.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
|
|
||||||
"integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
|
|
||||||
"dev": true
|
|
||||||
},
|
|
||||||
"node_modules/@types/minimist": {
|
"node_modules/@types/minimist": {
|
||||||
"version": "1.2.5",
|
"version": "1.2.5",
|
||||||
"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
|
"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
|
||||||
@@ -32919,61 +32883,6 @@
|
|||||||
"vue": "^3.0.0"
|
"vue": "^3.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/vue-markdown-render": {
|
|
||||||
"version": "2.2.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/vue-markdown-render/-/vue-markdown-render-2.2.1.tgz",
|
|
||||||
"integrity": "sha512-XkYnC0PMdbs6Vy6j/gZXSvCuOS0787Se5COwXlepRqiqPiunyCIeTPQAO2XnB4Yl04EOHXwLx5y6IuszMWSgyQ==",
|
|
||||||
"dependencies": {
|
|
||||||
"markdown-it": "^13.0.2"
|
|
||||||
},
|
|
||||||
"peerDependencies": {
|
|
||||||
"vue": "^3.3.4"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/vue-markdown-render/node_modules/entities": {
|
|
||||||
"version": "3.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
|
|
||||||
"integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.12"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/fb55/entities?sponsor=1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/vue-markdown-render/node_modules/linkify-it": {
|
|
||||||
"version": "4.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz",
|
|
||||||
"integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
|
|
||||||
"dependencies": {
|
|
||||||
"uc.micro": "^1.0.1"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/vue-markdown-render/node_modules/markdown-it": {
|
|
||||||
"version": "13.0.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz",
|
|
||||||
"integrity": "sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==",
|
|
||||||
"dependencies": {
|
|
||||||
"argparse": "^2.0.1",
|
|
||||||
"entities": "~3.0.1",
|
|
||||||
"linkify-it": "^4.0.1",
|
|
||||||
"mdurl": "^1.0.1",
|
|
||||||
"uc.micro": "^1.0.5"
|
|
||||||
},
|
|
||||||
"bin": {
|
|
||||||
"markdown-it": "bin/markdown-it.js"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/vue-markdown-render/node_modules/mdurl": {
|
|
||||||
"version": "1.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
|
|
||||||
"integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
|
|
||||||
},
|
|
||||||
"node_modules/vue-markdown-render/node_modules/uc.micro": {
|
|
||||||
"version": "1.0.6",
|
|
||||||
"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
|
|
||||||
"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
|
|
||||||
},
|
|
||||||
"node_modules/vue-picture-cropper": {
|
"node_modules/vue-picture-cropper": {
|
||||||
"version": "0.7.0",
|
"version": "0.7.0",
|
||||||
"resolved": "https://registry.npmjs.org/vue-picture-cropper/-/vue-picture-cropper-0.7.0.tgz",
|
"resolved": "https://registry.npmjs.org/vue-picture-cropper/-/vue-picture-cropper-0.7.0.tgz",
|
||||||
|
|||||||
@@ -136,6 +136,7 @@
|
|||||||
"*.{js,ts,vue,css,json,yml,yaml}": "eslint --fix || true",
|
"*.{js,ts,vue,css,json,yml,yaml}": "eslint --fix || true",
|
||||||
"*.{md,markdown,mdc}": "markdownlint-cli2 --fix"
|
"*.{md,markdown,mdc}": "markdownlint-cli2 --fix"
|
||||||
},
|
},
|
||||||
|
|
||||||
"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",
|
||||||
@@ -156,7 +157,6 @@
|
|||||||
"@ethersproject/hdnode": "^5.7.0",
|
"@ethersproject/hdnode": "^5.7.0",
|
||||||
"@ethersproject/wallet": "^5.8.0",
|
"@ethersproject/wallet": "^5.8.0",
|
||||||
"@fortawesome/fontawesome-svg-core": "^6.5.1",
|
"@fortawesome/fontawesome-svg-core": "^6.5.1",
|
||||||
"@fortawesome/free-regular-svg-icons": "^6.7.2",
|
|
||||||
"@fortawesome/free-solid-svg-icons": "^6.5.1",
|
"@fortawesome/free-solid-svg-icons": "^6.5.1",
|
||||||
"@fortawesome/vue-fontawesome": "^3.0.6",
|
"@fortawesome/vue-fontawesome": "^3.0.6",
|
||||||
"@jlongster/sql.js": "^1.6.7",
|
"@jlongster/sql.js": "^1.6.7",
|
||||||
@@ -220,7 +220,6 @@
|
|||||||
"vue": "3.5.13",
|
"vue": "3.5.13",
|
||||||
"vue-axios": "^3.5.2",
|
"vue-axios": "^3.5.2",
|
||||||
"vue-facing-decorator": "3.0.4",
|
"vue-facing-decorator": "3.0.4",
|
||||||
"vue-markdown-render": "^2.2.1",
|
|
||||||
"vue-picture-cropper": "^0.7.0",
|
"vue-picture-cropper": "^0.7.0",
|
||||||
"vue-qrcode-reader": "^5.5.3",
|
"vue-qrcode-reader": "^5.5.3",
|
||||||
"vue-router": "^4.5.0",
|
"vue-router": "^4.5.0",
|
||||||
@@ -237,7 +236,6 @@
|
|||||||
"@types/js-yaml": "^4.0.9",
|
"@types/js-yaml": "^4.0.9",
|
||||||
"@types/leaflet": "^1.9.8",
|
"@types/leaflet": "^1.9.8",
|
||||||
"@types/luxon": "^3.4.2",
|
"@types/luxon": "^3.4.2",
|
||||||
"@types/markdown-it": "^14.1.2",
|
|
||||||
"@types/node": "^20.14.11",
|
"@types/node": "^20.14.11",
|
||||||
"@types/node-fetch": "^2.6.12",
|
"@types/node-fetch": "^2.6.12",
|
||||||
"@types/ramda": "^0.29.11",
|
"@types/ramda": "^0.29.11",
|
||||||
|
|||||||
@@ -22,24 +22,4 @@
|
|||||||
.dialog {
|
.dialog {
|
||||||
@apply bg-white p-4 rounded-lg w-full max-w-lg;
|
@apply bg-white p-4 rounded-lg w-full max-w-lg;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Markdown content styling to restore list elements */
|
|
||||||
.markdown-content ul {
|
|
||||||
@apply list-disc list-inside ml-4;
|
|
||||||
}
|
|
||||||
|
|
||||||
.markdown-content ol {
|
|
||||||
@apply list-decimal list-inside ml-4;
|
|
||||||
}
|
|
||||||
|
|
||||||
.markdown-content li {
|
|
||||||
@apply mb-1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.markdown-content ul ul,
|
|
||||||
.markdown-content ol ol,
|
|
||||||
.markdown-content ul ol,
|
|
||||||
.markdown-content ol ul {
|
|
||||||
@apply ml-4 mt-1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -80,10 +80,7 @@
|
|||||||
<!-- Description -->
|
<!-- Description -->
|
||||||
<p class="font-medium">
|
<p class="font-medium">
|
||||||
<a class="cursor-pointer" @click="emitLoadClaim(record.jwtId)">
|
<a class="cursor-pointer" @click="emitLoadClaim(record.jwtId)">
|
||||||
<vue-markdown
|
{{ description }}
|
||||||
:source="truncatedDescription"
|
|
||||||
class="markdown-content"
|
|
||||||
/>
|
|
||||||
</a>
|
</a>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
@@ -261,13 +258,11 @@ import {
|
|||||||
NOTIFY_UNKNOWN_PERSON,
|
NOTIFY_UNKNOWN_PERSON,
|
||||||
} from "@/constants/notifications";
|
} from "@/constants/notifications";
|
||||||
import { TIMEOUTS } from "@/utils/notify";
|
import { TIMEOUTS } from "@/utils/notify";
|
||||||
import VueMarkdown from "vue-markdown-render";
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {
|
components: {
|
||||||
EntityIcon,
|
EntityIcon,
|
||||||
ProjectIcon,
|
ProjectIcon,
|
||||||
VueMarkdown,
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
export default class ActivityListItem extends Vue {
|
export default class ActivityListItem extends Vue {
|
||||||
@@ -308,14 +303,6 @@ export default class ActivityListItem extends Vue {
|
|||||||
return `${claim?.description || ""}`;
|
return `${claim?.description || ""}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
get truncatedDescription(): string {
|
|
||||||
const desc = this.description;
|
|
||||||
if (desc.length <= 300) {
|
|
||||||
return desc;
|
|
||||||
}
|
|
||||||
return desc.substring(0, 300) + "...";
|
|
||||||
}
|
|
||||||
|
|
||||||
private displayAmount(code: string, amt: number) {
|
private displayAmount(code: string, amt: number) {
|
||||||
return `${amt} ${this.currencyShortWordForCode(code, amt === 1)}`;
|
return `${amt} ${this.currencyShortWordForCode(code, amt === 1)}`;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ messages * - Conditional UI based on platform capabilities * * @component *
|
|||||||
>
|
>
|
||||||
<!-- Notification dot - show while the user has not yet backed up their seed phrase -->
|
<!-- Notification dot - show while the user has not yet backed up their seed phrase -->
|
||||||
<font-awesome
|
<font-awesome
|
||||||
v-if="showRedNotificationDot"
|
v-if="!hasBackedUpSeed"
|
||||||
icon="circle"
|
icon="circle"
|
||||||
class="absolute -right-[8px] -top-[8px] text-rose-500 text-[14px] border border-white rounded-full"
|
class="absolute -right-[8px] -top-[8px] text-rose-500 text-[14px] border border-white rounded-full"
|
||||||
></font-awesome>
|
></font-awesome>
|
||||||
@@ -108,7 +108,7 @@ export default class DataExportSection extends Vue {
|
|||||||
* Flag indicating if the user has backed up their seed phrase
|
* Flag indicating if the user has backed up their seed phrase
|
||||||
* Used to control the visibility of the notification dot
|
* Used to control the visibility of the notification dot
|
||||||
*/
|
*/
|
||||||
showRedNotificationDot = false;
|
hasBackedUpSeed = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Notification helper for consistent notification patterns
|
* Notification helper for consistent notification patterns
|
||||||
@@ -240,12 +240,11 @@ export default class DataExportSection extends Vue {
|
|||||||
private async loadSeedBackupStatus(): Promise<void> {
|
private async loadSeedBackupStatus(): Promise<void> {
|
||||||
try {
|
try {
|
||||||
const settings = await this.$accountSettings();
|
const settings = await this.$accountSettings();
|
||||||
this.showRedNotificationDot =
|
this.hasBackedUpSeed = !!settings.hasBackedUpSeed;
|
||||||
!!settings.isRegistered && !settings.hasBackedUpSeed;
|
|
||||||
} catch (err: unknown) {
|
} catch (err: unknown) {
|
||||||
logger.error("Failed to load seed backup status:", err);
|
logger.error("Failed to load seed backup status:", err);
|
||||||
// Default to false (show notification dot) if we can't load the setting
|
// Default to false (show notification dot) if we can't load the setting
|
||||||
this.showRedNotificationDot = false;
|
this.hasBackedUpSeed = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ import { logger } from "../utils/logger";
|
|||||||
})
|
})
|
||||||
export default class TopMessage extends Vue {
|
export default class TopMessage extends Vue {
|
||||||
// Enhanced PlatformServiceMixin v4.0 provides:
|
// Enhanced PlatformServiceMixin v4.0 provides:
|
||||||
// - Cached database operations: this.$contacts(), this.$accountSettings()
|
// - Cached database operations: this.$contacts(), this.$settings(), this.$accountSettings()
|
||||||
// - Settings shortcuts: this.$saveSettings()
|
// - Settings shortcuts: this.$saveSettings()
|
||||||
// - Cache management: this.$refreshSettings(), this.$clearAllCaches()
|
// - Cache management: this.$refreshSettings(), this.$clearAllCaches()
|
||||||
// - Ultra-concise database methods: this.$db(), this.$exec(), this.$query()
|
// - Ultra-concise database methods: this.$db(), this.$exec(), this.$query()
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<!-- show spinner if loading limits -->
|
<!-- show spinner if loading limits -->
|
||||||
<div
|
<div
|
||||||
v-if="loadingLimits"
|
v-if="loadingLimits"
|
||||||
class="text-center"
|
class="text-slate-500 text-center italic mb-4"
|
||||||
role="status"
|
role="status"
|
||||||
aria-live="polite"
|
aria-live="polite"
|
||||||
>
|
>
|
||||||
@@ -19,7 +19,10 @@
|
|||||||
aria-hidden="true"
|
aria-hidden="true"
|
||||||
></font-awesome>
|
></font-awesome>
|
||||||
</div>
|
</div>
|
||||||
<div class="mb-4 text-center">
|
<div
|
||||||
|
v-if="limitsMessage"
|
||||||
|
class="bg-amber-200 text-amber-900 border-amber-500 border-dashed border text-center rounded-md overflow-hidden px-4 py-3 mb-4"
|
||||||
|
>
|
||||||
{{ limitsMessage }}
|
{{ limitsMessage }}
|
||||||
</div>
|
</div>
|
||||||
<div v-if="endorserLimits">
|
<div v-if="endorserLimits">
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ export const ACCOUNT_VIEW_CONSTANTS = {
|
|||||||
CANNOT_UPLOAD_IMAGES: "You cannot upload images.",
|
CANNOT_UPLOAD_IMAGES: "You cannot upload images.",
|
||||||
BAD_SERVER_RESPONSE: "Bad server response.",
|
BAD_SERVER_RESPONSE: "Bad server response.",
|
||||||
ERROR_RETRIEVING_LIMITS:
|
ERROR_RETRIEVING_LIMITS:
|
||||||
"No limits were found, so no actions are allowed. You need to get registered.",
|
"No limits were found, so no actions are allowed. You will need to get registered.",
|
||||||
},
|
},
|
||||||
|
|
||||||
// Project assignment errors
|
// Project assignment errors
|
||||||
|
|||||||
@@ -192,13 +192,6 @@ const MIGRATIONS = [
|
|||||||
name: "004_active_identity_management",
|
name: "004_active_identity_management",
|
||||||
sql: MIG_004_SQL,
|
sql: MIG_004_SQL,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
name: "005_add_starredPlanHandleIds_to_settings",
|
|
||||||
sql: `
|
|
||||||
ALTER TABLE settings ADD COLUMN starredPlanHandleIds TEXT DEFAULT '[]'; -- JSON string
|
|
||||||
ALTER TABLE settings ADD COLUMN lastAckedStarredPlanChangesJwtId TEXT;
|
|
||||||
`,
|
|
||||||
},
|
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -9,6 +9,34 @@ import { logger } from "@/utils/logger";
|
|||||||
import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
|
import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
|
||||||
import { QueryExecResult } from "@/interfaces/database";
|
import { QueryExecResult } from "@/interfaces/database";
|
||||||
|
|
||||||
|
export async function updateDefaultSettings(
|
||||||
|
settingsChanges: Settings,
|
||||||
|
): Promise<boolean> {
|
||||||
|
delete settingsChanges.accountDid; // just in case
|
||||||
|
// ensure there is no "id" that would override the key
|
||||||
|
delete settingsChanges.id;
|
||||||
|
try {
|
||||||
|
const platformService = PlatformServiceFactory.getInstance();
|
||||||
|
const { sql, params } = generateUpdateStatement(
|
||||||
|
settingsChanges,
|
||||||
|
"settings",
|
||||||
|
"id = ?",
|
||||||
|
[MASTER_SETTINGS_KEY],
|
||||||
|
);
|
||||||
|
const result = await platformService.dbExec(sql, params);
|
||||||
|
return result.changes === 1;
|
||||||
|
} catch (error) {
|
||||||
|
logger.error("Error updating default settings:", error);
|
||||||
|
if (error instanceof Error) {
|
||||||
|
throw error; // Re-throw if it's already an Error with a message
|
||||||
|
} else {
|
||||||
|
throw new Error(
|
||||||
|
`Failed to update settings. We recommend you try again or restart the app.`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export async function insertDidSpecificSettings(
|
export async function insertDidSpecificSettings(
|
||||||
did: string,
|
did: string,
|
||||||
settings: Partial<Settings> = {},
|
settings: Partial<Settings> = {},
|
||||||
@@ -63,7 +91,6 @@ export async function updateDidSpecificSettings(
|
|||||||
? mapColumnsToValues(postUpdateResult.columns, postUpdateResult.values)[0]
|
? mapColumnsToValues(postUpdateResult.columns, postUpdateResult.values)[0]
|
||||||
: null;
|
: null;
|
||||||
|
|
||||||
// Note that we want to eliminate this check (and fix the above if it doesn't work).
|
|
||||||
// Check if any of the target fields were actually changed
|
// Check if any of the target fields were actually changed
|
||||||
let actuallyUpdated = false;
|
let actuallyUpdated = false;
|
||||||
if (currentRecord && updatedRecord) {
|
if (currentRecord && updatedRecord) {
|
||||||
@@ -130,11 +157,10 @@ export async function retrieveSettingsForDefaultAccount(): Promise<Settings> {
|
|||||||
result.columns,
|
result.columns,
|
||||||
result.values,
|
result.values,
|
||||||
)[0] as Settings;
|
)[0] as Settings;
|
||||||
settings.searchBoxes = parseJsonField(settings.searchBoxes, []);
|
if (settings.searchBoxes) {
|
||||||
settings.starredPlanHandleIds = parseJsonField(
|
// @ts-expect-error - the searchBoxes field is a string in the DB
|
||||||
settings.starredPlanHandleIds,
|
settings.searchBoxes = JSON.parse(settings.searchBoxes);
|
||||||
[],
|
}
|
||||||
);
|
|
||||||
return settings;
|
return settings;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -200,11 +226,10 @@ export async function retrieveSettingsForActiveAccount(): Promise<Settings> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
settings.searchBoxes = parseJsonField(settings.searchBoxes, []);
|
// Handle searchBoxes parsing
|
||||||
settings.starredPlanHandleIds = parseJsonField(
|
if (settings.searchBoxes) {
|
||||||
settings.starredPlanHandleIds,
|
settings.searchBoxes = parseJsonField(settings.searchBoxes, []);
|
||||||
[],
|
}
|
||||||
);
|
|
||||||
|
|
||||||
return settings;
|
return settings;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
@@ -43,7 +43,6 @@ export type Settings = {
|
|||||||
|
|
||||||
lastAckedOfferToUserJwtId?: string; // the last JWT ID for offer-to-user that they've acknowledged seeing
|
lastAckedOfferToUserJwtId?: string; // the last JWT ID for offer-to-user that they've acknowledged seeing
|
||||||
lastAckedOfferToUserProjectsJwtId?: string; // the last JWT ID for offers-to-user's-projects that they've acknowledged seeing
|
lastAckedOfferToUserProjectsJwtId?: string; // the last JWT ID for offers-to-user's-projects that they've acknowledged seeing
|
||||||
lastAckedStarredPlanChangesJwtId?: string; // the last JWT ID for starred plan changes that they've acknowledged seeing
|
|
||||||
|
|
||||||
// The claim list has a most recent one used in notifications that's separate from the last viewed
|
// The claim list has a most recent one used in notifications that's separate from the last viewed
|
||||||
lastNotifiedClaimId?: string;
|
lastNotifiedClaimId?: string;
|
||||||
@@ -68,18 +67,15 @@ export type Settings = {
|
|||||||
showContactGivesInline?: boolean; // Display contact inline or not
|
showContactGivesInline?: boolean; // Display contact inline or not
|
||||||
showGeneralAdvanced?: boolean; // Show advanced features which don't have their own flag
|
showGeneralAdvanced?: boolean; // Show advanced features which don't have their own flag
|
||||||
showShortcutBvc?: boolean; // Show shortcut for Bountiful Voluntaryist Community actions
|
showShortcutBvc?: boolean; // Show shortcut for Bountiful Voluntaryist Community actions
|
||||||
|
|
||||||
starredPlanHandleIds?: string[]; // Array of starred plan handle IDs
|
|
||||||
vapid?: string; // VAPID (Voluntary Application Server Identification) field for web push
|
vapid?: string; // VAPID (Voluntary Application Server Identification) field for web push
|
||||||
warnIfProdServer?: boolean; // Warn if using a production server
|
warnIfProdServer?: boolean; // Warn if using a production server
|
||||||
warnIfTestServer?: boolean; // Warn if using a testing server
|
warnIfTestServer?: boolean; // Warn if using a testing server
|
||||||
webPushServer?: string; // Web Push server URL
|
webPushServer?: string; // Web Push server URL
|
||||||
};
|
};
|
||||||
|
|
||||||
// type of settings where the values are JSON strings instead of objects
|
// type of settings where the searchBoxes are JSON strings instead of objects
|
||||||
export type SettingsWithJsonStrings = Settings & {
|
export type SettingsWithJsonStrings = Settings & {
|
||||||
searchBoxes: string;
|
searchBoxes: string;
|
||||||
starredPlanHandleIds: string;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export function checkIsAnyFeedFilterOn(settings: Settings): boolean {
|
export function checkIsAnyFeedFilterOn(settings: Settings): boolean {
|
||||||
@@ -96,11 +92,6 @@ export const SettingsSchema = {
|
|||||||
/**
|
/**
|
||||||
* Constants.
|
* Constants.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
|
||||||
* This is deprecated.
|
|
||||||
* It only remains for those with a PWA who have not migrated, but we'll soon remove it.
|
|
||||||
*/
|
|
||||||
export const MASTER_SETTINGS_KEY = "1";
|
export const MASTER_SETTINGS_KEY = "1";
|
||||||
|
|
||||||
export const DEFAULT_PASSKEY_EXPIRATION_MINUTES = 15;
|
export const DEFAULT_PASSKEY_EXPIRATION_MINUTES = 15;
|
||||||
|
|||||||
@@ -72,15 +72,11 @@ export interface PlanActionClaim extends ClaimObject {
|
|||||||
name: string;
|
name: string;
|
||||||
agent?: { identifier: string };
|
agent?: { identifier: string };
|
||||||
description?: string;
|
description?: string;
|
||||||
endTime?: string;
|
|
||||||
identifier?: string;
|
identifier?: string;
|
||||||
image?: string;
|
|
||||||
lastClaimId?: string;
|
lastClaimId?: string;
|
||||||
location?: {
|
location?: {
|
||||||
geo: { "@type": "GeoCoordinates"; latitude: number; longitude: number };
|
geo: { "@type": "GeoCoordinates"; latitude: number; longitude: number };
|
||||||
};
|
};
|
||||||
startTime?: string;
|
|
||||||
url?: string;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// AKA Registration & RegisterAction
|
// AKA Registration & RegisterAction
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
import { GiveActionClaim, OfferClaim, PlanActionClaim } from "./claims";
|
import { GiveActionClaim, OfferClaim } from "./claims";
|
||||||
import { GenericCredWrapper } from "./common";
|
|
||||||
|
|
||||||
// a summary record; the VC is found the fullClaim field
|
// a summary record; the VC is found the fullClaim field
|
||||||
export interface GiveSummaryRecord {
|
export interface GiveSummaryRecord {
|
||||||
@@ -62,11 +61,6 @@ export interface PlanSummaryRecord {
|
|||||||
jwtId?: string;
|
jwtId?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface PlanSummaryAndPreviousClaim {
|
|
||||||
plan: PlanSummaryRecord;
|
|
||||||
wrappedClaimBefore: GenericCredWrapper<PlanActionClaim>;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Represents data about a project
|
* Represents data about a project
|
||||||
*
|
*
|
||||||
@@ -93,10 +87,7 @@ export interface PlanData {
|
|||||||
name: string;
|
name: string;
|
||||||
/**
|
/**
|
||||||
* The identifier of the project record -- different from jwtId
|
* The identifier of the project record -- different from jwtId
|
||||||
*
|
* (Maybe we should use the jwtId to iterate through the records instead.)
|
||||||
* This has been used to iterate through plan records, because jwtId ordering doesn't match
|
|
||||||
* chronological create ordering, though it does match most recent edit order (in reverse order).
|
|
||||||
* (It may be worthwhile to order by jwtId instead. It is an indexed field.)
|
|
||||||
**/
|
**/
|
||||||
rowId?: string;
|
rowId?: string;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,12 +56,7 @@ import {
|
|||||||
KeyMetaWithPrivate,
|
KeyMetaWithPrivate,
|
||||||
KeyMetaMaybeWithPrivate,
|
KeyMetaMaybeWithPrivate,
|
||||||
} from "../interfaces/common";
|
} from "../interfaces/common";
|
||||||
import {
|
import { PlanSummaryRecord } from "../interfaces/records";
|
||||||
OfferSummaryRecord,
|
|
||||||
OfferToPlanSummaryRecord,
|
|
||||||
PlanSummaryAndPreviousClaim,
|
|
||||||
PlanSummaryRecord,
|
|
||||||
} from "../interfaces/records";
|
|
||||||
import { logger } from "../utils/logger";
|
import { logger } from "../utils/logger";
|
||||||
import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
|
import { PlatformServiceFactory } from "@/services/PlatformServiceFactory";
|
||||||
import { APP_SERVER } from "@/constants/app";
|
import { APP_SERVER } from "@/constants/app";
|
||||||
@@ -367,22 +362,6 @@ export function didInfo(
|
|||||||
return didInfoForContact(did, activeDid, contact, allMyDids).displayName;
|
return didInfoForContact(did, activeDid, contact, allMyDids).displayName;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* In some contexts (eg. agent), a blank really is nobody.
|
|
||||||
*/
|
|
||||||
export function didInfoOrNobody(
|
|
||||||
did: string | undefined,
|
|
||||||
activeDid: string | undefined,
|
|
||||||
allMyDids: string[],
|
|
||||||
contacts: Contact[],
|
|
||||||
): string {
|
|
||||||
if (did == null) {
|
|
||||||
return "Nobody";
|
|
||||||
} else {
|
|
||||||
return didInfo(did, activeDid, allMyDids, contacts);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* return text description without any references to "you" as user
|
* return text description without any references to "you" as user
|
||||||
*/
|
*/
|
||||||
@@ -751,7 +730,7 @@ export async function getNewOffersToUser(
|
|||||||
activeDid: string,
|
activeDid: string,
|
||||||
afterOfferJwtId?: string,
|
afterOfferJwtId?: string,
|
||||||
beforeOfferJwtId?: string,
|
beforeOfferJwtId?: string,
|
||||||
): Promise<{ data: Array<OfferSummaryRecord>; hitLimit: boolean }> {
|
) {
|
||||||
let url = `${apiServer}/api/v2/report/offers?recipientDid=${activeDid}`;
|
let url = `${apiServer}/api/v2/report/offers?recipientDid=${activeDid}`;
|
||||||
if (afterOfferJwtId) {
|
if (afterOfferJwtId) {
|
||||||
url += "&afterId=" + afterOfferJwtId;
|
url += "&afterId=" + afterOfferJwtId;
|
||||||
@@ -773,7 +752,7 @@ export async function getNewOffersToUserProjects(
|
|||||||
activeDid: string,
|
activeDid: string,
|
||||||
afterOfferJwtId?: string,
|
afterOfferJwtId?: string,
|
||||||
beforeOfferJwtId?: string,
|
beforeOfferJwtId?: string,
|
||||||
): Promise<{ data: Array<OfferToPlanSummaryRecord>; hitLimit: boolean }> {
|
) {
|
||||||
let url = `${apiServer}/api/v2/report/offersToPlansOwnedByMe`;
|
let url = `${apiServer}/api/v2/report/offersToPlansOwnedByMe`;
|
||||||
if (afterOfferJwtId) {
|
if (afterOfferJwtId) {
|
||||||
url += "?afterId=" + afterOfferJwtId;
|
url += "?afterId=" + afterOfferJwtId;
|
||||||
@@ -787,46 +766,6 @@ export async function getNewOffersToUserProjects(
|
|||||||
return response.data;
|
return response.data;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Get starred projects that have been updated since the last check
|
|
||||||
*
|
|
||||||
* @param axios - axios instance
|
|
||||||
* @param apiServer - endorser API server URL
|
|
||||||
* @param activeDid - user's DID for authentication
|
|
||||||
* @param starredPlanHandleIds - array of starred project handle IDs
|
|
||||||
* @param afterId - JWT ID to check for changes after (from lastAckedStarredPlanChangesJwtId)
|
|
||||||
* @returns { data: Array<PlanSummaryAndPreviousClaim>, hitLimit: boolean }
|
|
||||||
*/
|
|
||||||
export async function getStarredProjectsWithChanges(
|
|
||||||
axios: Axios,
|
|
||||||
apiServer: string,
|
|
||||||
activeDid: string,
|
|
||||||
starredPlanHandleIds: string[],
|
|
||||||
afterId?: string,
|
|
||||||
): Promise<{ data: Array<PlanSummaryAndPreviousClaim>; hitLimit: boolean }> {
|
|
||||||
if (!starredPlanHandleIds || starredPlanHandleIds.length === 0) {
|
|
||||||
return { data: [], hitLimit: false };
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!afterId) {
|
|
||||||
// This doesn't make sense: there should always be some previous one they've seen.
|
|
||||||
// We'll just return blank.
|
|
||||||
return { data: [], hitLimit: false };
|
|
||||||
}
|
|
||||||
|
|
||||||
// Use POST method for larger lists of project IDs
|
|
||||||
const url = `${apiServer}/api/v2/report/plansLastUpdatedBetween`;
|
|
||||||
const headers = await getHeaders(activeDid);
|
|
||||||
|
|
||||||
const requestBody = {
|
|
||||||
planIds: starredPlanHandleIds,
|
|
||||||
afterId: afterId,
|
|
||||||
};
|
|
||||||
|
|
||||||
const response = await axios.post(url, requestBody, { headers });
|
|
||||||
return response.data;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Construct GiveAction VC for submission to server
|
* Construct GiveAction VC for submission to server
|
||||||
*
|
*
|
||||||
@@ -1758,19 +1697,49 @@ export async function fetchEndorserRateLimits(
|
|||||||
timestamp: new Date().toISOString(),
|
timestamp: new Date().toISOString(),
|
||||||
});
|
});
|
||||||
|
|
||||||
// not wrapped in a 'try' because the error returned is self-explanatory
|
try {
|
||||||
const response = await axios.get(url, { headers } as AxiosRequestConfig);
|
const response = await axios.get(url, { headers } as AxiosRequestConfig);
|
||||||
|
|
||||||
// Log successful registration check
|
// Log successful registration check
|
||||||
logger.debug("[User Registration] User registration check successful:", {
|
logger.debug("[User Registration] User registration check successful:", {
|
||||||
did: issuerDid,
|
did: issuerDid,
|
||||||
server: apiServer,
|
server: apiServer,
|
||||||
status: response.status,
|
status: response.status,
|
||||||
isRegistered: true,
|
isRegistered: true,
|
||||||
timestamp: new Date().toISOString(),
|
timestamp: new Date().toISOString(),
|
||||||
});
|
});
|
||||||
|
|
||||||
return response;
|
return response;
|
||||||
|
} catch (error) {
|
||||||
|
// Enhanced error logging with user registration context
|
||||||
|
const axiosError = error as {
|
||||||
|
response?: {
|
||||||
|
data?: { error?: { code?: string; message?: string } };
|
||||||
|
status?: number;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
const errorCode = axiosError.response?.data?.error?.code;
|
||||||
|
const errorMessage = axiosError.response?.data?.error?.message;
|
||||||
|
const httpStatus = axiosError.response?.status;
|
||||||
|
|
||||||
|
logger.warn("[User Registration] User not registered on server:", {
|
||||||
|
did: issuerDid,
|
||||||
|
server: apiServer,
|
||||||
|
errorCode: errorCode,
|
||||||
|
errorMessage: errorMessage,
|
||||||
|
httpStatus: httpStatus,
|
||||||
|
needsRegistration: true,
|
||||||
|
timestamp: new Date().toISOString(),
|
||||||
|
});
|
||||||
|
|
||||||
|
// Log the original error for debugging
|
||||||
|
logger.error(
|
||||||
|
`[fetchEndorserRateLimits] Error for DID ${issuerDid}:`,
|
||||||
|
errorStringForLog(error),
|
||||||
|
);
|
||||||
|
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -1819,17 +1788,14 @@ export async function fetchImageRateLimits(
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
logger.warn(
|
logger.error("[Image Server] Image rate limits check failed:", {
|
||||||
"[Image Server] Image rate limits check failed, which is expected for users not registered on test server (eg. when only registered on local server).",
|
did: issuerDid,
|
||||||
{
|
server: server,
|
||||||
did: issuerDid,
|
errorCode: axiosError.response?.data?.error?.code,
|
||||||
server: server,
|
errorMessage: axiosError.response?.data?.error?.message,
|
||||||
errorCode: axiosError.response?.data?.error?.code,
|
httpStatus: axiosError.response?.status,
|
||||||
errorMessage: axiosError.response?.data?.error?.message,
|
timestamp: new Date().toISOString(),
|
||||||
httpStatus: axiosError.response?.status,
|
});
|
||||||
timestamp: new Date().toISOString(),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -86,7 +86,6 @@ import {
|
|||||||
faSquareCaretDown,
|
faSquareCaretDown,
|
||||||
faSquareCaretUp,
|
faSquareCaretUp,
|
||||||
faSquarePlus,
|
faSquarePlus,
|
||||||
faStar,
|
|
||||||
faThumbtack,
|
faThumbtack,
|
||||||
faTrashCan,
|
faTrashCan,
|
||||||
faTriangleExclamation,
|
faTriangleExclamation,
|
||||||
@@ -95,9 +94,6 @@ import {
|
|||||||
faXmark,
|
faXmark,
|
||||||
} from "@fortawesome/free-solid-svg-icons";
|
} from "@fortawesome/free-solid-svg-icons";
|
||||||
|
|
||||||
// these are referenced differently, eg. ":icon='['far', 'star']'" as in ProjectViewView.vue
|
|
||||||
import { faStar as faStarRegular } from "@fortawesome/free-regular-svg-icons";
|
|
||||||
|
|
||||||
// Initialize Font Awesome library with all required icons
|
// Initialize Font Awesome library with all required icons
|
||||||
library.add(
|
library.add(
|
||||||
faArrowDown,
|
faArrowDown,
|
||||||
@@ -172,16 +168,14 @@ library.add(
|
|||||||
faPlus,
|
faPlus,
|
||||||
faQrcode,
|
faQrcode,
|
||||||
faQuestion,
|
faQuestion,
|
||||||
faRightFromBracket,
|
|
||||||
faRotate,
|
faRotate,
|
||||||
|
faRightFromBracket,
|
||||||
faShareNodes,
|
faShareNodes,
|
||||||
faSpinner,
|
faSpinner,
|
||||||
faSquare,
|
faSquare,
|
||||||
faSquareCaretDown,
|
faSquareCaretDown,
|
||||||
faSquareCaretUp,
|
faSquareCaretUp,
|
||||||
faSquarePlus,
|
faSquarePlus,
|
||||||
faStar,
|
|
||||||
faStarRegular,
|
|
||||||
faThumbtack,
|
faThumbtack,
|
||||||
faTrashCan,
|
faTrashCan,
|
||||||
faTriangleExclamation,
|
faTriangleExclamation,
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import { logger, safeStringify } from "../utils/logger";
|
|||||||
* @remarks
|
* @remarks
|
||||||
* Special handling includes:
|
* Special handling includes:
|
||||||
* - Enhanced logging for Capacitor platform
|
* - Enhanced logging for Capacitor platform
|
||||||
|
* - Rate limit detection and handling
|
||||||
* - Detailed error information logging including:
|
* - Detailed error information logging including:
|
||||||
* - Error message
|
* - Error message
|
||||||
* - HTTP status
|
* - HTTP status
|
||||||
@@ -49,5 +50,11 @@ export const handleApiError = (error: AxiosError, endpoint: string) => {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Specific handling for rate limits
|
||||||
|
if (error.response?.status === 400) {
|
||||||
|
logger.warn(`[Rate Limit] ${endpoint}`);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
throw error;
|
throw error;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -85,6 +85,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
||||||
|
import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
@@ -196,10 +197,10 @@ This tests the helper method only - no database interaction`;
|
|||||||
const success = await this.$saveSettings(testSettings);
|
const success = await this.$saveSettings(testSettings);
|
||||||
|
|
||||||
if (success) {
|
if (success) {
|
||||||
// Now query the raw database to see how it's actually stored.
|
// Now query the raw database to see how it's actually stored
|
||||||
// Note that new users probably have settings with ID of 1 but old migrated users might skip to 2.
|
|
||||||
const rawResult = await this.$dbQuery(
|
const rawResult = await this.$dbQuery(
|
||||||
"SELECT searchBoxes FROM settings limit 1",
|
"SELECT searchBoxes FROM settings WHERE id = ?",
|
||||||
|
[MASTER_SETTINGS_KEY],
|
||||||
);
|
);
|
||||||
|
|
||||||
if (rawResult?.values?.length) {
|
if (rawResult?.values?.length) {
|
||||||
|
|||||||
@@ -301,11 +301,7 @@ export const PlatformServiceMixin = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Convert SQLite JSON strings to objects/arrays
|
// Convert SQLite JSON strings to objects/arrays
|
||||||
if (
|
if (column === "contactMethods" || column === "searchBoxes") {
|
||||||
column === "contactMethods" ||
|
|
||||||
column === "searchBoxes" ||
|
|
||||||
column === "starredPlanHandleIds"
|
|
||||||
) {
|
|
||||||
value = this._parseJsonField(value, []);
|
value = this._parseJsonField(value, []);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -353,14 +349,6 @@ export const PlatformServiceMixin = {
|
|||||||
? JSON.stringify(settings.searchBoxes)
|
? JSON.stringify(settings.searchBoxes)
|
||||||
: String(settings.searchBoxes);
|
: String(settings.searchBoxes);
|
||||||
}
|
}
|
||||||
if (settings.starredPlanHandleIds !== undefined) {
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
(converted as any).starredPlanHandleIds = Array.isArray(
|
|
||||||
settings.starredPlanHandleIds,
|
|
||||||
)
|
|
||||||
? JSON.stringify(settings.starredPlanHandleIds)
|
|
||||||
: String(settings.starredPlanHandleIds);
|
|
||||||
}
|
|
||||||
|
|
||||||
return converted;
|
return converted;
|
||||||
},
|
},
|
||||||
@@ -563,12 +551,6 @@ export const PlatformServiceMixin = {
|
|||||||
if (settings.searchBoxes) {
|
if (settings.searchBoxes) {
|
||||||
settings.searchBoxes = this._parseJsonField(settings.searchBoxes, []);
|
settings.searchBoxes = this._parseJsonField(settings.searchBoxes, []);
|
||||||
}
|
}
|
||||||
if (settings.starredPlanHandleIds) {
|
|
||||||
settings.starredPlanHandleIds = this._parseJsonField(
|
|
||||||
settings.starredPlanHandleIds,
|
|
||||||
[],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return settings;
|
return settings;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -635,12 +617,6 @@ export const PlatformServiceMixin = {
|
|||||||
[],
|
[],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if (mergedSettings.starredPlanHandleIds) {
|
|
||||||
mergedSettings.starredPlanHandleIds = this._parseJsonField(
|
|
||||||
mergedSettings.starredPlanHandleIds,
|
|
||||||
[],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return mergedSettings;
|
return mergedSettings;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
@@ -24,28 +24,10 @@ export function getMemoryLogs(): string[] {
|
|||||||
return [..._memoryLogs];
|
return [..._memoryLogs];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Stringify an object with proper handling of circular references and functions
|
|
||||||
*
|
|
||||||
* Don't use for arrays; map with this over the array.
|
|
||||||
*
|
|
||||||
* @param obj - The object to stringify
|
|
||||||
* @returns The stringified object, plus 'message' and 'stack' for Error objects
|
|
||||||
*/
|
|
||||||
export function safeStringify(obj: unknown) {
|
export function safeStringify(obj: unknown) {
|
||||||
const seen = new WeakSet();
|
const seen = new WeakSet();
|
||||||
|
|
||||||
// since 'message' & 'stack' are not enumerable for errors, let's add those
|
return JSON.stringify(obj, (_key, value) => {
|
||||||
let objToStringify = obj;
|
|
||||||
if (obj instanceof Error) {
|
|
||||||
objToStringify = {
|
|
||||||
...obj,
|
|
||||||
message: obj.message,
|
|
||||||
stack: obj.stack,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
return JSON.stringify(objToStringify, (_key, value) => {
|
|
||||||
if (typeof value === "object" && value !== null) {
|
if (typeof value === "object" && value !== null) {
|
||||||
if (seen.has(value)) {
|
if (seen.has(value)) {
|
||||||
return "[Circular]";
|
return "[Circular]";
|
||||||
@@ -196,8 +178,7 @@ export const logger = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Database logging
|
// Database logging
|
||||||
const argsString =
|
const argsString = args.length > 0 ? " - " + safeStringify(args) : "";
|
||||||
args.length > 0 ? " - " + args.map(safeStringify).join(", ") : "";
|
|
||||||
logToDatabase(message + argsString, "info");
|
logToDatabase(message + argsString, "info");
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -208,8 +189,7 @@ export const logger = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Database logging
|
// Database logging
|
||||||
const argsString =
|
const argsString = args.length > 0 ? " - " + safeStringify(args) : "";
|
||||||
args.length > 0 ? " - " + args.map(safeStringify).join(", ") : "";
|
|
||||||
logToDatabase(message + argsString, "info");
|
logToDatabase(message + argsString, "info");
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -220,8 +200,7 @@ export const logger = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Database logging
|
// Database logging
|
||||||
const argsString =
|
const argsString = args.length > 0 ? " - " + safeStringify(args) : "";
|
||||||
args.length > 0 ? " - " + args.map(safeStringify).join(", ") : "";
|
|
||||||
logToDatabase(message + argsString, "warn");
|
logToDatabase(message + argsString, "warn");
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -232,9 +211,9 @@ export const logger = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Database logging
|
// Database logging
|
||||||
const argsString =
|
const messageString = safeStringify(message);
|
||||||
args.length > 0 ? " - " + args.map(safeStringify).join(", ") : "";
|
const argsString = args.length > 0 ? safeStringify(args) : "";
|
||||||
logToDatabase(message + argsString, "error");
|
logToDatabase(messageString + argsString, "error");
|
||||||
},
|
},
|
||||||
|
|
||||||
// New database-focused methods (self-contained)
|
// New database-focused methods (self-contained)
|
||||||
|
|||||||
@@ -150,6 +150,8 @@
|
|||||||
</section>
|
</section>
|
||||||
<PushNotificationPermission ref="pushNotificationPermission" />
|
<PushNotificationPermission ref="pushNotificationPermission" />
|
||||||
|
|
||||||
|
<LocationSearchSection :search-box="searchBox" />
|
||||||
|
|
||||||
<!-- User Profile -->
|
<!-- User Profile -->
|
||||||
<section
|
<section
|
||||||
v-if="isRegistered"
|
v-if="isRegistered"
|
||||||
@@ -242,8 +244,6 @@
|
|||||||
<div v-else>Saving...</div>
|
<div v-else>Saving...</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<LocationSearchSection :search-box="searchBox" />
|
|
||||||
|
|
||||||
<UsageLimitsSection
|
<UsageLimitsSection
|
||||||
v-if="activeDid"
|
v-if="activeDid"
|
||||||
:loading-limits="loadingLimits"
|
:loading-limits="loadingLimits"
|
||||||
@@ -1064,8 +1064,8 @@ export default class AccountViewView extends Vue {
|
|||||||
this.hideRegisterPromptOnNewContact =
|
this.hideRegisterPromptOnNewContact =
|
||||||
!!settings.hideRegisterPromptOnNewContact;
|
!!settings.hideRegisterPromptOnNewContact;
|
||||||
this.isRegistered = !!settings?.isRegistered;
|
this.isRegistered = !!settings?.isRegistered;
|
||||||
this.isSearchAreasSet =
|
this.isSearchAreasSet = !!settings.searchBoxes;
|
||||||
!!settings.searchBoxes && settings.searchBoxes.length > 0;
|
this.searchBox = settings.searchBoxes?.[0] || null;
|
||||||
this.notifyingNewActivity = !!settings.notifyingNewActivityTime;
|
this.notifyingNewActivity = !!settings.notifyingNewActivityTime;
|
||||||
this.notifyingNewActivityTime = settings.notifyingNewActivityTime || "";
|
this.notifyingNewActivityTime = settings.notifyingNewActivityTime || "";
|
||||||
this.notifyingReminder = !!settings.notifyingReminderTime;
|
this.notifyingReminder = !!settings.notifyingReminderTime;
|
||||||
@@ -1079,7 +1079,6 @@ export default class AccountViewView extends Vue {
|
|||||||
this.passkeyExpirationMinutes =
|
this.passkeyExpirationMinutes =
|
||||||
settings.passkeyExpirationMinutes ?? DEFAULT_PASSKEY_EXPIRATION_MINUTES;
|
settings.passkeyExpirationMinutes ?? DEFAULT_PASSKEY_EXPIRATION_MINUTES;
|
||||||
this.previousPasskeyExpirationMinutes = this.passkeyExpirationMinutes;
|
this.previousPasskeyExpirationMinutes = this.passkeyExpirationMinutes;
|
||||||
this.searchBox = settings.searchBoxes?.[0] || null;
|
|
||||||
this.showGeneralAdvanced = !!settings.showGeneralAdvanced;
|
this.showGeneralAdvanced = !!settings.showGeneralAdvanced;
|
||||||
this.showShortcutBvc = !!settings.showShortcutBvc;
|
this.showShortcutBvc = !!settings.showShortcutBvc;
|
||||||
this.warnIfProdServer = !!settings.warnIfProdServer;
|
this.warnIfProdServer = !!settings.warnIfProdServer;
|
||||||
@@ -1453,6 +1452,8 @@ export default class AccountViewView extends Vue {
|
|||||||
|
|
||||||
if (imageResp && imageResp.status === 200) {
|
if (imageResp && imageResp.status === 200) {
|
||||||
this.imageLimits = imageResp.data;
|
this.imageLimits = imageResp.data;
|
||||||
|
} else {
|
||||||
|
this.limitsMessage = ACCOUNT_VIEW_CONSTANTS.LIMITS.NO_IMAGE_ACCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
const endorserResp = await fetchEndorserRateLimits(
|
const endorserResp = await fetchEndorserRateLimits(
|
||||||
@@ -1463,6 +1464,9 @@ export default class AccountViewView extends Vue {
|
|||||||
|
|
||||||
if (endorserResp.status === 200) {
|
if (endorserResp.status === 200) {
|
||||||
this.endorserLimits = endorserResp.data;
|
this.endorserLimits = endorserResp.data;
|
||||||
|
} else {
|
||||||
|
this.limitsMessage = ACCOUNT_VIEW_CONSTANTS.LIMITS.NO_LIMITS_FOUND;
|
||||||
|
this.notify.warning(ACCOUNT_VIEW_CONSTANTS.LIMITS.BAD_SERVER_RESPONSE);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.limitsMessage =
|
this.limitsMessage =
|
||||||
|
|||||||
@@ -83,10 +83,7 @@
|
|||||||
<div class="text-sm">
|
<div class="text-sm">
|
||||||
<div data-testId="description">
|
<div data-testId="description">
|
||||||
<font-awesome icon="message" class="fa-fw text-slate-400" />
|
<font-awesome icon="message" class="fa-fw text-slate-400" />
|
||||||
<vue-markdown
|
{{ claimDescription }}
|
||||||
:source="claimDescription"
|
|
||||||
class="markdown-content"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<font-awesome icon="user" class="fa-fw text-slate-400" />
|
<font-awesome icon="user" class="fa-fw text-slate-400" />
|
||||||
@@ -536,10 +533,8 @@ import { AxiosError } from "axios";
|
|||||||
import * as yaml from "js-yaml";
|
import * as yaml from "js-yaml";
|
||||||
import * as R from "ramda";
|
import * as R from "ramda";
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
import VueMarkdown from "vue-markdown-render";
|
|
||||||
import { Router, RouteLocationNormalizedLoaded } from "vue-router";
|
import { Router, RouteLocationNormalizedLoaded } from "vue-router";
|
||||||
import { copyToClipboard } from "../services/ClipboardService";
|
import { copyToClipboard } from "../services/ClipboardService";
|
||||||
|
|
||||||
import { GenericVerifiableCredential } from "../interfaces";
|
import { GenericVerifiableCredential } from "../interfaces";
|
||||||
import GiftedDialog from "../components/GiftedDialog.vue";
|
import GiftedDialog from "../components/GiftedDialog.vue";
|
||||||
import QuickNav from "../components/QuickNav.vue";
|
import QuickNav from "../components/QuickNav.vue";
|
||||||
@@ -558,7 +553,7 @@ import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
|||||||
import { APP_SERVER } from "@/constants/app";
|
import { APP_SERVER } from "@/constants/app";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: { GiftedDialog, QuickNav, VueMarkdown },
|
components: { GiftedDialog, QuickNav },
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
})
|
})
|
||||||
export default class ClaimView extends Vue {
|
export default class ClaimView extends Vue {
|
||||||
|
|||||||
@@ -223,7 +223,7 @@ export default class ContactAmountssView extends Vue {
|
|||||||
const contact = await this.$getContact(contactDid);
|
const contact = await this.$getContact(contactDid);
|
||||||
this.contact = contact;
|
this.contact = contact;
|
||||||
|
|
||||||
const settings = await this.$accountSettings();
|
const settings = await this.$settings();
|
||||||
|
|
||||||
// Get activeDid from active_identity table (single source of truth)
|
// Get activeDid from active_identity table (single source of truth)
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
|||||||
@@ -51,33 +51,6 @@
|
|||||||
<!-- Secondary Tabs -->
|
<!-- Secondary Tabs -->
|
||||||
<div class="text-center text-slate-500 border-b border-slate-300">
|
<div class="text-center text-slate-500 border-b border-slate-300">
|
||||||
<ul class="flex flex-wrap justify-center gap-4 -mb-px">
|
<ul class="flex flex-wrap justify-center gap-4 -mb-px">
|
||||||
<li v-if="isProjectsActive">
|
|
||||||
<a
|
|
||||||
href="#"
|
|
||||||
:class="computedStarredTabStyleClassNames()"
|
|
||||||
@click="
|
|
||||||
projects = [];
|
|
||||||
userProfiles = [];
|
|
||||||
isStarredActive = true;
|
|
||||||
isLocalActive = false;
|
|
||||||
isMappedActive = false;
|
|
||||||
isAnywhereActive = false;
|
|
||||||
isSearchVisible = false;
|
|
||||||
tempSearchBox = null;
|
|
||||||
searchStarred();
|
|
||||||
"
|
|
||||||
>
|
|
||||||
Starred
|
|
||||||
<!-- restore when the links don't jump around for different numbers
|
|
||||||
<span
|
|
||||||
class="font-semibold text-sm bg-slate-200 px-1.5 py-0.5 rounded-md"
|
|
||||||
v-if="isLocalActive"
|
|
||||||
>
|
|
||||||
{{ localCount > -1 ? localCount : "?" }}
|
|
||||||
</span>
|
|
||||||
-->
|
|
||||||
</a>
|
|
||||||
</li>
|
|
||||||
<li>
|
<li>
|
||||||
<a
|
<a
|
||||||
href="#"
|
href="#"
|
||||||
@@ -85,11 +58,9 @@
|
|||||||
@click="
|
@click="
|
||||||
projects = [];
|
projects = [];
|
||||||
userProfiles = [];
|
userProfiles = [];
|
||||||
isStarredActive = false;
|
|
||||||
isLocalActive = true;
|
isLocalActive = true;
|
||||||
isMappedActive = false;
|
isMappedActive = false;
|
||||||
isAnywhereActive = false;
|
isAnywhereActive = false;
|
||||||
isStarredActive = false;
|
|
||||||
isSearchVisible = true;
|
isSearchVisible = true;
|
||||||
tempSearchBox = null;
|
tempSearchBox = null;
|
||||||
searchLocal();
|
searchLocal();
|
||||||
@@ -113,11 +84,9 @@
|
|||||||
@click="
|
@click="
|
||||||
projects = [];
|
projects = [];
|
||||||
userProfiles = [];
|
userProfiles = [];
|
||||||
isStarredActive = false;
|
|
||||||
isLocalActive = false;
|
isLocalActive = false;
|
||||||
isMappedActive = true;
|
isMappedActive = true;
|
||||||
isAnywhereActive = false;
|
isAnywhereActive = false;
|
||||||
isStarredActive = false;
|
|
||||||
isSearchVisible = false;
|
isSearchVisible = false;
|
||||||
searchTerms = '';
|
searchTerms = '';
|
||||||
tempSearchBox = null;
|
tempSearchBox = null;
|
||||||
@@ -134,11 +103,9 @@
|
|||||||
@click="
|
@click="
|
||||||
projects = [];
|
projects = [];
|
||||||
userProfiles = [];
|
userProfiles = [];
|
||||||
isStarredActive = false;
|
|
||||||
isLocalActive = false;
|
isLocalActive = false;
|
||||||
isMappedActive = false;
|
isMappedActive = false;
|
||||||
isAnywhereActive = true;
|
isAnywhereActive = true;
|
||||||
isStarredActive = false;
|
|
||||||
isSearchVisible = true;
|
isSearchVisible = true;
|
||||||
tempSearchBox = null;
|
tempSearchBox = null;
|
||||||
searchAll();
|
searchAll();
|
||||||
@@ -234,15 +201,6 @@
|
|||||||
>No {{ isProjectsActive ? "projects" : "people" }} were found with
|
>No {{ isProjectsActive ? "projects" : "people" }} were found with
|
||||||
that search.</span
|
that search.</span
|
||||||
>
|
>
|
||||||
<span v-else-if="isStarredActive">
|
|
||||||
<p>
|
|
||||||
You have no starred projects. Star some projects to see them here.
|
|
||||||
</p>
|
|
||||||
<p class="mt-4">
|
|
||||||
When you star projects, you will get a notice on the front page when
|
|
||||||
they change.
|
|
||||||
</p>
|
|
||||||
</span>
|
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -425,12 +383,9 @@ export default class DiscoverView extends Vue {
|
|||||||
allMyDids: Array<string> = [];
|
allMyDids: Array<string> = [];
|
||||||
apiServer = "";
|
apiServer = "";
|
||||||
isLoading = false;
|
isLoading = false;
|
||||||
|
|
||||||
isLocalActive = false;
|
isLocalActive = false;
|
||||||
isMappedActive = false;
|
isMappedActive = false;
|
||||||
isAnywhereActive = true;
|
isAnywhereActive = true;
|
||||||
isStarredActive = false;
|
|
||||||
|
|
||||||
isProjectsActive = true;
|
isProjectsActive = true;
|
||||||
isPeopleActive = false;
|
isPeopleActive = false;
|
||||||
isSearchVisible = true;
|
isSearchVisible = true;
|
||||||
@@ -519,8 +474,6 @@ export default class DiscoverView extends Vue {
|
|||||||
leafletObject: L.Map;
|
leafletObject: L.Map;
|
||||||
};
|
};
|
||||||
this.requestTiles(mapRef.leafletObject); // not ideal because I found this from experimentation, not documentation
|
this.requestTiles(mapRef.leafletObject); // not ideal because I found this from experimentation, not documentation
|
||||||
} else if (this.isStarredActive) {
|
|
||||||
await this.searchStarred();
|
|
||||||
} else {
|
} else {
|
||||||
await this.searchAll();
|
await this.searchAll();
|
||||||
}
|
}
|
||||||
@@ -591,60 +544,6 @@ export default class DiscoverView extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async searchStarred() {
|
|
||||||
this.resetCounts();
|
|
||||||
|
|
||||||
// Clear any previous results
|
|
||||||
this.projects = [];
|
|
||||||
this.userProfiles = [];
|
|
||||||
|
|
||||||
try {
|
|
||||||
this.isLoading = true;
|
|
||||||
|
|
||||||
// Get starred project IDs from settings
|
|
||||||
const settings = await this.$accountSettings();
|
|
||||||
|
|
||||||
const starredIds = settings.starredPlanHandleIds || [];
|
|
||||||
if (starredIds.length === 0) {
|
|
||||||
// No starred projects
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// This could be optimized to only pull those not already in the cache (endorserServer.ts)
|
|
||||||
|
|
||||||
const planHandleIdsJson = JSON.stringify(starredIds);
|
|
||||||
const endpoint =
|
|
||||||
this.apiServer +
|
|
||||||
"/api/v2/report/plans?planHandleIds=" +
|
|
||||||
encodeURIComponent(planHandleIdsJson);
|
|
||||||
const response = await this.axios.get(endpoint, {
|
|
||||||
headers: await getHeaders(this.activeDid),
|
|
||||||
});
|
|
||||||
if (response.status !== 200) {
|
|
||||||
this.notify.error("Failed to load starred projects", TIMEOUTS.SHORT);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const starredPlans: PlanData[] = response.data.data;
|
|
||||||
if (response.data.hitLimit) {
|
|
||||||
// someday we'll have to let them incrementally load the rest
|
|
||||||
this.notify.warning(
|
|
||||||
"Beware: you have so many starred projects that we cannot load them all.",
|
|
||||||
TIMEOUTS.SHORT,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
this.projects = starredPlans;
|
|
||||||
} catch (error: unknown) {
|
|
||||||
logger.error("Error loading starred projects:", error);
|
|
||||||
this.notify.error(
|
|
||||||
"Failed to load starred projects. Please try again.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
} finally {
|
|
||||||
this.isLoading = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async searchLocal(beforeId?: string) {
|
public async searchLocal(beforeId?: string) {
|
||||||
this.resetCounts();
|
this.resetCounts();
|
||||||
|
|
||||||
@@ -738,12 +637,9 @@ export default class DiscoverView extends Vue {
|
|||||||
const latestProject = this.projects[this.projects.length - 1];
|
const latestProject = this.projects[this.projects.length - 1];
|
||||||
if (this.isLocalActive || this.isMappedActive) {
|
if (this.isLocalActive || this.isMappedActive) {
|
||||||
this.searchLocal(latestProject.rowId);
|
this.searchLocal(latestProject.rowId);
|
||||||
} else if (this.isStarredActive) {
|
|
||||||
this.searchStarred();
|
|
||||||
} else if (this.isAnywhereActive) {
|
} else if (this.isAnywhereActive) {
|
||||||
this.searchAll(latestProject.rowId);
|
this.searchAll(latestProject.rowId);
|
||||||
}
|
}
|
||||||
// Note: Starred tab doesn't support pagination since we load all starred projects at once
|
|
||||||
} else if (this.isPeopleActive && this.userProfiles.length > 0) {
|
} else if (this.isPeopleActive && this.userProfiles.length > 0) {
|
||||||
const latestProfile = this.userProfiles[this.userProfiles.length - 1];
|
const latestProfile = this.userProfiles[this.userProfiles.length - 1];
|
||||||
if (this.isLocalActive || this.isMappedActive) {
|
if (this.isLocalActive || this.isMappedActive) {
|
||||||
@@ -883,24 +779,6 @@ export default class DiscoverView extends Vue {
|
|||||||
this.$router.push(route);
|
this.$router.push(route);
|
||||||
}
|
}
|
||||||
|
|
||||||
public computedStarredTabStyleClassNames() {
|
|
||||||
return {
|
|
||||||
"inline-block": true,
|
|
||||||
"py-3": true,
|
|
||||||
"rounded-t-lg": true,
|
|
||||||
"border-b-2": true,
|
|
||||||
|
|
||||||
active: this.isStarredActive,
|
|
||||||
"text-black": this.isStarredActive,
|
|
||||||
"border-black": this.isStarredActive,
|
|
||||||
"font-semibold": this.isStarredActive,
|
|
||||||
|
|
||||||
"text-blue-600": !this.isStarredActive,
|
|
||||||
"border-transparent": !this.isStarredActive,
|
|
||||||
"hover:border-slate-400": !this.isStarredActive,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public computedLocalTabStyleClassNames() {
|
public computedLocalTabStyleClassNames() {
|
||||||
return {
|
return {
|
||||||
"inline-block": true,
|
"inline-block": true,
|
||||||
|
|||||||
@@ -170,10 +170,10 @@ Raymer * @version 1.0.0 */
|
|||||||
class="border-t p-2 border-slate-300"
|
class="border-t p-2 border-slate-300"
|
||||||
@click="goToActivityToUserPage()"
|
@click="goToActivityToUserPage()"
|
||||||
>
|
>
|
||||||
<div class="flex justify-center gap-2">
|
<div class="flex justify-center">
|
||||||
<div
|
<div
|
||||||
v-if="numNewOffersToUser"
|
v-if="numNewOffersToUser"
|
||||||
class="bg-gradient-to-b from-green-400 to-green-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] flex-1 px-4 py-4 rounded-md text-white cursor-pointer"
|
class="bg-gradient-to-b from-green-400 to-green-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] m-1 px-4 py-4 rounded-md text-white"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
class="block text-center text-6xl"
|
class="block text-center text-6xl"
|
||||||
@@ -187,7 +187,7 @@ Raymer * @version 1.0.0 */
|
|||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="numNewOffersToUserProjects"
|
v-if="numNewOffersToUserProjects"
|
||||||
class="bg-gradient-to-b from-green-400 to-green-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] flex-1 px-4 py-4 rounded-md text-white cursor-pointer"
|
class="bg-gradient-to-b from-green-400 to-green-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] m-1 px-4 py-4 rounded-md text-white"
|
||||||
>
|
>
|
||||||
<span
|
<span
|
||||||
class="block text-center text-6xl"
|
class="block text-center text-6xl"
|
||||||
@@ -201,22 +201,6 @@ Raymer * @version 1.0.0 */
|
|||||||
projects
|
projects
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div
|
|
||||||
v-if="numNewStarredProjectChanges"
|
|
||||||
class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] flex-1 px-4 py-4 rounded-md text-white cursor-pointer"
|
|
||||||
>
|
|
||||||
<span
|
|
||||||
class="block text-center text-6xl"
|
|
||||||
data-testId="newStarredProjectChangesActivityNumber"
|
|
||||||
>
|
|
||||||
{{ numNewStarredProjectChanges
|
|
||||||
}}{{ newStarredProjectChangesHitLimit ? "+" : "" }}
|
|
||||||
</span>
|
|
||||||
<p class="text-center">
|
|
||||||
starred project{{ numNewStarredProjectChanges === 1 ? "" : "s" }}
|
|
||||||
with changes
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="flex justify-end mt-2">
|
<div class="flex justify-end mt-2">
|
||||||
<button class="text-blue-500">View All New Activity For You</button>
|
<button class="text-blue-500">View All New Activity For You</button>
|
||||||
@@ -284,7 +268,6 @@ import {
|
|||||||
getHeaders,
|
getHeaders,
|
||||||
getNewOffersToUser,
|
getNewOffersToUser,
|
||||||
getNewOffersToUserProjects,
|
getNewOffersToUserProjects,
|
||||||
getStarredProjectsWithChanges,
|
|
||||||
getPlanFromCache,
|
getPlanFromCache,
|
||||||
} from "../libs/endorserServer";
|
} from "../libs/endorserServer";
|
||||||
import {
|
import {
|
||||||
@@ -301,7 +284,6 @@ import { NOTIFY_CONTACT_LOADING_ISSUE } from "@/constants/notifications";
|
|||||||
import * as Package from "../../package.json";
|
import * as Package from "../../package.json";
|
||||||
import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
|
import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
|
||||||
import { errorStringForLog } from "../libs/endorserServer";
|
import { errorStringForLog } from "../libs/endorserServer";
|
||||||
import * as databaseUtil from "../db/databaseUtil";
|
|
||||||
|
|
||||||
// consolidate this with GiveActionClaim in src/interfaces/claims.ts
|
// consolidate this with GiveActionClaim in src/interfaces/claims.ts
|
||||||
interface Claim {
|
interface Claim {
|
||||||
@@ -414,25 +396,11 @@ export default class HomeView extends Vue {
|
|||||||
isRegistered = false;
|
isRegistered = false;
|
||||||
lastAckedOfferToUserJwtId?: string; // the last JWT ID for offer-to-user that they've acknowledged seeing
|
lastAckedOfferToUserJwtId?: string; // the last JWT ID for offer-to-user that they've acknowledged seeing
|
||||||
lastAckedOfferToUserProjectsJwtId?: string; // the last JWT ID for offers-to-user's-projects that they've acknowledged seeing
|
lastAckedOfferToUserProjectsJwtId?: string; // the last JWT ID for offers-to-user's-projects that they've acknowledged seeing
|
||||||
lastAckedStarredPlanChangesJwtId?: string; // the last JWT ID for starred project changes that they've acknowledged seeing
|
|
||||||
newOffersToUserHitLimit: boolean = false;
|
newOffersToUserHitLimit: boolean = false;
|
||||||
newOffersToUserProjectsHitLimit: boolean = false;
|
newOffersToUserProjectsHitLimit: boolean = false;
|
||||||
newStarredProjectChangesHitLimit: boolean = false;
|
|
||||||
numNewOffersToUser: number = 0; // number of new offers-to-user
|
numNewOffersToUser: number = 0; // number of new offers-to-user
|
||||||
numNewOffersToUserProjects: number = 0; // number of new offers-to-user's-projects
|
numNewOffersToUserProjects: number = 0; // number of new offers-to-user's-projects
|
||||||
|
|
||||||
numNewStarredProjectChanges: number = 0; // number of new starred project changes
|
|
||||||
starredPlanHandleIds: Array<string> = []; // list of starred project IDs
|
|
||||||
searchBoxes: Array<{
|
|
||||||
name: string;
|
|
||||||
bbox: BoundingBox;
|
|
||||||
}> = [];
|
|
||||||
showShortcutBvc = false;
|
|
||||||
userAgentInfo = new UAParser(); // see https://docs.uaparser.js.org/v2/api/ua-parser-js/get-os.html
|
|
||||||
selectedImage = "";
|
|
||||||
isImageViewerOpen = false;
|
|
||||||
showProjectsDialog = false;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* CRITICAL VUE REACTIVITY BUG WORKAROUND
|
* CRITICAL VUE REACTIVITY BUG WORKAROUND
|
||||||
*
|
*
|
||||||
@@ -470,6 +438,16 @@ export default class HomeView extends Vue {
|
|||||||
// return shouldShow;
|
// return shouldShow;
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
searchBoxes: Array<{
|
||||||
|
name: string;
|
||||||
|
bbox: BoundingBox;
|
||||||
|
}> = [];
|
||||||
|
showShortcutBvc = false;
|
||||||
|
userAgentInfo = new UAParser(); // see https://docs.uaparser.js.org/v2/api/ua-parser-js/get-os.html
|
||||||
|
selectedImage = "";
|
||||||
|
isImageViewerOpen = false;
|
||||||
|
showProjectsDialog = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initializes notification helpers
|
* Initializes notification helpers
|
||||||
*/
|
*/
|
||||||
@@ -520,7 +498,6 @@ export default class HomeView extends Vue {
|
|||||||
this.numNewOffersToUser + this.numNewOffersToUserProjects > 0,
|
this.numNewOffersToUser + this.numNewOffersToUserProjects > 0,
|
||||||
});
|
});
|
||||||
|
|
||||||
await this.loadNewStarredProjectChanges();
|
|
||||||
await this.checkOnboarding();
|
await this.checkOnboarding();
|
||||||
|
|
||||||
logger.debug("[HomeView] mounted() - component lifecycle completed", {
|
logger.debug("[HomeView] mounted() - component lifecycle completed", {
|
||||||
@@ -646,14 +623,8 @@ export default class HomeView extends Vue {
|
|||||||
this.lastAckedOfferToUserJwtId = settings.lastAckedOfferToUserJwtId;
|
this.lastAckedOfferToUserJwtId = settings.lastAckedOfferToUserJwtId;
|
||||||
this.lastAckedOfferToUserProjectsJwtId =
|
this.lastAckedOfferToUserProjectsJwtId =
|
||||||
settings.lastAckedOfferToUserProjectsJwtId;
|
settings.lastAckedOfferToUserProjectsJwtId;
|
||||||
this.lastAckedStarredPlanChangesJwtId =
|
|
||||||
settings.lastAckedStarredPlanChangesJwtId;
|
|
||||||
this.searchBoxes = settings.searchBoxes || [];
|
this.searchBoxes = settings.searchBoxes || [];
|
||||||
this.showShortcutBvc = !!settings.showShortcutBvc;
|
this.showShortcutBvc = !!settings.showShortcutBvc;
|
||||||
this.starredPlanHandleIds = databaseUtil.parseJsonField(
|
|
||||||
settings.starredPlanHandleIds,
|
|
||||||
[],
|
|
||||||
);
|
|
||||||
this.isAnyFeedFilterOn = checkIsAnyFeedFilterOn(settings);
|
this.isAnyFeedFilterOn = checkIsAnyFeedFilterOn(settings);
|
||||||
|
|
||||||
// Check onboarding status
|
// Check onboarding status
|
||||||
@@ -734,7 +705,7 @@ export default class HomeView extends Vue {
|
|||||||
* Used for displaying contact info in feed and actions
|
* Used for displaying contact info in feed and actions
|
||||||
*
|
*
|
||||||
* @internal
|
* @internal
|
||||||
* Called by initializeIdentity()
|
* Called by mounted() and initializeIdentity()
|
||||||
*/
|
*/
|
||||||
private async loadContacts() {
|
private async loadContacts() {
|
||||||
this.allContacts = await this.$contacts();
|
this.allContacts = await this.$contacts();
|
||||||
@@ -748,6 +719,7 @@ export default class HomeView extends Vue {
|
|||||||
* Triggers updateAllFeed() to populate activity feed
|
* Triggers updateAllFeed() to populate activity feed
|
||||||
*
|
*
|
||||||
* @internal
|
* @internal
|
||||||
|
* Called by mounted()
|
||||||
*/
|
*/
|
||||||
private async loadFeedData() {
|
private async loadFeedData() {
|
||||||
await this.updateAllFeed();
|
await this.updateAllFeed();
|
||||||
@@ -761,6 +733,7 @@ export default class HomeView extends Vue {
|
|||||||
* - Rate limit status for both
|
* - Rate limit status for both
|
||||||
*
|
*
|
||||||
* @internal
|
* @internal
|
||||||
|
* Called by mounted() and initializeIdentity()
|
||||||
* @requires Active DID
|
* @requires Active DID
|
||||||
*/
|
*/
|
||||||
private async loadNewOffers() {
|
private async loadNewOffers() {
|
||||||
@@ -864,42 +837,6 @@ export default class HomeView extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Loads new changes for starred projects
|
|
||||||
* Updates:
|
|
||||||
* - Number of new starred project changes
|
|
||||||
* - Rate limit status for starred project changes
|
|
||||||
*
|
|
||||||
* @internal
|
|
||||||
* @requires Active DID
|
|
||||||
*/
|
|
||||||
private async loadNewStarredProjectChanges() {
|
|
||||||
if (this.activeDid && this.starredPlanHandleIds.length > 0) {
|
|
||||||
try {
|
|
||||||
const starredProjectChanges = await getStarredProjectsWithChanges(
|
|
||||||
this.axios,
|
|
||||||
this.apiServer,
|
|
||||||
this.activeDid,
|
|
||||||
this.starredPlanHandleIds,
|
|
||||||
this.lastAckedStarredPlanChangesJwtId,
|
|
||||||
);
|
|
||||||
this.numNewStarredProjectChanges = starredProjectChanges.data.length;
|
|
||||||
this.newStarredProjectChangesHitLimit = starredProjectChanges.hitLimit;
|
|
||||||
} catch (error) {
|
|
||||||
// Don't show errors for starred project changes as it's a secondary feature
|
|
||||||
logger.warn(
|
|
||||||
"[HomeView] Failed to load starred project changes:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
this.numNewStarredProjectChanges = 0;
|
|
||||||
this.newStarredProjectChangesHitLimit = false;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
this.numNewStarredProjectChanges = 0;
|
|
||||||
this.newStarredProjectChangesHitLimit = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks if user needs onboarding using ultra-concise mixin utilities
|
* Checks if user needs onboarding using ultra-concise mixin utilities
|
||||||
* Opens onboarding dialog if not completed
|
* Opens onboarding dialog if not completed
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
v-if="newOffersToUser.length > 0"
|
v-if="newOffersToUser.length > 0"
|
||||||
:icon="showOffersDetails ? 'chevron-down' : 'chevron-right'"
|
:icon="showOffersDetails ? 'chevron-down' : 'chevron-right'"
|
||||||
class="cursor-pointer ml-4 mr-4 text-lg"
|
class="cursor-pointer ml-4 mr-4 text-lg"
|
||||||
@click.prevent="expandOffersToUserAndMarkRead()"
|
@click="expandOffersToUserAndMarkRead()"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<a class="text-blue-500 cursor-pointer" @click="handleSeeAllOffersToUser">
|
<a class="text-blue-500 cursor-pointer" @click="handleSeeAllOffersToUser">
|
||||||
@@ -48,7 +48,7 @@
|
|||||||
didInfo(offer.offeredByDid, activeDid, allMyDids, allContacts)
|
didInfo(offer.offeredByDid, activeDid, allMyDids, allContacts)
|
||||||
}}</span>
|
}}</span>
|
||||||
offered
|
offered
|
||||||
<span v-if="offer.objectDescription" class="truncate">{{
|
<span v-if="offer.objectDescription">{{
|
||||||
offer.objectDescription
|
offer.objectDescription
|
||||||
}}</span
|
}}</span
|
||||||
>{{ offer.objectDescription && offer.amount ? ", and " : "" }}
|
>{{ offer.objectDescription && offer.amount ? ", and " : "" }}
|
||||||
@@ -67,10 +67,10 @@
|
|||||||
<!-- New line that appears on hover or when the offer is clicked -->
|
<!-- New line that appears on hover or when the offer is clicked -->
|
||||||
<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"
|
||||||
@click.prevent="markOffersAsReadStartingWith(offer.jwtId)"
|
@click="markOffersAsReadStartingWith(offer.jwtId)"
|
||||||
>
|
>
|
||||||
<span class="inline-block w-8 h-px bg-gray-500 mr-2" />
|
<span class="inline-block w-8 h-px bg-gray-500 mr-2" />
|
||||||
Click to keep all above as unread offers
|
Click to keep all above as new offers
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
@@ -96,7 +96,7 @@
|
|||||||
showOffersToUserProjectsDetails ? 'chevron-down' : 'chevron-right'
|
showOffersToUserProjectsDetails ? 'chevron-down' : 'chevron-right'
|
||||||
"
|
"
|
||||||
class="cursor-pointer ml-4 mr-4 text-lg"
|
class="cursor-pointer ml-4 mr-4 text-lg"
|
||||||
@click.prevent="expandOffersToUserProjectsAndMarkRead()"
|
@click="expandOffersToUserProjectsAndMarkRead()"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<a
|
<a
|
||||||
@@ -118,7 +118,7 @@
|
|||||||
didInfo(offer.offeredByDid, activeDid, allMyDids, allContacts)
|
didInfo(offer.offeredByDid, activeDid, allMyDids, allContacts)
|
||||||
}}</span>
|
}}</span>
|
||||||
offered
|
offered
|
||||||
<span v-if="offer.objectDescription" class="truncate">{{
|
<span v-if="offer.objectDescription">{{
|
||||||
offer.objectDescription
|
offer.objectDescription
|
||||||
}}</span
|
}}</span
|
||||||
>{{ offer.objectDescription && offer.amount ? ", and " : "" }}
|
>{{ offer.objectDescription && offer.amount ? ", and " : "" }}
|
||||||
@@ -139,153 +139,10 @@
|
|||||||
<!-- 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"
|
||||||
@click.prevent="
|
@click="markOffersToUserProjectsAsReadStartingWith(offer.jwtId)"
|
||||||
markOffersToUserProjectsAsReadStartingWith(offer.jwtId)
|
|
||||||
"
|
|
||||||
>
|
>
|
||||||
<span class="inline-block w-8 h-px bg-gray-500 mr-2" />
|
<span class="inline-block w-8 h-px bg-gray-500 mr-2" />
|
||||||
Click to keep all above as unread offers
|
Click to keep all above as new offers
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Starred Projects with Changes Section -->
|
|
||||||
<div
|
|
||||||
class="flex justify-between mt-6"
|
|
||||||
data-testId="showStarredProjectChanges"
|
|
||||||
>
|
|
||||||
<div>
|
|
||||||
<span class="text-lg font-medium"
|
|
||||||
>{{ newStarredProjectChanges.length
|
|
||||||
}}{{ newStarredProjectChangesHitLimit ? "+" : "" }}</span
|
|
||||||
>
|
|
||||||
<span class="text-lg font-medium ml-4"
|
|
||||||
>Starred Project{{
|
|
||||||
newStarredProjectChanges.length === 1 ? "" : "s"
|
|
||||||
}}
|
|
||||||
With Changes</span
|
|
||||||
>
|
|
||||||
<font-awesome
|
|
||||||
v-if="newStarredProjectChanges.length > 0"
|
|
||||||
:icon="
|
|
||||||
showStarredProjectChangesDetails ? 'chevron-down' : 'chevron-right'
|
|
||||||
"
|
|
||||||
class="cursor-pointer ml-4 mr-4 text-lg"
|
|
||||||
@click.prevent="expandStarredProjectChangesAndMarkRead()"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="showStarredProjectChangesDetails" class="ml-4 mt-4">
|
|
||||||
<ul class="list-disc ml-4">
|
|
||||||
<li
|
|
||||||
v-for="projectChange in newStarredProjectChanges"
|
|
||||||
:key="projectChange.plan.handleId"
|
|
||||||
class="mt-4 relative group"
|
|
||||||
>
|
|
||||||
<div class="flex items-center gap-2">
|
|
||||||
<div class="flex-1 min-w-0">
|
|
||||||
<span class="font-medium">{{
|
|
||||||
projectChange.plan.name || "Unnamed Project"
|
|
||||||
}}</span>
|
|
||||||
<span
|
|
||||||
v-if="projectChange.plan.description"
|
|
||||||
class="text-gray-600 block truncate"
|
|
||||||
>
|
|
||||||
{{ projectChange.plan.description }}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<router-link
|
|
||||||
:to="{
|
|
||||||
path:
|
|
||||||
'/project/' + encodeURIComponent(projectChange.plan.handleId),
|
|
||||||
}"
|
|
||||||
class="text-blue-500 flex-shrink-0"
|
|
||||||
>
|
|
||||||
<font-awesome
|
|
||||||
icon="file-lines"
|
|
||||||
class="text-blue-500 cursor-pointer"
|
|
||||||
/>
|
|
||||||
</router-link>
|
|
||||||
</div>
|
|
||||||
<!-- Show what changed -->
|
|
||||||
<div
|
|
||||||
v-if="getPlanDifferences(projectChange.plan.handleId)"
|
|
||||||
class="text-sm mt-2"
|
|
||||||
>
|
|
||||||
<div class="font-medium mb-2">Changes</div>
|
|
||||||
<div class="overflow-x-auto">
|
|
||||||
<table
|
|
||||||
class="w-full text-xs border-collapse border border-gray-300 rounded-lg shadow-sm bg-white"
|
|
||||||
>
|
|
||||||
<thead>
|
|
||||||
<tr class="bg-gray-50">
|
|
||||||
<th
|
|
||||||
class="border border-gray-300 px-3 py-2 text-left font-semibold text-gray-700"
|
|
||||||
></th>
|
|
||||||
<th
|
|
||||||
class="border border-gray-300 px-3 py-2 text-left font-semibold text-gray-700"
|
|
||||||
>
|
|
||||||
Previous
|
|
||||||
</th>
|
|
||||||
<th
|
|
||||||
class="border border-gray-300 px-3 py-2 text-left font-semibold text-gray-700"
|
|
||||||
>
|
|
||||||
Current
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<tr
|
|
||||||
v-for="(difference, field) in getPlanDifferences(
|
|
||||||
projectChange.plan.handleId,
|
|
||||||
)"
|
|
||||||
:key="field"
|
|
||||||
class="hover:bg-gray-50"
|
|
||||||
>
|
|
||||||
<td
|
|
||||||
class="border border-gray-300 px-3 py-2 font-medium text-gray-800 break-words"
|
|
||||||
>
|
|
||||||
{{ getDisplayFieldName(field) }}
|
|
||||||
</td>
|
|
||||||
<td
|
|
||||||
class="border border-gray-300 px-3 py-2 text-gray-600 break-words align-top"
|
|
||||||
>
|
|
||||||
<vue-markdown
|
|
||||||
v-if="field === 'description' && difference.old"
|
|
||||||
:source="formatFieldValue(difference.old)"
|
|
||||||
class="markdown-content"
|
|
||||||
/>
|
|
||||||
<span v-else>{{ formatFieldValue(difference.old) }}</span>
|
|
||||||
</td>
|
|
||||||
<td
|
|
||||||
class="border border-gray-300 px-3 py-2 text-green-700 font-medium break-words align-top"
|
|
||||||
>
|
|
||||||
<vue-markdown
|
|
||||||
v-if="field === 'description' && difference.new"
|
|
||||||
:source="formatFieldValue(difference.new)"
|
|
||||||
class="markdown-content"
|
|
||||||
/>
|
|
||||||
<span v-else>{{ formatFieldValue(difference.new) }}</span>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div v-else>The changes did not affect essential project data.</div>
|
|
||||||
<!-- New line that appears on hover -->
|
|
||||||
<div
|
|
||||||
class="absolute left-0 w-full text-left text-gray-500 text-sm hidden group-hover:flex cursor-pointer items-center"
|
|
||||||
@click.prevent="
|
|
||||||
markStarredProjectChangesAsReadStartingWith(
|
|
||||||
projectChange.plan.jwtId!,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<span class="inline-block w-8 h-px bg-gray-500 mr-2" />
|
|
||||||
Click to keep all above as unread changes
|
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
@@ -295,7 +152,6 @@
|
|||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
import VueMarkdown from "vue-markdown-render";
|
|
||||||
|
|
||||||
import GiftedDialog from "../components/GiftedDialog.vue";
|
import GiftedDialog from "../components/GiftedDialog.vue";
|
||||||
import QuickNav from "../components/QuickNav.vue";
|
import QuickNav from "../components/QuickNav.vue";
|
||||||
@@ -306,28 +162,20 @@ import { Router } from "vue-router";
|
|||||||
import {
|
import {
|
||||||
OfferSummaryRecord,
|
OfferSummaryRecord,
|
||||||
OfferToPlanSummaryRecord,
|
OfferToPlanSummaryRecord,
|
||||||
PlanSummaryAndPreviousClaim,
|
|
||||||
PlanSummaryRecord,
|
|
||||||
} from "../interfaces/records";
|
} from "../interfaces/records";
|
||||||
import {
|
import {
|
||||||
didInfo,
|
didInfo,
|
||||||
didInfoOrNobody,
|
|
||||||
displayAmount,
|
displayAmount,
|
||||||
getNewOffersToUser,
|
getNewOffersToUser,
|
||||||
getNewOffersToUserProjects,
|
getNewOffersToUserProjects,
|
||||||
getStarredProjectsWithChanges,
|
|
||||||
} from "../libs/endorserServer";
|
} from "../libs/endorserServer";
|
||||||
import { retrieveAccountDids } from "../libs/util";
|
import { retrieveAccountDids } from "../libs/util";
|
||||||
import { logger } from "../utils/logger";
|
import { logger } from "../utils/logger";
|
||||||
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
||||||
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
||||||
import * as databaseUtil from "../db/databaseUtil";
|
|
||||||
import * as R from "ramda";
|
|
||||||
import { PlanActionClaim } from "../interfaces/claims";
|
|
||||||
import { GenericCredWrapper } from "@/interfaces";
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: { GiftedDialog, QuickNav, EntityIcon, VueMarkdown },
|
components: { GiftedDialog, QuickNav, EntityIcon },
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
})
|
})
|
||||||
export default class NewActivityView extends Vue {
|
export default class NewActivityView extends Vue {
|
||||||
@@ -341,22 +189,13 @@ export default class NewActivityView extends Vue {
|
|||||||
apiServer = "";
|
apiServer = "";
|
||||||
lastAckedOfferToUserJwtId = "";
|
lastAckedOfferToUserJwtId = "";
|
||||||
lastAckedOfferToUserProjectsJwtId = "";
|
lastAckedOfferToUserProjectsJwtId = "";
|
||||||
lastAckedStarredPlanChangesJwtId = "";
|
|
||||||
newOffersToUser: Array<OfferSummaryRecord> = [];
|
newOffersToUser: Array<OfferSummaryRecord> = [];
|
||||||
newOffersToUserHitLimit = false;
|
newOffersToUserHitLimit = false;
|
||||||
newOffersToUserProjects: Array<OfferToPlanSummaryRecord> = [];
|
newOffersToUserProjects: Array<OfferToPlanSummaryRecord> = [];
|
||||||
newOffersToUserProjectsHitLimit = false;
|
newOffersToUserProjectsHitLimit = false;
|
||||||
newStarredProjectChanges: Array<PlanSummaryAndPreviousClaim> = [];
|
|
||||||
newStarredProjectChangesHitLimit = false;
|
|
||||||
starredPlanHandleIds: Array<string> = [];
|
|
||||||
planDifferences: Record<
|
|
||||||
string,
|
|
||||||
Record<string, { old: unknown; new: unknown }>
|
|
||||||
> = {};
|
|
||||||
|
|
||||||
showOffersDetails = false;
|
showOffersDetails = false;
|
||||||
showOffersToUserProjectsDetails = false;
|
showOffersToUserProjectsDetails = false;
|
||||||
showStarredProjectChangesDetails = false;
|
|
||||||
didInfo = didInfo;
|
didInfo = didInfo;
|
||||||
displayAmount = displayAmount;
|
displayAmount = displayAmount;
|
||||||
|
|
||||||
@@ -375,12 +214,6 @@ export default class NewActivityView extends Vue {
|
|||||||
this.lastAckedOfferToUserJwtId = settings.lastAckedOfferToUserJwtId || "";
|
this.lastAckedOfferToUserJwtId = settings.lastAckedOfferToUserJwtId || "";
|
||||||
this.lastAckedOfferToUserProjectsJwtId =
|
this.lastAckedOfferToUserProjectsJwtId =
|
||||||
settings.lastAckedOfferToUserProjectsJwtId || "";
|
settings.lastAckedOfferToUserProjectsJwtId || "";
|
||||||
this.lastAckedStarredPlanChangesJwtId =
|
|
||||||
settings.lastAckedStarredPlanChangesJwtId || "";
|
|
||||||
this.starredPlanHandleIds = databaseUtil.parseJsonField(
|
|
||||||
settings.starredPlanHandleIds,
|
|
||||||
[],
|
|
||||||
);
|
|
||||||
|
|
||||||
this.allContacts = await this.$getAllContacts();
|
this.allContacts = await this.$getAllContacts();
|
||||||
|
|
||||||
@@ -404,29 +237,6 @@ export default class NewActivityView extends Vue {
|
|||||||
this.newOffersToUserProjects = offersToUserProjectsData.data;
|
this.newOffersToUserProjects = offersToUserProjectsData.data;
|
||||||
this.newOffersToUserProjectsHitLimit = offersToUserProjectsData.hitLimit;
|
this.newOffersToUserProjectsHitLimit = offersToUserProjectsData.hitLimit;
|
||||||
|
|
||||||
// Load starred project changes if user has starred projects
|
|
||||||
if (this.starredPlanHandleIds.length > 0) {
|
|
||||||
try {
|
|
||||||
const starredProjectChangesData = await getStarredProjectsWithChanges(
|
|
||||||
this.axios,
|
|
||||||
this.apiServer,
|
|
||||||
this.activeDid,
|
|
||||||
this.starredPlanHandleIds,
|
|
||||||
this.lastAckedStarredPlanChangesJwtId,
|
|
||||||
);
|
|
||||||
this.newStarredProjectChanges = starredProjectChangesData.data;
|
|
||||||
this.newStarredProjectChangesHitLimit =
|
|
||||||
starredProjectChangesData.hitLimit;
|
|
||||||
|
|
||||||
// Analyze differences between current plans and previous claims
|
|
||||||
this.analyzePlanDifferences(this.newStarredProjectChanges);
|
|
||||||
} catch (error) {
|
|
||||||
logger.warn("Failed to load starred project changes:", error);
|
|
||||||
this.newStarredProjectChanges = [];
|
|
||||||
this.newStarredProjectChangesHitLimit = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
logger.error("Error retrieving settings & contacts:", err);
|
logger.error("Error retrieving settings & contacts:", err);
|
||||||
@@ -440,13 +250,13 @@ export default class NewActivityView extends Vue {
|
|||||||
async expandOffersToUserAndMarkRead() {
|
async expandOffersToUserAndMarkRead() {
|
||||||
this.showOffersDetails = !this.showOffersDetails;
|
this.showOffersDetails = !this.showOffersDetails;
|
||||||
if (this.showOffersDetails && this.newOffersToUser.length > 0) {
|
if (this.showOffersDetails && this.newOffersToUser.length > 0) {
|
||||||
await this.$saveUserSettings(this.activeDid, {
|
await this.$updateSettings({
|
||||||
lastAckedOfferToUserJwtId: this.newOffersToUser[0].jwtId,
|
lastAckedOfferToUserJwtId: this.newOffersToUser[0].jwtId,
|
||||||
});
|
});
|
||||||
// note that we don't update this.lastAckedOfferToUserJwtId in case they
|
// note that we don't update this.lastAckedOfferToUserJwtId in case they
|
||||||
// later choose the last one to keep the offers as new
|
// later choose the last one to keep the offers as new
|
||||||
this.notify.info(
|
this.notify.info(
|
||||||
"The offers are marked as read. Click in the list to keep them unread.",
|
"The offers are marked as viewed. Click in the list to keep them as new.",
|
||||||
TIMEOUTS.LONG,
|
TIMEOUTS.LONG,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -458,12 +268,12 @@ export default class NewActivityView extends Vue {
|
|||||||
);
|
);
|
||||||
if (index !== -1 && index < this.newOffersToUser.length - 1) {
|
if (index !== -1 && index < this.newOffersToUser.length - 1) {
|
||||||
// Set to the next offer's jwtId
|
// Set to the next offer's jwtId
|
||||||
await this.$saveUserSettings(this.activeDid, {
|
await this.$updateSettings({
|
||||||
lastAckedOfferToUserJwtId: this.newOffersToUser[index + 1].jwtId,
|
lastAckedOfferToUserJwtId: this.newOffersToUser[index + 1].jwtId,
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// it's the last entry (or not found), so just keep it the same
|
// it's the last entry (or not found), so just keep it the same
|
||||||
await this.$saveUserSettings(this.activeDid, {
|
await this.$updateSettings({
|
||||||
lastAckedOfferToUserJwtId: this.lastAckedOfferToUserJwtId,
|
lastAckedOfferToUserJwtId: this.lastAckedOfferToUserJwtId,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -480,14 +290,14 @@ export default class NewActivityView extends Vue {
|
|||||||
this.showOffersToUserProjectsDetails &&
|
this.showOffersToUserProjectsDetails &&
|
||||||
this.newOffersToUserProjects.length > 0
|
this.newOffersToUserProjects.length > 0
|
||||||
) {
|
) {
|
||||||
await this.$saveUserSettings(this.activeDid, {
|
await this.$updateSettings({
|
||||||
lastAckedOfferToUserProjectsJwtId:
|
lastAckedOfferToUserProjectsJwtId:
|
||||||
this.newOffersToUserProjects[0].jwtId,
|
this.newOffersToUserProjects[0].jwtId,
|
||||||
});
|
});
|
||||||
// note that we don't update this.lastAckedOfferToUserProjectsJwtId in case
|
// note that we don't update this.lastAckedOfferToUserProjectsJwtId in case
|
||||||
// they later choose the last one to keep the offers as new
|
// they later choose the last one to keep the offers as new
|
||||||
this.notify.info(
|
this.notify.info(
|
||||||
"The offers are now marked read. Click in the list to keep them unread.",
|
"The offers are marked as viewed. Click in the list to keep them as new.",
|
||||||
TIMEOUTS.LONG,
|
TIMEOUTS.LONG,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -499,13 +309,13 @@ export default class NewActivityView extends Vue {
|
|||||||
);
|
);
|
||||||
if (index !== -1 && index < this.newOffersToUserProjects.length - 1) {
|
if (index !== -1 && index < this.newOffersToUserProjects.length - 1) {
|
||||||
// Set to the next offer's jwtId
|
// Set to the next offer's jwtId
|
||||||
await this.$saveUserSettings(this.activeDid, {
|
await this.$updateSettings({
|
||||||
lastAckedOfferToUserProjectsJwtId:
|
lastAckedOfferToUserProjectsJwtId:
|
||||||
this.newOffersToUserProjects[index + 1].jwtId,
|
this.newOffersToUserProjects[index + 1].jwtId,
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// it's the last entry (or not found), so just keep it the same
|
// it's the last entry (or not found), so just keep it the same
|
||||||
await this.$saveUserSettings(this.activeDid, {
|
await this.$updateSettings({
|
||||||
lastAckedOfferToUserProjectsJwtId:
|
lastAckedOfferToUserProjectsJwtId:
|
||||||
this.lastAckedOfferToUserProjectsJwtId,
|
this.lastAckedOfferToUserProjectsJwtId,
|
||||||
});
|
});
|
||||||
@@ -523,382 +333,5 @@ export default class NewActivityView extends Vue {
|
|||||||
async handleSeeAllOffersToUserProjects() {
|
async handleSeeAllOffersToUserProjects() {
|
||||||
this.$router.push("/recent-offers-to-user-projects");
|
this.$router.push("/recent-offers-to-user-projects");
|
||||||
}
|
}
|
||||||
|
|
||||||
async expandStarredProjectChangesAndMarkRead() {
|
|
||||||
this.showStarredProjectChangesDetails =
|
|
||||||
!this.showStarredProjectChangesDetails;
|
|
||||||
if (
|
|
||||||
this.showStarredProjectChangesDetails &&
|
|
||||||
this.newStarredProjectChanges.length > 0
|
|
||||||
) {
|
|
||||||
await this.$saveUserSettings(this.activeDid, {
|
|
||||||
lastAckedStarredPlanChangesJwtId:
|
|
||||||
this.newStarredProjectChanges[0].plan.jwtId,
|
|
||||||
});
|
|
||||||
this.notify.info(
|
|
||||||
"The starred project changes are now marked read. Click in the list to keep them unread.",
|
|
||||||
TIMEOUTS.LONG,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async markStarredProjectChangesAsReadStartingWith(jwtId: string) {
|
|
||||||
const index = this.newStarredProjectChanges.findIndex(
|
|
||||||
(change) => change.plan.jwtId === jwtId,
|
|
||||||
);
|
|
||||||
if (index !== -1 && index < this.newStarredProjectChanges.length - 1) {
|
|
||||||
// Set to the next change's jwtId
|
|
||||||
await this.$saveUserSettings(this.activeDid, {
|
|
||||||
lastAckedStarredPlanChangesJwtId:
|
|
||||||
this.newStarredProjectChanges[index + 1].plan.jwtId,
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
// it's the last entry (or not found), so just keep it the same
|
|
||||||
await this.$saveUserSettings(this.activeDid, {
|
|
||||||
lastAckedStarredPlanChangesJwtId: this.lastAckedStarredPlanChangesJwtId,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
this.notify.info(
|
|
||||||
"All starred project changes above that line are marked as unread.",
|
|
||||||
TIMEOUTS.STANDARD,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Analyzes differences between current plans and their previous claims
|
|
||||||
*
|
|
||||||
* Walks through a list of PlanSummaryAndPreviousClaim items and stores the
|
|
||||||
* differences between the previous claim and the current plan. This method
|
|
||||||
* extracts the claim from the wrappedClaimBefore object and compares relevant
|
|
||||||
* fields with the current plan.
|
|
||||||
*
|
|
||||||
* @param planChanges Array of PlanSummaryAndPreviousClaim objects to analyze
|
|
||||||
*/
|
|
||||||
analyzePlanDifferences(planChanges: Array<PlanSummaryAndPreviousClaim>) {
|
|
||||||
this.planDifferences = {};
|
|
||||||
|
|
||||||
for (const planChange of planChanges) {
|
|
||||||
const currentPlan: PlanSummaryRecord = planChange.plan;
|
|
||||||
const wrappedClaim: GenericCredWrapper<PlanActionClaim> =
|
|
||||||
planChange.wrappedClaimBefore;
|
|
||||||
|
|
||||||
// Extract the actual claim from the wrapped claim
|
|
||||||
let previousClaim: PlanActionClaim;
|
|
||||||
|
|
||||||
const embeddedClaim: PlanActionClaim = wrappedClaim.claim;
|
|
||||||
if (
|
|
||||||
embeddedClaim &&
|
|
||||||
typeof embeddedClaim === "object" &&
|
|
||||||
"credentialSubject" in embeddedClaim
|
|
||||||
) {
|
|
||||||
// It's a Verifiable Credential
|
|
||||||
previousClaim =
|
|
||||||
(embeddedClaim.credentialSubject as PlanActionClaim) || embeddedClaim;
|
|
||||||
} else {
|
|
||||||
// It's a direct claim
|
|
||||||
previousClaim = embeddedClaim;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!previousClaim || !currentPlan.handleId) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const differences: Record<string, { old: unknown; new: unknown }> = {};
|
|
||||||
|
|
||||||
// Compare name
|
|
||||||
const normalizedOldName = this.normalizeValueForComparison(
|
|
||||||
previousClaim.name,
|
|
||||||
);
|
|
||||||
const normalizedNewName = this.normalizeValueForComparison(
|
|
||||||
currentPlan.name,
|
|
||||||
);
|
|
||||||
if (!R.equals(normalizedOldName, normalizedNewName)) {
|
|
||||||
differences.name = {
|
|
||||||
old: previousClaim.name,
|
|
||||||
new: currentPlan.name,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Compare description
|
|
||||||
const normalizedOldDescription = this.normalizeValueForComparison(
|
|
||||||
previousClaim.description,
|
|
||||||
);
|
|
||||||
const normalizedNewDescription = this.normalizeValueForComparison(
|
|
||||||
currentPlan.description,
|
|
||||||
);
|
|
||||||
if (!R.equals(normalizedOldDescription, normalizedNewDescription)) {
|
|
||||||
differences.description = {
|
|
||||||
old: previousClaim.description,
|
|
||||||
new: currentPlan.description,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Compare location (combine latitude and longitude into one row)
|
|
||||||
const oldLat = this.normalizeValueForComparison(
|
|
||||||
previousClaim.location?.geo?.latitude,
|
|
||||||
);
|
|
||||||
const oldLon = this.normalizeValueForComparison(
|
|
||||||
previousClaim.location?.geo?.longitude,
|
|
||||||
);
|
|
||||||
const newLat = this.normalizeValueForComparison(currentPlan.locLat);
|
|
||||||
const newLon = this.normalizeValueForComparison(currentPlan.locLon);
|
|
||||||
|
|
||||||
if (!R.equals(oldLat, newLat) || !R.equals(oldLon, newLon)) {
|
|
||||||
differences.location = {
|
|
||||||
old: this.formatLocationValue(oldLat, oldLon, true),
|
|
||||||
new: this.formatLocationValue(newLat, newLon, false),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Compare agent (issuer)
|
|
||||||
const oldAgent = didInfoOrNobody(
|
|
||||||
previousClaim.agent?.identifier,
|
|
||||||
this.activeDid,
|
|
||||||
this.allMyDids,
|
|
||||||
this.allContacts,
|
|
||||||
);
|
|
||||||
const newAgent = didInfoOrNobody(
|
|
||||||
currentPlan.agentDid,
|
|
||||||
this.activeDid,
|
|
||||||
this.allMyDids,
|
|
||||||
this.allContacts,
|
|
||||||
);
|
|
||||||
const normalizedOldAgent = this.normalizeValueForComparison(oldAgent);
|
|
||||||
const normalizedNewAgent = this.normalizeValueForComparison(newAgent);
|
|
||||||
if (!R.equals(normalizedOldAgent, normalizedNewAgent)) {
|
|
||||||
differences.agent = {
|
|
||||||
old: oldAgent,
|
|
||||||
new: newAgent,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Compare start time
|
|
||||||
const oldStartTime = previousClaim.startTime;
|
|
||||||
const newStartTime = currentPlan.startTime;
|
|
||||||
const normalizedOldStartTime =
|
|
||||||
this.normalizeDateForComparison(oldStartTime);
|
|
||||||
const normalizedNewStartTime =
|
|
||||||
this.normalizeDateForComparison(newStartTime);
|
|
||||||
if (!R.equals(normalizedOldStartTime, normalizedNewStartTime)) {
|
|
||||||
differences.startTime = {
|
|
||||||
old: oldStartTime,
|
|
||||||
new: newStartTime,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Compare end time
|
|
||||||
const oldEndTime = previousClaim.endTime;
|
|
||||||
const newEndTime = currentPlan.endTime;
|
|
||||||
const normalizedOldEndTime = this.normalizeDateForComparison(oldEndTime);
|
|
||||||
const normalizedNewEndTime = this.normalizeDateForComparison(newEndTime);
|
|
||||||
if (!R.equals(normalizedOldEndTime, normalizedNewEndTime)) {
|
|
||||||
differences.endTime = {
|
|
||||||
old: oldEndTime,
|
|
||||||
new: newEndTime,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Compare image
|
|
||||||
const oldImage = previousClaim.image;
|
|
||||||
const newImage = currentPlan.image;
|
|
||||||
const normalizedOldImage = this.normalizeValueForComparison(oldImage);
|
|
||||||
const normalizedNewImage = this.normalizeValueForComparison(newImage);
|
|
||||||
if (!R.equals(normalizedOldImage, normalizedNewImage)) {
|
|
||||||
differences.image = {
|
|
||||||
old: oldImage,
|
|
||||||
new: newImage,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Compare url
|
|
||||||
const oldUrl = previousClaim.url;
|
|
||||||
const newUrl = currentPlan.url;
|
|
||||||
const normalizedOldUrl = this.normalizeValueForComparison(oldUrl);
|
|
||||||
const normalizedNewUrl = this.normalizeValueForComparison(newUrl);
|
|
||||||
if (!R.equals(normalizedOldUrl, normalizedNewUrl)) {
|
|
||||||
differences.url = {
|
|
||||||
old: oldUrl,
|
|
||||||
new: newUrl,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Store differences if any were found
|
|
||||||
if (!R.isEmpty(differences)) {
|
|
||||||
this.planDifferences[currentPlan.handleId] = differences;
|
|
||||||
logger.debug(
|
|
||||||
"[NewActivityView] Plan differences found for",
|
|
||||||
currentPlan.handleId,
|
|
||||||
differences,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.debug(
|
|
||||||
"[NewActivityView] Analyzed",
|
|
||||||
planChanges.length,
|
|
||||||
"plan changes, found differences in",
|
|
||||||
Object.keys(this.planDifferences).length,
|
|
||||||
"plans",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Normalizes values for comparison - treats null, undefined, and empty string as equivalent
|
|
||||||
*
|
|
||||||
* @param value The value to normalize
|
|
||||||
* @returns The normalized value (null for null/undefined/empty, otherwise the original value)
|
|
||||||
*/
|
|
||||||
normalizeValueForComparison<T>(value: T | null | undefined): T | null {
|
|
||||||
if (value === null || value === undefined || value === "") {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Normalizes date values for comparison by converting strings to Date objects
|
|
||||||
* Returns null for null/undefined/empty values, Date objects for valid date strings
|
|
||||||
*/
|
|
||||||
normalizeDateForComparison(value: unknown): Date | null {
|
|
||||||
if (value === null || value === undefined || value === "") {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
if (typeof value === "string") {
|
|
||||||
const date = new Date(value);
|
|
||||||
// Check if the date is valid
|
|
||||||
return isNaN(date.getTime()) ? null : date;
|
|
||||||
}
|
|
||||||
if (value instanceof Date) {
|
|
||||||
return isNaN(value.getTime()) ? null : value;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets the differences for a specific plan by handle ID
|
|
||||||
*
|
|
||||||
* @param handleId The handle ID of the plan to get differences for
|
|
||||||
* @returns The differences object or null if no differences found
|
|
||||||
*/
|
|
||||||
getPlanDifferences(
|
|
||||||
handleId: string,
|
|
||||||
): Record<string, { old: unknown; new: unknown }> | null {
|
|
||||||
return this.planDifferences[handleId] || null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Formats a field value for display in the UI
|
|
||||||
*
|
|
||||||
* @param value The value to format
|
|
||||||
* @returns A human-readable string representation
|
|
||||||
*/
|
|
||||||
formatFieldValue(value: unknown): string {
|
|
||||||
if (value === null || value === undefined) {
|
|
||||||
return "Not set";
|
|
||||||
}
|
|
||||||
if (typeof value === "string") {
|
|
||||||
const stringValue = value || "Empty";
|
|
||||||
|
|
||||||
// Check if it's a date/time string
|
|
||||||
if (this.isDateTimeString(stringValue)) {
|
|
||||||
return this.formatDateTime(stringValue);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if it's a URL
|
|
||||||
if (this.isUrl(stringValue)) {
|
|
||||||
return stringValue; // Keep URLs as-is for now
|
|
||||||
}
|
|
||||||
|
|
||||||
return stringValue;
|
|
||||||
}
|
|
||||||
if (typeof value === "number") {
|
|
||||||
return value.toString();
|
|
||||||
}
|
|
||||||
if (typeof value === "boolean") {
|
|
||||||
return value ? "Yes" : "No";
|
|
||||||
}
|
|
||||||
// For complex objects, stringify
|
|
||||||
const stringified = JSON.stringify(value);
|
|
||||||
return stringified;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if a string appears to be a date/time string
|
|
||||||
*/
|
|
||||||
isDateTimeString(value: string): boolean {
|
|
||||||
if (!value) return false;
|
|
||||||
// Check for ISO 8601 format or other common date formats
|
|
||||||
const dateRegex = /^\d{4}-\d{2}-\d{2}(T\d{2}:\d{2}:\d{2})?(\.\d{3})?Z?$/;
|
|
||||||
return dateRegex.test(value) || !isNaN(Date.parse(value));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if a string is a URL
|
|
||||||
*/
|
|
||||||
isUrl(value: string): boolean {
|
|
||||||
if (!value) return false;
|
|
||||||
try {
|
|
||||||
new URL(value);
|
|
||||||
return true;
|
|
||||||
} catch {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Formats a date/time string for display
|
|
||||||
*/
|
|
||||||
formatDateTime(value: string): string {
|
|
||||||
try {
|
|
||||||
const date = new Date(value);
|
|
||||||
return date.toLocaleString();
|
|
||||||
} catch {
|
|
||||||
return value; // Return original if parsing fails
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gets a human-readable field name for display
|
|
||||||
*
|
|
||||||
* @param fieldName The internal field name
|
|
||||||
* @returns A formatted field name for display
|
|
||||||
*/
|
|
||||||
getDisplayFieldName(fieldName: string): string {
|
|
||||||
const fieldNameMap: Record<string, string> = {
|
|
||||||
name: "Name",
|
|
||||||
description: "Description",
|
|
||||||
location: "Location",
|
|
||||||
agent: "Agent",
|
|
||||||
startTime: "Start Time",
|
|
||||||
endTime: "End Time",
|
|
||||||
image: "Image",
|
|
||||||
url: "URL",
|
|
||||||
};
|
|
||||||
return fieldNameMap[fieldName] || fieldName;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Formats location values for display
|
|
||||||
*
|
|
||||||
* @param latitude The latitude value
|
|
||||||
* @param longitude The longitude value
|
|
||||||
* @param isOldValue Whether this is the old value (true) or new value (false)
|
|
||||||
* @returns A formatted location string
|
|
||||||
*/
|
|
||||||
formatLocationValue(
|
|
||||||
latitude: number | undefined | null,
|
|
||||||
longitude: number | undefined | null,
|
|
||||||
isOldValue: boolean = false,
|
|
||||||
): string {
|
|
||||||
if (latitude == null && longitude == null) {
|
|
||||||
return "Not set";
|
|
||||||
}
|
|
||||||
// If there's any location data, show generic labels instead of coordinates
|
|
||||||
if (isOldValue) {
|
|
||||||
return "A Location";
|
|
||||||
} else {
|
|
||||||
return "New Location";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -27,18 +27,10 @@
|
|||||||
>
|
>
|
||||||
<font-awesome icon="pen" class="text-sm text-blue-500 ml-2 mb-1" />
|
<font-awesome icon="pen" class="text-sm text-blue-500 ml-2 mb-1" />
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button title="Copy Link to Project" @click="onCopyLinkClick()">
|
||||||
:title="
|
|
||||||
isStarred
|
|
||||||
? 'Remove from starred projects'
|
|
||||||
: 'Add to starred projects'
|
|
||||||
"
|
|
||||||
@click="toggleStar()"
|
|
||||||
>
|
|
||||||
<font-awesome
|
<font-awesome
|
||||||
:icon="isStarred ? 'star' : ['far', 'star']"
|
icon="link"
|
||||||
:class="isStarred ? 'text-yellow-500' : 'text-slate-500'"
|
class="text-sm text-slate-500 ml-2 mb-1"
|
||||||
class="text-sm ml-2 mb-1"
|
|
||||||
/>
|
/>
|
||||||
</button>
|
</button>
|
||||||
</h2>
|
</h2>
|
||||||
@@ -66,13 +58,13 @@
|
|||||||
icon="user"
|
icon="user"
|
||||||
class="fa-fw text-slate-400"
|
class="fa-fw text-slate-400"
|
||||||
></font-awesome>
|
></font-awesome>
|
||||||
<span class="truncate max-w-[calc(100%-2rem)] ml-1">
|
<span class="truncate inline-block max-w-[calc(100%-2rem)]">
|
||||||
{{ issuerInfoObject?.displayName }}
|
{{ issuerInfoObject?.displayName }}
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<span
|
<span
|
||||||
v-if="!serverUtil.isHiddenDid(issuer)"
|
v-if="!serverUtil.isHiddenDid(issuer)"
|
||||||
class="inline-flex items-center ml-1"
|
class="inline-flex items-center"
|
||||||
>
|
>
|
||||||
<router-link
|
<router-link
|
||||||
:to="{
|
:to="{
|
||||||
@@ -148,29 +140,25 @@
|
|||||||
|
|
||||||
<div class="text-sm text-slate-500">
|
<div class="text-sm text-slate-500">
|
||||||
<div v-if="!expanded">
|
<div v-if="!expanded">
|
||||||
<vue-markdown
|
{{ truncatedDesc }}
|
||||||
:source="truncatedDesc"
|
|
||||||
class="mb-4 markdown-content"
|
|
||||||
/>
|
|
||||||
<a
|
<a
|
||||||
v-if="description.length >= truncateLength"
|
v-if="description.length >= truncateLength"
|
||||||
class="mt-4 uppercase text-xs font-semibold text-blue-700 cursor-pointer"
|
class="uppercase text-xs font-semibold text-slate-700"
|
||||||
@click="expandText"
|
@click="expandText"
|
||||||
>... Read More</a
|
>... Read More</a
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
<div v-else>
|
<div v-else>
|
||||||
<vue-markdown :source="description" class="mb-4 markdown-content" />
|
{{ description }}
|
||||||
<a
|
<a
|
||||||
v-if="description.length >= truncateLength"
|
class="uppercase text-xs font-semibold text-slate-700"
|
||||||
class="mt-4 uppercase text-xs font-semibold text-blue-700 cursor-pointer"
|
|
||||||
@click="collapseText"
|
@click="collapseText"
|
||||||
>- Read Less</a
|
>- Read Less</a
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<a class="cursor-pointer" @click="onClickLoadClaim(jwtId)">
|
<a class="cursor-pointer" @click="onClickLoadClaim(projectId)">
|
||||||
<font-awesome icon="file-lines" class="pl-2 pt-1 text-blue-500" />
|
<font-awesome icon="file-lines" class="pl-2 pt-1 text-blue-500" />
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
@@ -303,7 +291,10 @@
|
|||||||
{{ offer.objectDescription }}
|
{{ offer.objectDescription }}
|
||||||
</div>
|
</div>
|
||||||
<div class="flex justify-between">
|
<div class="flex justify-between">
|
||||||
<a class="cursor-pointer" @click="onClickLoadClaim(offer.jwtId)">
|
<a
|
||||||
|
class="cursor-pointer"
|
||||||
|
@click="onClickLoadClaim(offer.jwtId as string)"
|
||||||
|
>
|
||||||
<font-awesome
|
<font-awesome
|
||||||
icon="file-lines"
|
icon="file-lines"
|
||||||
class="pl-2 pt-1 text-blue-500"
|
class="pl-2 pt-1 text-blue-500"
|
||||||
@@ -601,9 +592,7 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { AxiosError } from "axios";
|
import { AxiosError } from "axios";
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
import VueMarkdown from "vue-markdown-render";
|
|
||||||
import { Router } from "vue-router";
|
import { Router } from "vue-router";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
GenericVerifiableCredential,
|
GenericVerifiableCredential,
|
||||||
GenericCredWrapper,
|
GenericCredWrapper,
|
||||||
@@ -614,25 +603,25 @@ import {
|
|||||||
PlanSummaryRecord,
|
PlanSummaryRecord,
|
||||||
} from "../interfaces";
|
} from "../interfaces";
|
||||||
import GiftedDialog from "../components/GiftedDialog.vue";
|
import GiftedDialog from "../components/GiftedDialog.vue";
|
||||||
import HiddenDidDialog from "../components/HiddenDidDialog.vue";
|
|
||||||
import OfferDialog from "../components/OfferDialog.vue";
|
import OfferDialog from "../components/OfferDialog.vue";
|
||||||
import TopMessage from "../components/TopMessage.vue";
|
import TopMessage from "../components/TopMessage.vue";
|
||||||
import QuickNav from "../components/QuickNav.vue";
|
import QuickNav from "../components/QuickNav.vue";
|
||||||
import EntityIcon from "../components/EntityIcon.vue";
|
import EntityIcon from "../components/EntityIcon.vue";
|
||||||
import ProjectIcon from "../components/ProjectIcon.vue";
|
import ProjectIcon from "../components/ProjectIcon.vue";
|
||||||
import { APP_SERVER, NotificationIface } from "../constants/app";
|
import { NotificationIface } from "../constants/app";
|
||||||
import { UNNAMED_PROJECT } from "../constants/entities";
|
// Removed legacy logging import - migrated to PlatformServiceMixin
|
||||||
import { NOTIFY_CONFIRM_CLAIM } from "../constants/notifications";
|
|
||||||
import * as databaseUtil from "../db/databaseUtil";
|
|
||||||
import { Contact } from "../db/tables/contacts";
|
import { Contact } from "../db/tables/contacts";
|
||||||
import * as libsUtil from "../libs/util";
|
import * as libsUtil from "../libs/util";
|
||||||
import * as serverUtil from "../libs/endorserServer";
|
import * as serverUtil from "../libs/endorserServer";
|
||||||
import { retrieveAccountDids } from "../libs/util";
|
import { retrieveAccountDids } from "../libs/util";
|
||||||
import { copyToClipboard } from "../services/ClipboardService";
|
import HiddenDidDialog from "../components/HiddenDidDialog.vue";
|
||||||
import { logger } from "../utils/logger";
|
import { logger } from "../utils/logger";
|
||||||
|
import { copyToClipboard } from "../services/ClipboardService";
|
||||||
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
||||||
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
||||||
|
import { NOTIFY_CONFIRM_CLAIM } from "@/constants/notifications";
|
||||||
|
import { APP_SERVER } from "@/constants/app";
|
||||||
|
import { UNNAMED_PROJECT } from "@/constants/entities";
|
||||||
/**
|
/**
|
||||||
* Project View Component
|
* Project View Component
|
||||||
* @author Matthew Raymer
|
* @author Matthew Raymer
|
||||||
@@ -674,7 +663,6 @@ import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
|||||||
ProjectIcon,
|
ProjectIcon,
|
||||||
QuickNav,
|
QuickNav,
|
||||||
TopMessage,
|
TopMessage,
|
||||||
VueMarkdown,
|
|
||||||
},
|
},
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
})
|
})
|
||||||
@@ -730,8 +718,6 @@ export default class ProjectViewView extends Vue {
|
|||||||
givesProvidedByHitLimit = false;
|
givesProvidedByHitLimit = false;
|
||||||
givesTotalsByUnit: Array<{ unit: string; amount: number }> = [];
|
givesTotalsByUnit: Array<{ unit: string; amount: number }> = [];
|
||||||
imageUrl = "";
|
imageUrl = "";
|
||||||
/** Whether this project is starred by the user */
|
|
||||||
isStarred = false;
|
|
||||||
/** Project issuer DID */
|
/** Project issuer DID */
|
||||||
issuer = "";
|
issuer = "";
|
||||||
/** Cached issuer information */
|
/** Cached issuer information */
|
||||||
@@ -742,8 +728,6 @@ export default class ProjectViewView extends Vue {
|
|||||||
} | null = null;
|
} | null = null;
|
||||||
/** DIDs that can see issuer information */
|
/** DIDs that can see issuer information */
|
||||||
issuerVisibleToDids: Array<string> = [];
|
issuerVisibleToDids: Array<string> = [];
|
||||||
/** Project JWT ID */
|
|
||||||
jwtId = "";
|
|
||||||
/** Project location data */
|
/** Project location data */
|
||||||
latitude = 0;
|
latitude = 0;
|
||||||
loadingTotals = false;
|
loadingTotals = false;
|
||||||
@@ -772,7 +756,7 @@ export default class ProjectViewView extends Vue {
|
|||||||
totalsExpanded = false;
|
totalsExpanded = false;
|
||||||
truncatedDesc = "";
|
truncatedDesc = "";
|
||||||
/** Truncation length */
|
/** Truncation length */
|
||||||
truncateLength = 200;
|
truncateLength = 40;
|
||||||
|
|
||||||
// Utility References
|
// Utility References
|
||||||
libsUtil = libsUtil;
|
libsUtil = libsUtil;
|
||||||
@@ -826,12 +810,6 @@ export default class ProjectViewView extends Vue {
|
|||||||
}
|
}
|
||||||
this.loadProject(this.projectId, this.activeDid);
|
this.loadProject(this.projectId, this.activeDid);
|
||||||
this.loadTotals();
|
this.loadTotals();
|
||||||
|
|
||||||
// Check if this project is starred when settings are loaded
|
|
||||||
if (this.projectId && settings.starredPlanHandleIds) {
|
|
||||||
const starredIds = settings.starredPlanHandleIds || [];
|
|
||||||
this.isStarred = starredIds.includes(this.projectId);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -908,9 +886,8 @@ export default class ProjectViewView extends Vue {
|
|||||||
this.allContacts,
|
this.allContacts,
|
||||||
);
|
);
|
||||||
this.issuerVisibleToDids = resp.data.issuerVisibleToDids || [];
|
this.issuerVisibleToDids = resp.data.issuerVisibleToDids || [];
|
||||||
this.jwtId = resp.data.id;
|
|
||||||
this.name = resp.data.claim?.name || "(no name)";
|
this.name = resp.data.claim?.name || "(no name)";
|
||||||
this.description = resp.data.claim?.description || "";
|
this.description = resp.data.claim?.description || "(no description)";
|
||||||
this.truncatedDesc = this.description.slice(0, this.truncateLength);
|
this.truncatedDesc = this.description.slice(0, this.truncateLength);
|
||||||
this.latitude = resp.data.claim?.location?.geo?.latitude || 0;
|
this.latitude = resp.data.claim?.location?.geo?.latitude || 0;
|
||||||
this.longitude = resp.data.claim?.location?.geo?.longitude || 0;
|
this.longitude = resp.data.claim?.location?.geo?.longitude || 0;
|
||||||
@@ -1500,67 +1477,5 @@ export default class ProjectViewView extends Vue {
|
|||||||
this.givesTotalsByUnit.find((total) => total.unit === "HUR")?.amount || 0
|
this.givesTotalsByUnit.find((total) => total.unit === "HUR")?.amount || 0
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Toggle the starred status of the current project
|
|
||||||
*/
|
|
||||||
async toggleStar() {
|
|
||||||
if (!this.projectId) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
const settings = await this.$accountSettings();
|
|
||||||
const starredIds = settings.starredPlanHandleIds || [];
|
|
||||||
if (!this.isStarred) {
|
|
||||||
// Add to starred projects
|
|
||||||
if (!starredIds.includes(this.projectId)) {
|
|
||||||
const newStarredIds = [...starredIds, this.projectId];
|
|
||||||
const newIdsParam = JSON.stringify(newStarredIds);
|
|
||||||
const result = await databaseUtil.updateDidSpecificSettings(
|
|
||||||
this.activeDid,
|
|
||||||
// @ts-expect-error until we use SettingsWithJsonString properly
|
|
||||||
{ starredPlanHandleIds: newIdsParam },
|
|
||||||
);
|
|
||||||
if (result) {
|
|
||||||
this.isStarred = true;
|
|
||||||
} else {
|
|
||||||
// eslint-disable-next-line no-console
|
|
||||||
logger.error("Got a bad result from SQL update to star a project.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!settings.lastAckedStarredPlanChangesJwtId) {
|
|
||||||
await databaseUtil.updateDidSpecificSettings(this.activeDid, {
|
|
||||||
lastAckedStarredPlanChangesJwtId: this.jwtId,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Remove from starred projects
|
|
||||||
|
|
||||||
const updatedIds = starredIds.filter((id) => id !== this.projectId);
|
|
||||||
const newIdsParam = JSON.stringify(updatedIds);
|
|
||||||
const result = await databaseUtil.updateDidSpecificSettings(
|
|
||||||
this.activeDid,
|
|
||||||
// @ts-expect-error until we use SettingsWithJsonString properly
|
|
||||||
{ starredPlanHandleIds: newIdsParam },
|
|
||||||
);
|
|
||||||
if (result) {
|
|
||||||
this.isStarred = false;
|
|
||||||
} else {
|
|
||||||
// eslint-disable-next-line no-console
|
|
||||||
logger.error("Got a bad result from SQL update to unstar a project.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
logger.error("Error toggling star status:", error);
|
|
||||||
this.$notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "Failed to update starred status. Please try again.",
|
|
||||||
},
|
|
||||||
3000,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -100,10 +100,7 @@ test('Create new project, then search for it', async ({ page }) => {
|
|||||||
const finalTitle = standardTitle + finalRandomString;
|
const finalTitle = standardTitle + finalRandomString;
|
||||||
const finalDescription = standardDescription + finalRandomString;
|
const finalDescription = standardDescription + finalRandomString;
|
||||||
const editedTitle = finalTitle + standardEdit;
|
const editedTitle = finalTitle + standardEdit;
|
||||||
const editedDescription =
|
const editedDescription = finalDescription + standardEdit;
|
||||||
finalDescription +
|
|
||||||
standardEdit +
|
|
||||||
" ... and enough text to overflow into the 'Read More' section.";
|
|
||||||
|
|
||||||
// Import user 00
|
// Import user 00
|
||||||
await importUser(page, '00');
|
await importUser(page, '00');
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ test('New offers for another user', async ({ page }) => {
|
|||||||
await expect(page.getByText('New Offers To You', { exact: true })).toBeVisible();
|
await expect(page.getByText('New Offers To You', { exact: true })).toBeVisible();
|
||||||
await page.getByTestId('showOffersToUser').locator('div > svg.fa-chevron-right').click();
|
await page.getByTestId('showOffersToUser').locator('div > svg.fa-chevron-right').click();
|
||||||
|
|
||||||
await expect(page.getByText('The offers are marked as read')).toBeVisible();
|
await expect(page.getByText('The offers are marked as viewed')).toBeVisible();
|
||||||
await page.getByRole('alert').filter({ hasText: 'Info' }).getByRole('button').click(); // dismiss info alert
|
await page.getByRole('alert').filter({ hasText: 'Info' }).getByRole('button').click(); // dismiss info alert
|
||||||
|
|
||||||
await page.waitForTimeout(1000);
|
await page.waitForTimeout(1000);
|
||||||
@@ -140,7 +140,7 @@ test('New offers for another user', async ({ page }) => {
|
|||||||
await expect(page.getByText('New Offer To You', { exact: true })).toBeVisible();
|
await expect(page.getByText('New Offer To You', { exact: true })).toBeVisible();
|
||||||
await page.getByTestId('showOffersToUser').locator('div > svg.fa-chevron-right').click();
|
await page.getByTestId('showOffersToUser').locator('div > svg.fa-chevron-right').click();
|
||||||
|
|
||||||
await expect(page.getByText('The offers are marked as read')).toBeVisible();
|
await expect(page.getByText('The offers are marked as viewed')).toBeVisible();
|
||||||
await page.getByRole('alert').filter({ hasText: 'Info' }).getByRole('button').click(); // dismiss info alert
|
await page.getByRole('alert').filter({ hasText: 'Info' }).getByRole('button').click(); // dismiss info alert
|
||||||
|
|
||||||
// now see that no offers are shown as new
|
// now see that no offers are shown as new
|
||||||
|
|||||||
@@ -145,10 +145,9 @@ export async function generateNewEthrUser(page: Page): Promise<string> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Function to generate a random string of specified length
|
// Function to generate a random string of specified length
|
||||||
// Note that this only generates up to 10 characters
|
|
||||||
export async function generateRandomString(length: number): Promise<string> {
|
export async function generateRandomString(length: number): Promise<string> {
|
||||||
return Math.random()
|
return Math.random()
|
||||||
.toString(36) // base 36 only generates up to 10 characters
|
.toString(36)
|
||||||
.substring(2, 2 + length);
|
.substring(2, 2 + length);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -157,7 +156,7 @@ export async function createUniqueStringsArray(
|
|||||||
count: number
|
count: number
|
||||||
): Promise<string[]> {
|
): Promise<string[]> {
|
||||||
const stringsArray: string[] = [];
|
const stringsArray: string[] = [];
|
||||||
const stringLength = 5; // max of 10; see generateRandomString
|
const stringLength = 16;
|
||||||
|
|
||||||
for (let i = 0; i < count; i++) {
|
for (let i = 0; i < count; i++) {
|
||||||
let randomString = await generateRandomString(stringLength);
|
let randomString = await generateRandomString(stringLength);
|
||||||
|
|||||||
Reference in New Issue
Block a user