Compare commits
44 Commits
entity-sel
...
contact-pa
| Author | SHA1 | Date | |
|---|---|---|---|
| dca8d48feb | |||
|
|
1bb3f52a30 | ||
| 4b1a724246 | |||
|
|
d7db7731cf | ||
|
|
9628d5c8c6 | ||
|
|
b37051f25d | ||
|
|
7b87ab2a5c | ||
|
|
ca7ead224b | ||
|
|
bfc2f07326 | ||
|
|
562713d5a4 | ||
|
|
8100ee5be4 | ||
|
|
966ca8276d | ||
|
|
27e38f583b | ||
|
|
1e3ecf6d0f | ||
|
|
4d9435f257 | ||
| e8e00d3eae | |||
| 5c0ce2d1fb | |||
| 9e1c267bc0 | |||
| 723a0095a0 | |||
| 9a94843b68 | |||
| 9f3c62a29c | |||
| 39173a8db2 | |||
| 7ea6a2ef69 | |||
| f0f0f1681e | |||
|
|
2f1eeb6700 | ||
|
|
a353ed3c3e | ||
|
|
e048e4c86b | ||
|
|
16ed5131c4 | ||
| e6cc058935 | |||
|
|
ad51c187aa | ||
|
|
37cff0083f | ||
|
|
6fbc9c2a5b | ||
|
|
f186e129db | ||
|
|
455dfadb92 | ||
|
|
035509224b | ||
|
|
e9ea89edae | ||
|
|
fface30123 | ||
| 97b382451a | |||
|
|
7fd2c4e0c7 | ||
|
|
20322789a2 | ||
|
|
666bed0efd | ||
|
|
7432525f4c | ||
| 530cddfab0 | |||
| 5340c00ae2 |
@@ -2,7 +2,7 @@
|
|||||||
globs: **/src/**/*
|
globs: **/src/**/*
|
||||||
alwaysApply: false
|
alwaysApply: false
|
||||||
---
|
---
|
||||||
✅ use system date command to timestamp all interactions with accurate date and
|
✅ use system date command to timestamp all documentation with accurate date and
|
||||||
time
|
time
|
||||||
✅ remove whitespace at the end of lines
|
✅ remove whitespace at the end of lines
|
||||||
✅ use npm run lint-fix to check for warnings
|
✅ use npm run lint-fix to check for warnings
|
||||||
|
|||||||
@@ -9,6 +9,10 @@ echo "🔍 Running pre-commit hooks..."
|
|||||||
|
|
||||||
# Run lint-fix first
|
# Run lint-fix first
|
||||||
echo "📝 Running lint-fix..."
|
echo "📝 Running lint-fix..."
|
||||||
|
|
||||||
|
# Capture git status before lint-fix to detect changes
|
||||||
|
git_status_before=$(git status --porcelain)
|
||||||
|
|
||||||
npm run lint-fix || {
|
npm run lint-fix || {
|
||||||
echo
|
echo
|
||||||
echo "❌ Linting failed. Please fix the issues and try again."
|
echo "❌ Linting failed. Please fix the issues and try again."
|
||||||
@@ -18,6 +22,36 @@ npm run lint-fix || {
|
|||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Check if lint-fix made any changes
|
||||||
|
git_status_after=$(git status --porcelain)
|
||||||
|
|
||||||
|
if [ "$git_status_before" != "$git_status_after" ]; then
|
||||||
|
echo
|
||||||
|
echo "⚠️ lint-fix made changes to your files!"
|
||||||
|
echo "📋 Changes detected:"
|
||||||
|
git diff --name-only
|
||||||
|
echo
|
||||||
|
echo "❓ What would you like to do?"
|
||||||
|
echo " [c] Continue commit without the new changes"
|
||||||
|
echo " [a] Abort commit (recommended - review and stage the changes)"
|
||||||
|
echo
|
||||||
|
printf "Choose [c/a]: "
|
||||||
|
# The `< /dev/tty` is necessary to make read work in git's non-interactive shell
|
||||||
|
read choice < /dev/tty
|
||||||
|
|
||||||
|
case $choice in
|
||||||
|
[Cc]* )
|
||||||
|
echo "✅ Continuing commit without lint-fix changes..."
|
||||||
|
sleep 3
|
||||||
|
;;
|
||||||
|
[Aa]* | * )
|
||||||
|
echo "🛑 Commit aborted. Please review the changes made by lint-fix."
|
||||||
|
echo "💡 You can stage the changes with 'git add .' and commit again."
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
|
||||||
# Then run Build Architecture Guard
|
# Then run Build Architecture Guard
|
||||||
|
|
||||||
#echo "🏗️ Running Build Architecture Guard..."
|
#echo "🏗️ Running Build Architecture Guard..."
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.dialog {
|
.dialog {
|
||||||
@apply bg-white p-4 rounded-lg w-full max-w-lg max-h-[calc(100vh-3rem)] overflow-y-auto;
|
@apply bg-white px-4 py-6 rounded-lg w-full max-w-lg max-h-[90%] overflow-y-auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Markdown content styling to restore list elements */
|
/* Markdown content styling to restore list elements */
|
||||||
|
|||||||
@@ -3,18 +3,18 @@
|
|||||||
<div class="dialog">
|
<div class="dialog">
|
||||||
<div class="text-slate-900 text-center">
|
<div class="text-slate-900 text-center">
|
||||||
<h3 class="text-lg font-semibold leading-[1.25] mb-2">
|
<h3 class="text-lg font-semibold leading-[1.25] mb-2">
|
||||||
Set Visibility to Meeting Members
|
{{ title }}
|
||||||
</h3>
|
</h3>
|
||||||
<p class="text-sm mb-4">
|
<p class="text-sm mb-4">
|
||||||
Would you like to <b>make your activities visible</b> to the following
|
{{ description }}
|
||||||
members? (This will also add them as contacts if they aren't already.)
|
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<!-- Custom table area - you can customize this -->
|
<!-- Member Selection Table -->
|
||||||
<div v-if="shouldInitializeSelection" class="mb-4">
|
<div class="mb-4">
|
||||||
<table
|
<table
|
||||||
class="w-full border-collapse border border-slate-300 text-sm text-start"
|
class="w-full border-collapse border border-slate-300 text-sm text-start"
|
||||||
>
|
>
|
||||||
|
<!-- Select All Header -->
|
||||||
<thead v-if="membersData && membersData.length > 0">
|
<thead v-if="membersData && membersData.length > 0">
|
||||||
<tr class="bg-slate-100 font-medium">
|
<tr class="bg-slate-100 font-medium">
|
||||||
<th class="border border-slate-300 px-3 py-2">
|
<th class="border border-slate-300 px-3 py-2">
|
||||||
@@ -31,14 +31,15 @@
|
|||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<!-- Dynamic data from MembersList -->
|
<!-- Empty State -->
|
||||||
<tr v-if="!membersData || membersData.length === 0">
|
<tr v-if="!membersData || membersData.length === 0">
|
||||||
<td
|
<td
|
||||||
class="border border-slate-300 px-3 py-2 text-center italic text-gray-500"
|
class="border border-slate-300 px-3 py-2 text-center italic text-gray-500"
|
||||||
>
|
>
|
||||||
No members need visibility settings
|
{{ emptyStateText }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<!-- Member Rows -->
|
||||||
<tr
|
<tr
|
||||||
v-for="member in membersData || []"
|
v-for="member in membersData || []"
|
||||||
:key="member.member.memberId"
|
:key="member.member.memberId"
|
||||||
@@ -51,10 +52,24 @@
|
|||||||
:checked="isMemberSelected(member.did)"
|
:checked="isMemberSelected(member.did)"
|
||||||
@change="toggleMemberSelection(member.did)"
|
@change="toggleMemberSelection(member.did)"
|
||||||
/>
|
/>
|
||||||
{{ member.name || SOMEONE_UNNAMED }}
|
<div class="">
|
||||||
|
<div class="text-sm font-semibold">
|
||||||
|
{{ member.name || SOMEONE_UNNAMED }}
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="flex items-center gap-0.5 text-xs text-slate-500"
|
||||||
|
>
|
||||||
|
<span class="font-semibold sm:hidden">DID:</span>
|
||||||
|
<span
|
||||||
|
class="w-[35vw] sm:w-auto truncate text-left"
|
||||||
|
style="direction: rtl"
|
||||||
|
>{{ member.did }}</span
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<!-- Friend indicator - only show if they are already a contact -->
|
<!-- Contact indicator - only show if they are already a contact -->
|
||||||
<font-awesome
|
<font-awesome
|
||||||
v-if="member.isContact"
|
v-if="member.isContact"
|
||||||
icon="user-circle"
|
icon="user-circle"
|
||||||
@@ -65,10 +80,28 @@
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
|
<!-- Select All Footer -->
|
||||||
|
<tfoot v-if="membersData && membersData.length > 0">
|
||||||
|
<tr class="bg-slate-100 font-medium">
|
||||||
|
<th class="border border-slate-300 px-3 py-2">
|
||||||
|
<label class="flex items-center gap-2">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
:checked="isAllSelected"
|
||||||
|
:indeterminate="isIndeterminate"
|
||||||
|
@change="toggleSelectAll"
|
||||||
|
/>
|
||||||
|
Select All
|
||||||
|
</label>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
</tfoot>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Action Buttons -->
|
||||||
<div class="space-y-2">
|
<div class="space-y-2">
|
||||||
|
<!-- Main Action Button -->
|
||||||
<button
|
<button
|
||||||
v-if="membersData && membersData.length > 0"
|
v-if="membersData && membersData.length > 0"
|
||||||
:disabled="!hasSelectedMembers"
|
:disabled="!hasSelectedMembers"
|
||||||
@@ -78,17 +111,16 @@
|
|||||||
? 'bg-blue-600 text-white cursor-pointer'
|
? 'bg-blue-600 text-white cursor-pointer'
|
||||||
: 'bg-slate-400 text-slate-200 cursor-not-allowed',
|
: 'bg-slate-400 text-slate-200 cursor-not-allowed',
|
||||||
]"
|
]"
|
||||||
@click="setVisibilityForSelectedMembers"
|
@click="handleMainAction"
|
||||||
>
|
>
|
||||||
Set Visibility
|
{{ buttonText }}
|
||||||
</button>
|
</button>
|
||||||
|
<!-- Cancel Button -->
|
||||||
<button
|
<button
|
||||||
class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
|
class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
|
||||||
@click="cancel"
|
@click="cancel"
|
||||||
>
|
>
|
||||||
{{
|
Maybe Later
|
||||||
membersData && membersData.length > 0 ? "Maybe Later" : "Cancel"
|
|
||||||
}}
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -101,26 +133,19 @@ import { Vue, Component, Prop } from "vue-facing-decorator";
|
|||||||
|
|
||||||
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
||||||
import { SOMEONE_UNNAMED } from "@/constants/entities";
|
import { SOMEONE_UNNAMED } from "@/constants/entities";
|
||||||
import { setVisibilityUtil } from "@/libs/endorserServer";
|
import { MemberData } from "@/interfaces";
|
||||||
|
import { setVisibilityUtil, getHeaders } from "@/libs/endorserServer";
|
||||||
import { createNotifyHelpers } from "@/utils/notify";
|
import { createNotifyHelpers } from "@/utils/notify";
|
||||||
|
|
||||||
interface MemberData {
|
|
||||||
did: string;
|
|
||||||
name: string;
|
|
||||||
isContact: boolean;
|
|
||||||
member: {
|
|
||||||
memberId: string;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
|
emits: ["close"],
|
||||||
})
|
})
|
||||||
export default class SetBulkVisibilityDialog extends Vue {
|
export default class BulkMembersDialog extends Vue {
|
||||||
@Prop({ default: false }) visible!: boolean;
|
|
||||||
@Prop({ default: () => [] }) membersData!: MemberData[];
|
|
||||||
@Prop({ default: "" }) activeDid!: string;
|
@Prop({ default: "" }) activeDid!: string;
|
||||||
@Prop({ default: "" }) apiServer!: string;
|
@Prop({ default: "" }) apiServer!: string;
|
||||||
|
@Prop({ required: true }) dialogType!: "admit" | "visibility";
|
||||||
|
@Prop({ required: true }) isOrganizer!: boolean;
|
||||||
|
|
||||||
// Vue notification system
|
// Vue notification system
|
||||||
$notify!: (
|
$notify!: (
|
||||||
@@ -132,8 +157,9 @@ export default class SetBulkVisibilityDialog extends Vue {
|
|||||||
notify!: ReturnType<typeof createNotifyHelpers>;
|
notify!: ReturnType<typeof createNotifyHelpers>;
|
||||||
|
|
||||||
// Component state
|
// Component state
|
||||||
|
membersData: MemberData[] = [];
|
||||||
selectedMembers: string[] = [];
|
selectedMembers: string[] = [];
|
||||||
selectionInitialized = false;
|
visible = false;
|
||||||
|
|
||||||
// Constants
|
// Constants
|
||||||
// In Vue templates, imported constants need to be explicitly made available to the template
|
// In Vue templates, imported constants need to be explicitly made available to the template
|
||||||
@@ -158,29 +184,46 @@ export default class SetBulkVisibilityDialog extends Vue {
|
|||||||
return selectedCount > 0 && selectedCount < this.membersData.length;
|
return selectedCount > 0 && selectedCount < this.membersData.length;
|
||||||
}
|
}
|
||||||
|
|
||||||
get shouldInitializeSelection() {
|
get title() {
|
||||||
// This method will initialize selection when the dialog opens
|
return this.isOrganizer
|
||||||
if (!this.selectionInitialized) {
|
? "Admit Pending Members"
|
||||||
this.initializeSelection();
|
: "Add Members to Contacts";
|
||||||
this.selectionInitialized = true;
|
}
|
||||||
}
|
|
||||||
return true;
|
get description() {
|
||||||
|
return this.isOrganizer
|
||||||
|
? "Would you like to admit these members to the meeting and add them to your contacts?"
|
||||||
|
: "Would you like to add these members to your contacts?";
|
||||||
|
}
|
||||||
|
|
||||||
|
get buttonText() {
|
||||||
|
return this.isOrganizer ? "Admit + Add to Contacts" : "Add to Contacts";
|
||||||
|
}
|
||||||
|
|
||||||
|
get emptyStateText() {
|
||||||
|
return this.isOrganizer
|
||||||
|
? "No pending members to admit"
|
||||||
|
: "No members are not in your contacts";
|
||||||
}
|
}
|
||||||
|
|
||||||
created() {
|
created() {
|
||||||
this.notify = createNotifyHelpers(this.$notify);
|
this.notify = createNotifyHelpers(this.$notify);
|
||||||
}
|
}
|
||||||
|
|
||||||
initializeSelection() {
|
open(members: MemberData[]) {
|
||||||
// Reset selection when dialog opens
|
this.visible = true;
|
||||||
this.selectedMembers = [];
|
this.membersData = members;
|
||||||
// Select all by default
|
// Select all by default
|
||||||
this.selectedMembers = this.membersData.map((member) => member.did);
|
this.selectedMembers = this.membersData.map((member) => member.did);
|
||||||
}
|
}
|
||||||
|
|
||||||
resetSelection() {
|
close(notSelectedMemberDids: string[]) {
|
||||||
this.selectedMembers = [];
|
this.visible = false;
|
||||||
this.selectionInitialized = false;
|
this.$emit("close", { notSelectedMemberDids: notSelectedMemberDids });
|
||||||
|
}
|
||||||
|
|
||||||
|
cancel() {
|
||||||
|
this.close(this.membersData.map((member) => member.did));
|
||||||
}
|
}
|
||||||
|
|
||||||
toggleSelectAll() {
|
toggleSelectAll() {
|
||||||
@@ -208,25 +251,40 @@ export default class SetBulkVisibilityDialog extends Vue {
|
|||||||
return this.selectedMembers.includes(memberDid);
|
return this.selectedMembers.includes(memberDid);
|
||||||
}
|
}
|
||||||
|
|
||||||
async setVisibilityForSelectedMembers() {
|
async handleMainAction() {
|
||||||
|
if (this.dialogType === "admit") {
|
||||||
|
await this.admitWithVisibility();
|
||||||
|
} else {
|
||||||
|
await this.addContactWithVisibility();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async admitWithVisibility() {
|
||||||
try {
|
try {
|
||||||
const selectedMembers = this.membersData.filter((member) =>
|
const selectedMembers = this.membersData.filter((member) =>
|
||||||
this.selectedMembers.includes(member.did),
|
this.selectedMembers.includes(member.did),
|
||||||
);
|
);
|
||||||
|
const notSelectedMembers = this.membersData.filter(
|
||||||
|
(member) => !this.selectedMembers.includes(member.did),
|
||||||
|
);
|
||||||
|
|
||||||
let successCount = 0;
|
let admittedCount = 0;
|
||||||
|
let contactAddedCount = 0;
|
||||||
|
|
||||||
for (const member of selectedMembers) {
|
for (const member of selectedMembers) {
|
||||||
try {
|
try {
|
||||||
// If they're not a contact yet, add them as a contact first
|
// First, admit the member
|
||||||
|
await this.admitMember(member);
|
||||||
|
admittedCount++;
|
||||||
|
|
||||||
|
// If they're not a contact yet, add them as a contact
|
||||||
if (!member.isContact) {
|
if (!member.isContact) {
|
||||||
await this.addAsContact(member);
|
await this.addAsContact(member);
|
||||||
|
contactAddedCount++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set their seesMe to true
|
// Set their seesMe to true
|
||||||
await this.updateContactVisibility(member.did, true);
|
await this.updateContactVisibility(member.did, true);
|
||||||
|
|
||||||
successCount++;
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// eslint-disable-next-line no-console
|
// eslint-disable-next-line no-console
|
||||||
console.error(`Error processing member ${member.did}:`, error);
|
console.error(`Error processing member ${member.did}:`, error);
|
||||||
@@ -239,30 +297,102 @@ export default class SetBulkVisibilityDialog extends Vue {
|
|||||||
{
|
{
|
||||||
group: "alert",
|
group: "alert",
|
||||||
type: "success",
|
type: "success",
|
||||||
title: "Visibility Set Successfully",
|
title: "Members Admitted Successfully",
|
||||||
text: `Visibility set for ${successCount} member${successCount === 1 ? "" : "s"}.`,
|
text: `${admittedCount} member${admittedCount === 1 ? "" : "s"} admitted${contactAddedCount === 0 ? "" : admittedCount === contactAddedCount ? " and" : `, ${contactAddedCount}`}${contactAddedCount === 0 ? "" : ` added as contact${contactAddedCount === 1 ? "" : "s"}`}.`,
|
||||||
},
|
},
|
||||||
5000,
|
10000,
|
||||||
);
|
);
|
||||||
|
|
||||||
// Emit success event
|
this.close(notSelectedMembers.map((member) => member.did));
|
||||||
this.$emit("success", successCount);
|
|
||||||
this.close();
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// eslint-disable-next-line no-console
|
// eslint-disable-next-line no-console
|
||||||
console.error("Error setting visibility:", error);
|
console.error("Error admitting members:", error);
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
group: "alert",
|
group: "alert",
|
||||||
type: "danger",
|
type: "danger",
|
||||||
title: "Error",
|
title: "Error",
|
||||||
text: "Failed to set visibility for some members. Please try again.",
|
text: "Failed to admit some members. Please try again.",
|
||||||
},
|
},
|
||||||
5000,
|
5000,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async addContactWithVisibility() {
|
||||||
|
try {
|
||||||
|
const selectedMembers = this.membersData.filter((member) =>
|
||||||
|
this.selectedMembers.includes(member.did),
|
||||||
|
);
|
||||||
|
const notSelectedMembers = this.membersData.filter(
|
||||||
|
(member) => !this.selectedMembers.includes(member.did),
|
||||||
|
);
|
||||||
|
|
||||||
|
let contactsAddedCount = 0;
|
||||||
|
|
||||||
|
for (const member of selectedMembers) {
|
||||||
|
try {
|
||||||
|
// If they're not a contact yet, add them as a contact first
|
||||||
|
if (!member.isContact) {
|
||||||
|
await this.addAsContact(member);
|
||||||
|
contactsAddedCount++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set their seesMe to true
|
||||||
|
await this.updateContactVisibility(member.did, true);
|
||||||
|
} catch (error) {
|
||||||
|
// eslint-disable-next-line no-console
|
||||||
|
console.error(`Error processing member ${member.did}:`, error);
|
||||||
|
// Continue with other members even if one fails
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Show success notification
|
||||||
|
this.$notify(
|
||||||
|
{
|
||||||
|
group: "alert",
|
||||||
|
type: "success",
|
||||||
|
title: "Contacts Added Successfully",
|
||||||
|
text: `${contactsAddedCount} member${contactsAddedCount === 1 ? "" : "s"} added as contact${contactsAddedCount === 1 ? "" : "s"}.`,
|
||||||
|
},
|
||||||
|
5000,
|
||||||
|
);
|
||||||
|
|
||||||
|
this.close(notSelectedMembers.map((member) => member.did));
|
||||||
|
} catch (error) {
|
||||||
|
// eslint-disable-next-line no-console
|
||||||
|
console.error("Error adding contacts:", error);
|
||||||
|
this.$notify(
|
||||||
|
{
|
||||||
|
group: "alert",
|
||||||
|
type: "danger",
|
||||||
|
title: "Error",
|
||||||
|
text: "Failed to add some members as contacts. Please try again.",
|
||||||
|
},
|
||||||
|
5000,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async admitMember(member: {
|
||||||
|
did: string;
|
||||||
|
name: string;
|
||||||
|
member: { memberId: string };
|
||||||
|
}) {
|
||||||
|
try {
|
||||||
|
const headers = await getHeaders(this.activeDid);
|
||||||
|
await this.axios.put(
|
||||||
|
`${this.apiServer}/api/partner/groupOnboardMember/${member.member.memberId}`,
|
||||||
|
{ admitted: true },
|
||||||
|
{ headers },
|
||||||
|
);
|
||||||
|
} catch (err) {
|
||||||
|
// eslint-disable-next-line no-console
|
||||||
|
console.error("Error admitting member:", err);
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async addAsContact(member: { did: string; name: string }) {
|
async addAsContact(member: { did: string; name: string }) {
|
||||||
try {
|
try {
|
||||||
const newContact = {
|
const newContact = {
|
||||||
@@ -310,24 +440,20 @@ export default class SetBulkVisibilityDialog extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
showContactInfo() {
|
showContactInfo() {
|
||||||
|
const message =
|
||||||
|
this.dialogType === "admit"
|
||||||
|
? "This user is already your contact, but they are not yet admitted to the meeting."
|
||||||
|
: "This user is already your contact, but your activities are not visible to them yet.";
|
||||||
|
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
group: "alert",
|
group: "alert",
|
||||||
type: "info",
|
type: "info",
|
||||||
title: "Contact Info",
|
title: "Contact Info",
|
||||||
text: "This user is already your contact, but your activities are not visible to them yet.",
|
text: message,
|
||||||
},
|
},
|
||||||
5000,
|
5000,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
close() {
|
|
||||||
this.resetSelection();
|
|
||||||
this.$emit("close");
|
|
||||||
}
|
|
||||||
|
|
||||||
cancel() {
|
|
||||||
this.close();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
@@ -2,55 +2,12 @@
|
|||||||
GiftedDialog.vue to provide a reusable grid layout * for displaying people,
|
GiftedDialog.vue to provide a reusable grid layout * for displaying people,
|
||||||
projects, and special entities with selection. * * @author Matthew Raymer */
|
projects, and special entities with selection. * * @author Matthew Raymer */
|
||||||
<template>
|
<template>
|
||||||
<!-- Quick Search -->
|
<ul :class="gridClasses">
|
||||||
<div id="QuickSearch" class="mb-4 flex items-center text-sm">
|
|
||||||
<input
|
|
||||||
v-model="searchTerm"
|
|
||||||
type="text"
|
|
||||||
placeholder="Search…"
|
|
||||||
class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-1.5 placeholder:italic placeholder:text-slate-400 focus:outline-none"
|
|
||||||
@input="handleSearchInput"
|
|
||||||
@keydown.enter="performSearch"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
v-show="isSearching && searchTerm"
|
|
||||||
class="border-y border-slate-400 ps-2 py-1.5 text-center text-slate-400"
|
|
||||||
>
|
|
||||||
<font-awesome
|
|
||||||
icon="spinner"
|
|
||||||
class="fa-spin-pulse leading-[1.1]"
|
|
||||||
></font-awesome>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
:disabled="!searchTerm"
|
|
||||||
class="px-2 py-1.5 rounded-r bg-white border border-l-0 border-slate-400 text-slate-400 disabled:cursor-not-allowed"
|
|
||||||
@click="clearSearch"
|
|
||||||
>
|
|
||||||
<font-awesome
|
|
||||||
:icon="searchTerm ? 'times' : 'magnifying-glass'"
|
|
||||||
class="fa-fw"
|
|
||||||
></font-awesome>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-if="searchTerm && !isSearching && filteredEntities.length === 0"
|
|
||||||
class="mb-4 text-sm italic text-slate-500 text-center"
|
|
||||||
>
|
|
||||||
“{{ searchTerm }}” doesn't match any
|
|
||||||
{{ entityType === "people" ? "people" : "projects" }}. Try a different
|
|
||||||
search.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<ul
|
|
||||||
ref="scrollContainer"
|
|
||||||
class="border-t border-slate-300 mb-4 max-h-[60vh] overflow-y-auto"
|
|
||||||
>
|
|
||||||
<!-- Special entities (You, Unnamed) for people grids -->
|
<!-- Special entities (You, Unnamed) for people grids -->
|
||||||
<template v-if="entityType === 'people'">
|
<template v-if="entityType === 'people'">
|
||||||
<!-- "You" entity -->
|
<!-- "You" entity -->
|
||||||
<SpecialEntityCard
|
<SpecialEntityCard
|
||||||
v-if="showYouEntity && !searchTerm.trim()"
|
v-if="showYouEntity"
|
||||||
entity-type="you"
|
entity-type="you"
|
||||||
label="You"
|
label="You"
|
||||||
icon="hand"
|
icon="hand"
|
||||||
@@ -64,7 +21,6 @@ projects, and special entities with selection. * * @author Matthew Raymer */
|
|||||||
|
|
||||||
<!-- "Unnamed" entity -->
|
<!-- "Unnamed" entity -->
|
||||||
<SpecialEntityCard
|
<SpecialEntityCard
|
||||||
v-if="showUnnamedEntity && !searchTerm.trim()"
|
|
||||||
entity-type="unnamed"
|
entity-type="unnamed"
|
||||||
:label="unnamedEntityName"
|
:label="unnamedEntityName"
|
||||||
icon="circle-question"
|
icon="circle-question"
|
||||||
@@ -82,60 +38,16 @@ projects, and special entities with selection. * * @author Matthew Raymer */
|
|||||||
|
|
||||||
<!-- Entity cards (people or projects) -->
|
<!-- Entity cards (people or projects) -->
|
||||||
<template v-if="entityType === 'people'">
|
<template v-if="entityType === 'people'">
|
||||||
<!-- When showing contacts without search: split into recent and alphabetical -->
|
<PersonCard
|
||||||
<template v-if="!searchTerm.trim()">
|
v-for="person in displayedEntities as Contact[]"
|
||||||
<!-- Recently Added Section -->
|
:key="person.did"
|
||||||
<template v-if="recentContacts.length > 0">
|
:person="person"
|
||||||
<li
|
:conflicted="isPersonConflicted(person.did)"
|
||||||
class="text-xs font-semibold text-slate-500 uppercase pt-5 pb-1.5 px-2 border-b border-slate-300"
|
:show-time-icon="true"
|
||||||
>
|
:notify="notify"
|
||||||
Recently Added
|
:conflict-context="conflictContext"
|
||||||
</li>
|
@person-selected="handlePersonSelected"
|
||||||
<PersonCard
|
/>
|
||||||
v-for="person in recentContacts"
|
|
||||||
:key="person.did"
|
|
||||||
:person="person"
|
|
||||||
:conflicted="isPersonConflicted(person.did)"
|
|
||||||
:show-time-icon="true"
|
|
||||||
:notify="notify"
|
|
||||||
:conflict-context="conflictContext"
|
|
||||||
@person-selected="handlePersonSelected"
|
|
||||||
/>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<!-- Alphabetical Section -->
|
|
||||||
<template v-if="alphabeticalContacts.length > 0">
|
|
||||||
<li
|
|
||||||
class="text-xs font-semibold text-slate-500 uppercase pt-5 pb-1.5 px-2 border-b border-slate-300"
|
|
||||||
>
|
|
||||||
Everyone Else
|
|
||||||
</li>
|
|
||||||
<PersonCard
|
|
||||||
v-for="person in alphabeticalContacts"
|
|
||||||
:key="person.did"
|
|
||||||
:person="person"
|
|
||||||
:conflicted="isPersonConflicted(person.did)"
|
|
||||||
:show-time-icon="true"
|
|
||||||
:notify="notify"
|
|
||||||
:conflict-context="conflictContext"
|
|
||||||
@person-selected="handlePersonSelected"
|
|
||||||
/>
|
|
||||||
</template>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<!-- When searching: show filtered results normally -->
|
|
||||||
<template v-else>
|
|
||||||
<PersonCard
|
|
||||||
v-for="person in displayedEntities as Contact[]"
|
|
||||||
:key="person.did"
|
|
||||||
:person="person"
|
|
||||||
:conflicted="isPersonConflicted(person.did)"
|
|
||||||
:show-time-icon="true"
|
|
||||||
:notify="notify"
|
|
||||||
:conflict-context="conflictContext"
|
|
||||||
@person-selected="handlePersonSelected"
|
|
||||||
/>
|
|
||||||
</template>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template v-else-if="entityType === 'projects'">
|
<template v-else-if="entityType === 'projects'">
|
||||||
@@ -151,27 +63,28 @@ projects, and special entities with selection. * * @author Matthew Raymer */
|
|||||||
@project-selected="handleProjectSelected"
|
@project-selected="handleProjectSelected"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<!-- Show All navigation -->
|
||||||
|
<ShowAllCard
|
||||||
|
v-if="shouldShowAll"
|
||||||
|
:entity-type="entityType"
|
||||||
|
:route-name="showAllRoute"
|
||||||
|
:query-params="showAllQueryParams"
|
||||||
|
/>
|
||||||
</ul>
|
</ul>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Prop, Vue, Emit, Watch } from "vue-facing-decorator";
|
import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
|
||||||
import { useInfiniteScroll } from "@vueuse/core";
|
|
||||||
import PersonCard from "./PersonCard.vue";
|
import PersonCard from "./PersonCard.vue";
|
||||||
import ProjectCard from "./ProjectCard.vue";
|
import ProjectCard from "./ProjectCard.vue";
|
||||||
import SpecialEntityCard from "./SpecialEntityCard.vue";
|
import SpecialEntityCard from "./SpecialEntityCard.vue";
|
||||||
|
import ShowAllCard from "./ShowAllCard.vue";
|
||||||
import { Contact } from "../db/tables/contacts";
|
import { Contact } from "../db/tables/contacts";
|
||||||
import { PlanData } from "../interfaces/records";
|
import { PlanData } from "../interfaces/records";
|
||||||
import { NotificationIface } from "../constants/app";
|
import { NotificationIface } from "../constants/app";
|
||||||
import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
|
import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
|
||||||
|
|
||||||
/**
|
|
||||||
* Constants for infinite scroll configuration
|
|
||||||
*/
|
|
||||||
const INITIAL_BATCH_SIZE = 20;
|
|
||||||
const INCREMENT_SIZE = 20;
|
|
||||||
const RECENT_CONTACTS_COUNT = 3;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EntityGrid - Unified grid layout for displaying people or projects
|
* EntityGrid - Unified grid layout for displaying people or projects
|
||||||
*
|
*
|
||||||
@@ -180,6 +93,7 @@ const RECENT_CONTACTS_COUNT = 3;
|
|||||||
* - Special entity integration (You, Unnamed)
|
* - Special entity integration (You, Unnamed)
|
||||||
* - Conflict detection integration
|
* - Conflict detection integration
|
||||||
* - Empty state messaging
|
* - Empty state messaging
|
||||||
|
* - Show All navigation
|
||||||
* - Event delegation for entity selection
|
* - Event delegation for entity selection
|
||||||
* - Warning notifications for conflicted entities
|
* - Warning notifications for conflicted entities
|
||||||
* - Template streamlined with computed CSS properties
|
* - Template streamlined with computed CSS properties
|
||||||
@@ -190,6 +104,7 @@ const RECENT_CONTACTS_COUNT = 3;
|
|||||||
PersonCard,
|
PersonCard,
|
||||||
ProjectCard,
|
ProjectCard,
|
||||||
SpecialEntityCard,
|
SpecialEntityCard,
|
||||||
|
ShowAllCard,
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
export default class EntityGrid extends Vue {
|
export default class EntityGrid extends Vue {
|
||||||
@@ -197,21 +112,14 @@ export default class EntityGrid extends Vue {
|
|||||||
@Prop({ required: true })
|
@Prop({ required: true })
|
||||||
entityType!: "people" | "projects";
|
entityType!: "people" | "projects";
|
||||||
|
|
||||||
// Search state
|
|
||||||
searchTerm = "";
|
|
||||||
isSearching = false;
|
|
||||||
searchTimeout: NodeJS.Timeout | null = null;
|
|
||||||
filteredEntities: Contact[] | PlanData[] = [];
|
|
||||||
|
|
||||||
// Infinite scroll state
|
|
||||||
displayedCount = INITIAL_BATCH_SIZE;
|
|
||||||
infiniteScrollReset?: () => void;
|
|
||||||
scrollContainer?: HTMLElement;
|
|
||||||
|
|
||||||
/** Array of entities to display */
|
/** Array of entities to display */
|
||||||
@Prop({ required: true })
|
@Prop({ required: true })
|
||||||
entities!: Contact[] | PlanData[];
|
entities!: Contact[] | PlanData[];
|
||||||
|
|
||||||
|
/** Maximum number of entities to display */
|
||||||
|
@Prop({ default: 10 })
|
||||||
|
maxItems!: number;
|
||||||
|
|
||||||
/** Active user's DID */
|
/** Active user's DID */
|
||||||
@Prop({ required: true })
|
@Prop({ required: true })
|
||||||
activeDid!: string;
|
activeDid!: string;
|
||||||
@@ -232,14 +140,18 @@ export default class EntityGrid extends Vue {
|
|||||||
@Prop({ default: true })
|
@Prop({ default: true })
|
||||||
showYouEntity!: boolean;
|
showYouEntity!: boolean;
|
||||||
|
|
||||||
/** Whether to show the "Unnamed" entity for people grids */
|
|
||||||
@Prop({ default: true })
|
|
||||||
showUnnamedEntity!: boolean;
|
|
||||||
|
|
||||||
/** Whether the "You" entity is selectable */
|
/** Whether the "You" entity is selectable */
|
||||||
@Prop({ default: true })
|
@Prop({ default: true })
|
||||||
youSelectable!: boolean;
|
youSelectable!: boolean;
|
||||||
|
|
||||||
|
/** Route name for "Show All" navigation */
|
||||||
|
@Prop({ default: "" })
|
||||||
|
showAllRoute!: string;
|
||||||
|
|
||||||
|
/** Query parameters for "Show All" navigation */
|
||||||
|
@Prop({ default: () => ({}) })
|
||||||
|
showAllQueryParams!: Record<string, string>;
|
||||||
|
|
||||||
/** Notification function from parent component */
|
/** Notification function from parent component */
|
||||||
@Prop()
|
@Prop()
|
||||||
notify?: (notification: NotificationIface, timeout?: number) => void;
|
notify?: (notification: NotificationIface, timeout?: number) => void;
|
||||||
@@ -248,31 +160,42 @@ export default class EntityGrid extends Vue {
|
|||||||
@Prop({ default: "other party" })
|
@Prop({ default: "other party" })
|
||||||
conflictContext!: string;
|
conflictContext!: string;
|
||||||
|
|
||||||
|
/** Whether to hide the "Show All" navigation */
|
||||||
|
@Prop({ default: false })
|
||||||
|
hideShowAll!: boolean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Function to determine which entities to display (allows parent control)
|
* Function to determine which entities to display (allows parent control)
|
||||||
*
|
*
|
||||||
* This function prop allows parent components to customize which entities
|
* This function prop allows parent components to customize which entities
|
||||||
* are displayed in the grid, enabling advanced filtering and sorting.
|
* are displayed in the grid, enabling advanced filtering, sorting, and
|
||||||
* Note: Infinite scroll is disabled when this prop is provided.
|
* display logic beyond the default simple slice behavior.
|
||||||
*
|
*
|
||||||
* @param entities - The full array of entities (Contact[] or PlanData[])
|
* @param entities - The full array of entities (Contact[] or PlanData[])
|
||||||
* @param entityType - The type of entities being displayed ("people" or "projects")
|
* @param entityType - The type of entities being displayed ("people" or "projects")
|
||||||
|
* @param maxItems - The maximum number of items to display (from maxItems prop)
|
||||||
* @returns Filtered/sorted array of entities to display
|
* @returns Filtered/sorted array of entities to display
|
||||||
*
|
*
|
||||||
* @example
|
* @example
|
||||||
* // Custom filtering: only show contacts with profile images
|
* // Custom filtering: only show contacts with profile images
|
||||||
* :display-entities-function="(entities, type) =>
|
* :display-entities-function="(entities, type, max) =>
|
||||||
* entities.filter(e => e.profileImageUrl)"
|
* entities.filter(e => e.profileImageUrl).slice(0, max)"
|
||||||
*
|
*
|
||||||
* @example
|
* @example
|
||||||
* // Custom sorting: sort projects by name
|
* // Custom sorting: sort projects by name
|
||||||
* :display-entities-function="(entities, type) =>
|
* :display-entities-function="(entities, type, max) =>
|
||||||
* entities.sort((a, b) => a.name.localeCompare(b.name))"
|
* entities.sort((a, b) => a.name.localeCompare(b.name)).slice(0, max)"
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* // Advanced logic: different limits for different entity types
|
||||||
|
* :display-entities-function="(entities, type, max) =>
|
||||||
|
* type === 'projects' ? entities.slice(0, 5) : entities.slice(0, max)"
|
||||||
*/
|
*/
|
||||||
@Prop({ default: null })
|
@Prop({ default: null })
|
||||||
displayEntitiesFunction?: (
|
displayEntitiesFunction?: (
|
||||||
entities: Contact[] | PlanData[],
|
entities: Contact[] | PlanData[],
|
||||||
entityType: "people" | "projects",
|
entityType: "people" | "projects",
|
||||||
|
maxItems: number,
|
||||||
) => Contact[] | PlanData[];
|
) => Contact[] | PlanData[];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -283,60 +206,33 @@ export default class EntityGrid extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed entities to display - uses function prop if provided, otherwise uses infinite scroll
|
* Computed CSS classes for the grid layout
|
||||||
* When searching, returns filtered results with infinite scroll applied
|
*/
|
||||||
|
get gridClasses(): string {
|
||||||
|
const baseClasses = "grid gap-x-2 gap-y-4 text-center mb-4";
|
||||||
|
|
||||||
|
if (this.entityType === "projects") {
|
||||||
|
return `${baseClasses} grid-cols-3 md:grid-cols-4`;
|
||||||
|
} else {
|
||||||
|
return `${baseClasses} grid-cols-4 sm:grid-cols-5 md:grid-cols-6`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Computed entities to display - uses function prop if provided, otherwise defaults
|
||||||
*/
|
*/
|
||||||
get displayedEntities(): Contact[] | PlanData[] {
|
get displayedEntities(): Contact[] | PlanData[] {
|
||||||
// If searching, return filtered results with infinite scroll
|
|
||||||
if (this.searchTerm.trim()) {
|
|
||||||
return this.filteredEntities.slice(0, this.displayedCount);
|
|
||||||
}
|
|
||||||
|
|
||||||
// If custom function provided, use it (disables infinite scroll)
|
|
||||||
if (this.displayEntitiesFunction) {
|
if (this.displayEntitiesFunction) {
|
||||||
return this.displayEntitiesFunction(this.entities, this.entityType);
|
return this.displayEntitiesFunction(
|
||||||
|
this.entities,
|
||||||
|
this.entityType,
|
||||||
|
this.maxItems,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Default: projects use infinite scroll
|
// Default implementation for backward compatibility
|
||||||
if (this.entityType === "projects") {
|
const maxDisplay = this.entityType === "projects" ? 7 : this.maxItems;
|
||||||
return (this.entities as PlanData[]).slice(0, this.displayedCount);
|
return this.entities.slice(0, maxDisplay);
|
||||||
}
|
|
||||||
|
|
||||||
// People: handled by recentContacts + alphabeticalContacts (both use displayedCount)
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the 3 most recently added contacts (when showing contacts and not searching)
|
|
||||||
*/
|
|
||||||
get recentContacts(): Contact[] {
|
|
||||||
if (this.entityType !== "people" || this.searchTerm.trim()) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
// Entities are already sorted by date added (newest first)
|
|
||||||
return (this.entities as Contact[]).slice(0, 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the remaining contacts sorted alphabetically (when showing contacts and not searching)
|
|
||||||
* Uses infinite scroll to control how many are displayed
|
|
||||||
*/
|
|
||||||
get alphabeticalContacts(): Contact[] {
|
|
||||||
if (this.entityType !== "people" || this.searchTerm.trim()) {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
// Skip the first 3 (recent contacts) and sort the rest alphabetically
|
|
||||||
// Create a copy to avoid mutating the original array
|
|
||||||
const remaining = (this.entities as Contact[]).slice(RECENT_CONTACTS_COUNT);
|
|
||||||
const sorted = [...remaining].sort((a: Contact, b: Contact) => {
|
|
||||||
// Sort alphabetically by name, falling back to DID if name is missing
|
|
||||||
const nameA = (a.name || a.did).toLowerCase();
|
|
||||||
const nameB = (b.name || b.did).toLowerCase();
|
|
||||||
return nameA.localeCompare(nameB);
|
|
||||||
});
|
|
||||||
// Apply infinite scroll: show based on displayedCount (minus the 3 recent)
|
|
||||||
const toShow = Math.max(0, this.displayedCount - RECENT_CONTACTS_COUNT);
|
|
||||||
return sorted.slice(0, toShow);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -350,6 +246,15 @@ export default class EntityGrid extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether to show the "Show All" navigation
|
||||||
|
*/
|
||||||
|
get shouldShowAll(): boolean {
|
||||||
|
return (
|
||||||
|
!this.hideShowAll && this.entities.length > 0 && this.showAllRoute !== ""
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Whether the "You" entity is conflicted
|
* Whether the "You" entity is conflicted
|
||||||
*/
|
*/
|
||||||
@@ -423,144 +328,6 @@ export default class EntityGrid extends Vue {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle search input with debouncing
|
|
||||||
*/
|
|
||||||
handleSearchInput(): void {
|
|
||||||
// Show spinner immediately when user types
|
|
||||||
this.isSearching = true;
|
|
||||||
|
|
||||||
// Clear existing timeout
|
|
||||||
if (this.searchTimeout) {
|
|
||||||
clearTimeout(this.searchTimeout);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set new timeout for 500ms delay
|
|
||||||
this.searchTimeout = setTimeout(() => {
|
|
||||||
this.performSearch();
|
|
||||||
}, 500);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Perform the actual search
|
|
||||||
*/
|
|
||||||
async performSearch(): Promise<void> {
|
|
||||||
if (!this.searchTerm.trim()) {
|
|
||||||
this.filteredEntities = [];
|
|
||||||
this.displayedCount = INITIAL_BATCH_SIZE;
|
|
||||||
this.infiniteScrollReset?.();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.isSearching = true;
|
|
||||||
|
|
||||||
try {
|
|
||||||
// Simulate async search (in case we need to add API calls later)
|
|
||||||
await new Promise((resolve) => setTimeout(resolve, 100));
|
|
||||||
|
|
||||||
const searchLower = this.searchTerm.toLowerCase().trim();
|
|
||||||
|
|
||||||
if (this.entityType === "people") {
|
|
||||||
this.filteredEntities = (this.entities as Contact[])
|
|
||||||
.filter((contact: Contact) => {
|
|
||||||
const name = contact.name?.toLowerCase() || "";
|
|
||||||
const did = contact.did.toLowerCase();
|
|
||||||
return name.includes(searchLower) || did.includes(searchLower);
|
|
||||||
})
|
|
||||||
.sort((a: Contact, b: Contact) => {
|
|
||||||
// Sort alphabetically by name, falling back to DID if name is missing
|
|
||||||
const nameA = (a.name || a.did).toLowerCase();
|
|
||||||
const nameB = (b.name || b.did).toLowerCase();
|
|
||||||
return nameA.localeCompare(nameB);
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
this.filteredEntities = (this.entities as PlanData[])
|
|
||||||
.filter((project: PlanData) => {
|
|
||||||
const name = project.name?.toLowerCase() || "";
|
|
||||||
const handleId = project.handleId.toLowerCase();
|
|
||||||
return name.includes(searchLower) || handleId.includes(searchLower);
|
|
||||||
})
|
|
||||||
.sort((a: PlanData, b: PlanData) => {
|
|
||||||
// Sort alphabetically by name
|
|
||||||
return a.name.toLowerCase().localeCompare(b.name.toLowerCase());
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reset displayed count when search completes
|
|
||||||
this.displayedCount = INITIAL_BATCH_SIZE;
|
|
||||||
this.infiniteScrollReset?.();
|
|
||||||
} finally {
|
|
||||||
this.isSearching = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Clear the search
|
|
||||||
*/
|
|
||||||
clearSearch(): void {
|
|
||||||
this.searchTerm = "";
|
|
||||||
this.filteredEntities = [];
|
|
||||||
this.isSearching = false;
|
|
||||||
this.displayedCount = INITIAL_BATCH_SIZE;
|
|
||||||
this.infiniteScrollReset?.();
|
|
||||||
|
|
||||||
// Clear any pending timeout
|
|
||||||
if (this.searchTimeout) {
|
|
||||||
clearTimeout(this.searchTimeout);
|
|
||||||
this.searchTimeout = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Determine if more entities can be loaded
|
|
||||||
*/
|
|
||||||
canLoadMore(): boolean {
|
|
||||||
if (this.displayEntitiesFunction) {
|
|
||||||
// Custom function disables infinite scroll
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.searchTerm.trim()) {
|
|
||||||
// Search mode: check filtered entities
|
|
||||||
return this.displayedCount < this.filteredEntities.length;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.entityType === "projects") {
|
|
||||||
// Projects: check if more available
|
|
||||||
return this.displayedCount < this.entities.length;
|
|
||||||
}
|
|
||||||
|
|
||||||
// People: check if more alphabetical contacts available
|
|
||||||
// Total available = 3 recent + all alphabetical
|
|
||||||
const remaining = (this.entities as Contact[]).slice(RECENT_CONTACTS_COUNT);
|
|
||||||
const totalAvailable = RECENT_CONTACTS_COUNT + remaining.length;
|
|
||||||
return this.displayedCount < totalAvailable;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialize infinite scroll on mount
|
|
||||||
*/
|
|
||||||
mounted(): void {
|
|
||||||
this.$nextTick(() => {
|
|
||||||
const container = this.$refs.scrollContainer as HTMLElement;
|
|
||||||
|
|
||||||
if (container) {
|
|
||||||
const { reset } = useInfiniteScroll(
|
|
||||||
container,
|
|
||||||
() => {
|
|
||||||
// Load more: increment displayedCount
|
|
||||||
this.displayedCount += INCREMENT_SIZE;
|
|
||||||
},
|
|
||||||
{
|
|
||||||
distance: 50, // pixels from bottom
|
|
||||||
canLoadMore: () => this.canLoadMore(),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
this.infiniteScrollReset = reset;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Emit methods using @Emit decorator
|
// Emit methods using @Emit decorator
|
||||||
|
|
||||||
@Emit("entity-selected")
|
@Emit("entity-selected")
|
||||||
@@ -573,33 +340,6 @@ export default class EntityGrid extends Vue {
|
|||||||
} {
|
} {
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Watch for changes in search term to reset displayed count
|
|
||||||
*/
|
|
||||||
@Watch("searchTerm")
|
|
||||||
onSearchTermChange(): void {
|
|
||||||
this.displayedCount = INITIAL_BATCH_SIZE;
|
|
||||||
this.infiniteScrollReset?.();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Watch for changes in entities prop to reset displayed count
|
|
||||||
*/
|
|
||||||
@Watch("entities")
|
|
||||||
onEntitiesChange(): void {
|
|
||||||
this.displayedCount = INITIAL_BATCH_SIZE;
|
|
||||||
this.infiniteScrollReset?.();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Cleanup timeouts when component is destroyed
|
|
||||||
*/
|
|
||||||
beforeUnmount(): void {
|
|
||||||
if (this.searchTimeout) {
|
|
||||||
clearTimeout(this.searchTimeout);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -3,9 +3,10 @@ from GiftedDialog.vue to handle the complete step 1 * entity selection interface
|
|||||||
with dynamic labeling and grid display. * * Features: * - Dynamic step labeling
|
with dynamic labeling and grid display. * * Features: * - Dynamic step labeling
|
||||||
based on context * - EntityGrid integration for unified entity display * -
|
based on context * - EntityGrid integration for unified entity display * -
|
||||||
Conflict detection and prevention * - Special entity handling (You, Unnamed) * -
|
Conflict detection and prevention * - Special entity handling (You, Unnamed) * -
|
||||||
Cancel functionality * - Event delegation for entity selection * - Warning
|
Show All navigation with context preservation * - Cancel functionality * - Event
|
||||||
notifications for conflicted entities * - Template streamlined with computed CSS
|
delegation for entity selection * - Warning notifications for conflicted
|
||||||
properties * * @author Matthew Raymer */
|
entities * - Template streamlined with computed CSS properties * * @author
|
||||||
|
Matthew Raymer */
|
||||||
<template>
|
<template>
|
||||||
<div id="sectionGiftedGiver">
|
<div id="sectionGiftedGiver">
|
||||||
<label class="block font-bold mb-4">
|
<label class="block font-bold mb-4">
|
||||||
@@ -15,14 +16,18 @@ properties * * @author Matthew Raymer */
|
|||||||
<EntityGrid
|
<EntityGrid
|
||||||
:entity-type="shouldShowProjects ? 'projects' : 'people'"
|
:entity-type="shouldShowProjects ? 'projects' : 'people'"
|
||||||
:entities="shouldShowProjects ? projects : allContacts"
|
:entities="shouldShowProjects ? projects : allContacts"
|
||||||
|
:max-items="10"
|
||||||
:active-did="activeDid"
|
:active-did="activeDid"
|
||||||
:all-my-dids="allMyDids"
|
:all-my-dids="allMyDids"
|
||||||
:all-contacts="allContacts"
|
:all-contacts="allContacts"
|
||||||
:conflict-checker="conflictChecker"
|
:conflict-checker="conflictChecker"
|
||||||
:show-you-entity="shouldShowYouEntity"
|
:show-you-entity="shouldShowYouEntity"
|
||||||
:you-selectable="youSelectable"
|
:you-selectable="youSelectable"
|
||||||
|
:show-all-route="showAllRoute"
|
||||||
|
:show-all-query-params="showAllQueryParams"
|
||||||
:notify="notify"
|
:notify="notify"
|
||||||
:conflict-context="conflictContext"
|
:conflict-context="conflictContext"
|
||||||
|
:hide-show-all="hideShowAll"
|
||||||
@entity-selected="handleEntitySelected"
|
@entity-selected="handleEntitySelected"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
@@ -63,6 +68,7 @@ interface EntitySelectionEvent {
|
|||||||
* - EntityGrid integration for unified entity display
|
* - EntityGrid integration for unified entity display
|
||||||
* - Conflict detection and prevention
|
* - Conflict detection and prevention
|
||||||
* - Special entity handling (You, Unnamed)
|
* - Special entity handling (You, Unnamed)
|
||||||
|
* - Show All navigation with context preservation
|
||||||
* - Cancel functionality
|
* - Cancel functionality
|
||||||
* - Event delegation for entity selection
|
* - Event delegation for entity selection
|
||||||
* - Warning notifications for conflicted entities
|
* - Warning notifications for conflicted entities
|
||||||
@@ -148,6 +154,10 @@ export default class EntitySelectionStep extends Vue {
|
|||||||
@Prop()
|
@Prop()
|
||||||
notify?: (notification: NotificationIface, timeout?: number) => void;
|
notify?: (notification: NotificationIface, timeout?: number) => void;
|
||||||
|
|
||||||
|
/** Whether to hide the "Show All" navigation */
|
||||||
|
@Prop({ default: false })
|
||||||
|
hideShowAll!: boolean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* CSS classes for the cancel button
|
* CSS classes for the cancel button
|
||||||
*/
|
*/
|
||||||
@@ -212,6 +222,59 @@ export default class EntitySelectionStep extends Vue {
|
|||||||
return !this.conflictChecker(this.activeDid);
|
return !this.conflictChecker(this.activeDid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Route name for "Show All" navigation
|
||||||
|
*/
|
||||||
|
get showAllRoute(): string {
|
||||||
|
if (this.shouldShowProjects) {
|
||||||
|
return "discover";
|
||||||
|
} else if (this.allContacts.length > 0) {
|
||||||
|
return "contact-gift";
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Query parameters for "Show All" navigation
|
||||||
|
*/
|
||||||
|
get showAllQueryParams(): Record<string, string> {
|
||||||
|
const baseParams = {
|
||||||
|
stepType: this.stepType,
|
||||||
|
giverEntityType: this.giverEntityType,
|
||||||
|
recipientEntityType: this.recipientEntityType,
|
||||||
|
// Form field values to preserve
|
||||||
|
description: this.description,
|
||||||
|
amountInput: this.amountInput,
|
||||||
|
unitCode: this.unitCode,
|
||||||
|
offerId: this.offerId,
|
||||||
|
fromProjectId: this.fromProjectId,
|
||||||
|
toProjectId: this.toProjectId,
|
||||||
|
showProjects: this.showProjects.toString(),
|
||||||
|
isFromProjectView: this.isFromProjectView.toString(),
|
||||||
|
};
|
||||||
|
|
||||||
|
if (this.shouldShowProjects) {
|
||||||
|
// For project contexts, still pass entity type information
|
||||||
|
return baseParams;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
...baseParams,
|
||||||
|
// Always pass both giver and recipient info for context preservation
|
||||||
|
giverProjectId: this.fromProjectId || "",
|
||||||
|
giverProjectName: this.giver?.name || "",
|
||||||
|
giverProjectImage: this.giver?.image || "",
|
||||||
|
giverProjectHandleId: this.giver?.handleId || "",
|
||||||
|
giverDid: this.giverEntityType === "person" ? this.giver?.did || "" : "",
|
||||||
|
recipientProjectId: this.toProjectId || "",
|
||||||
|
recipientProjectName: this.receiver?.name || "",
|
||||||
|
recipientProjectImage: this.receiver?.image || "",
|
||||||
|
recipientProjectHandleId: this.receiver?.handleId || "",
|
||||||
|
recipientDid:
|
||||||
|
this.recipientEntityType === "person" ? this.receiver?.did || "" : "",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle entity selection from EntityGrid
|
* Handle entity selection from EntityGrid
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -211,8 +211,6 @@ export default class FeedFilters extends Vue {
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style>
|
<style scoped>
|
||||||
#dialogFeedFilters.dialog-overlay {
|
/* Component-specific styles if needed */
|
||||||
overflow: scroll;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -29,6 +29,7 @@
|
|||||||
:unit-code="unitCode"
|
:unit-code="unitCode"
|
||||||
:offer-id="offerId"
|
:offer-id="offerId"
|
||||||
:notify="$notify"
|
:notify="$notify"
|
||||||
|
:hide-show-all="hideShowAll"
|
||||||
@entity-selected="handleEntitySelected"
|
@entity-selected="handleEntitySelected"
|
||||||
@cancel="cancel"
|
@cancel="cancel"
|
||||||
/>
|
/>
|
||||||
@@ -116,6 +117,7 @@ export default class GiftedDialog extends Vue {
|
|||||||
@Prop() fromProjectId = "";
|
@Prop() fromProjectId = "";
|
||||||
@Prop() toProjectId = "";
|
@Prop() toProjectId = "";
|
||||||
@Prop() isFromProjectView = false;
|
@Prop() isFromProjectView = false;
|
||||||
|
@Prop() hideShowAll = false;
|
||||||
@Prop({ default: "person" }) giverEntityType = "person" as
|
@Prop({ default: "person" }) giverEntityType = "person" as
|
||||||
| "person"
|
| "person"
|
||||||
| "project";
|
| "project";
|
||||||
@@ -231,7 +233,7 @@ export default class GiftedDialog extends Vue {
|
|||||||
apiServer: this.apiServer,
|
apiServer: this.apiServer,
|
||||||
});
|
});
|
||||||
|
|
||||||
this.allContacts = await this.$contactsByDateAdded();
|
this.allContacts = await this.$contacts();
|
||||||
|
|
||||||
this.allMyDids = await retrieveAccountDids();
|
this.allMyDids = await retrieveAccountDids();
|
||||||
|
|
||||||
|
|||||||
@@ -1,197 +1,235 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="space-y-4">
|
<div>
|
||||||
<!-- Loading State -->
|
<div class="space-y-4">
|
||||||
<div
|
<!-- Loading State -->
|
||||||
v-if="isLoading"
|
<div
|
||||||
class="mt-16 text-center text-4xl bg-slate-400 text-white w-14 py-2.5 rounded-full mx-auto"
|
v-if="isLoading"
|
||||||
>
|
class="mt-16 text-center text-4xl bg-slate-400 text-white w-14 py-2.5 rounded-full mx-auto"
|
||||||
<font-awesome icon="spinner" class="fa-spin-pulse" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Members List -->
|
|
||||||
|
|
||||||
<div v-else>
|
|
||||||
<div class="text-center text-red-600 my-4">
|
|
||||||
{{ decryptionErrorMessage() }}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="missingMyself" class="py-4 text-red-600">
|
|
||||||
You are not currently admitted by the organizer.
|
|
||||||
</div>
|
|
||||||
<div v-if="!firstName" class="py-4 text-red-600">
|
|
||||||
Your name is not set, so others may not recognize you. Reload this page
|
|
||||||
to set it.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<ul class="list-disc text-sm ps-4 space-y-2 mb-4">
|
|
||||||
<li
|
|
||||||
v-if="membersToShow().length > 0 && showOrganizerTools && isOrganizer"
|
|
||||||
>
|
|
||||||
Click
|
|
||||||
<span
|
|
||||||
class="inline-block w-5 h-5 rounded-full bg-blue-100 text-blue-600 text-center"
|
|
||||||
>
|
|
||||||
<font-awesome icon="plus" class="text-sm" />
|
|
||||||
</span>
|
|
||||||
/
|
|
||||||
<span
|
|
||||||
class="inline-block w-5 h-5 rounded-full bg-blue-100 text-blue-600 text-center"
|
|
||||||
>
|
|
||||||
<font-awesome icon="minus" class="text-sm" />
|
|
||||||
</span>
|
|
||||||
to add/remove them to/from the meeting.
|
|
||||||
</li>
|
|
||||||
<li v-if="membersToShow().length > 0">
|
|
||||||
Click
|
|
||||||
<span
|
|
||||||
class="inline-block w-5 h-5 rounded-full bg-green-100 text-green-600 text-center"
|
|
||||||
>
|
|
||||||
<font-awesome icon="circle-user" class="text-sm" />
|
|
||||||
</span>
|
|
||||||
to add them to your contacts.
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<div class="flex justify-between">
|
|
||||||
<!--
|
|
||||||
always have at least one refresh button even without members in case the organizer
|
|
||||||
changes the password
|
|
||||||
-->
|
|
||||||
<button
|
|
||||||
class="text-sm bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-1.5 rounded-md"
|
|
||||||
title="Refresh members list now"
|
|
||||||
@click="manualRefresh"
|
|
||||||
>
|
|
||||||
<font-awesome icon="rotate" :class="{ 'fa-spin': isLoading }" />
|
|
||||||
Refresh
|
|
||||||
<span class="text-xs">({{ countdownTimer }}s)</span>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<ul
|
|
||||||
v-if="membersToShow().length > 0"
|
|
||||||
class="border-t border-slate-300 my-2"
|
|
||||||
>
|
>
|
||||||
<li
|
<font-awesome icon="spinner" class="fa-spin-pulse" />
|
||||||
v-for="member in membersToShow()"
|
</div>
|
||||||
:key="member.member.memberId"
|
|
||||||
class="border-b border-slate-300 py-1.5"
|
|
||||||
>
|
|
||||||
<div class="flex items-center gap-2 justify-between">
|
|
||||||
<div class="flex items-center gap-1 overflow-hidden">
|
|
||||||
<h3 class="font-semibold truncate">
|
|
||||||
{{ member.name || unnamedMember }}
|
|
||||||
</h3>
|
|
||||||
<div
|
|
||||||
v-if="!getContactFor(member.did) && member.did !== activeDid"
|
|
||||||
class="flex items-center gap-1"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
class="btn-add-contact"
|
|
||||||
title="Add as contact"
|
|
||||||
@click="addAsContact(member)"
|
|
||||||
>
|
|
||||||
<font-awesome icon="circle-user" />
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<button
|
<!-- Members List -->
|
||||||
class="btn-info-contact"
|
|
||||||
title="Contact Info"
|
|
||||||
@click="
|
|
||||||
informAboutAddingContact(
|
|
||||||
getContactFor(member.did) !== undefined,
|
|
||||||
)
|
|
||||||
"
|
|
||||||
>
|
|
||||||
<font-awesome icon="circle-info" class="text-sm" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<span
|
|
||||||
v-if="
|
|
||||||
showOrganizerTools && isOrganizer && member.did !== activeDid
|
|
||||||
"
|
|
||||||
class="flex items-center gap-1"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
class="btn-admission"
|
|
||||||
:title="
|
|
||||||
member.member.admitted ? 'Remove member' : 'Admit member'
|
|
||||||
"
|
|
||||||
@click="checkWhetherContactBeforeAdmitting(member)"
|
|
||||||
>
|
|
||||||
<font-awesome
|
|
||||||
:icon="member.member.admitted ? 'minus' : 'plus'"
|
|
||||||
/>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
<button
|
<div v-else>
|
||||||
class="btn-info-admission"
|
<div class="text-center text-red-600 my-4">
|
||||||
title="Admission Info"
|
{{ decryptionErrorMessage() }}
|
||||||
@click="informAboutAdmission()"
|
</div>
|
||||||
>
|
|
||||||
<font-awesome icon="circle-info" class="text-sm" />
|
|
||||||
</button>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<p class="text-xs text-gray-600 truncate">
|
|
||||||
{{ member.did }}
|
|
||||||
</p>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
<div v-if="membersToShow().length > 0" class="flex justify-between">
|
<div v-if="missingMyself" class="py-4 text-red-600">
|
||||||
<!--
|
You are not currently admitted by the organizer.
|
||||||
|
</div>
|
||||||
|
<div v-if="!firstName" class="py-4 text-red-600">
|
||||||
|
Your name is not set, so others may not recognize you. Reload this
|
||||||
|
page to set it.
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<ul class="list-disc text-sm ps-4 space-y-2 mb-4">
|
||||||
|
<li
|
||||||
|
v-if="
|
||||||
|
membersToShow().length > 0 && showOrganizerTools && isOrganizer
|
||||||
|
"
|
||||||
|
>
|
||||||
|
Click
|
||||||
|
<font-awesome icon="circle-plus" class="text-blue-500 text-sm" />
|
||||||
|
/
|
||||||
|
<font-awesome icon="circle-minus" class="text-rose-500 text-sm" />
|
||||||
|
to add/remove them to/from the meeting.
|
||||||
|
</li>
|
||||||
|
<li
|
||||||
|
v-if="
|
||||||
|
membersToShow().length > 0 && getNonContactMembers().length > 0
|
||||||
|
"
|
||||||
|
>
|
||||||
|
Click
|
||||||
|
<font-awesome icon="circle-user" class="text-green-600 text-sm" />
|
||||||
|
to add them to your contacts.
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<div class="flex justify-between">
|
||||||
|
<!--
|
||||||
always have at least one refresh button even without members in case the organizer
|
always have at least one refresh button even without members in case the organizer
|
||||||
changes the password
|
changes the password
|
||||||
-->
|
-->
|
||||||
<button
|
<button
|
||||||
class="text-sm bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-1.5 rounded-md"
|
class="text-sm bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-1.5 rounded-md"
|
||||||
title="Refresh members list now"
|
title="Refresh members list now"
|
||||||
@click="manualRefresh"
|
@click="refreshData(false)"
|
||||||
|
>
|
||||||
|
<font-awesome icon="rotate" :class="{ 'fa-spin': isLoading }" />
|
||||||
|
Refresh
|
||||||
|
<span class="text-xs">({{ countdownTimer }}s)</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<ul
|
||||||
|
v-if="membersToShow().length > 0"
|
||||||
|
class="border-t border-slate-300 my-2"
|
||||||
>
|
>
|
||||||
<font-awesome icon="rotate" :class="{ 'fa-spin': isLoading }" />
|
<li
|
||||||
Refresh
|
v-for="member in membersToShow()"
|
||||||
<span class="text-xs">({{ countdownTimer }}s)</span>
|
:key="member.member.memberId"
|
||||||
</button>
|
:class="[
|
||||||
|
'border-b px-2 sm:px-3 py-1.5',
|
||||||
|
{
|
||||||
|
'bg-blue-50 border-t border-blue-300 -mt-[1px]':
|
||||||
|
!member.member.admitted &&
|
||||||
|
(isOrganizer || member.did === activeDid),
|
||||||
|
},
|
||||||
|
{ 'border-slate-300': member.member.admitted },
|
||||||
|
]"
|
||||||
|
>
|
||||||
|
<div class="flex items-center gap-2 justify-between">
|
||||||
|
<div class="flex items-center gap-1 overflow-hidden">
|
||||||
|
<h3
|
||||||
|
:class="[
|
||||||
|
'font-semibold truncate',
|
||||||
|
{
|
||||||
|
'text-slate-500':
|
||||||
|
!member.member.admitted &&
|
||||||
|
(isOrganizer || member.did === activeDid),
|
||||||
|
},
|
||||||
|
]"
|
||||||
|
>
|
||||||
|
<font-awesome
|
||||||
|
v-if="member.member.memberId === members[0]?.memberId"
|
||||||
|
icon="crown"
|
||||||
|
class="fa-fw text-amber-400"
|
||||||
|
/>
|
||||||
|
<font-awesome
|
||||||
|
v-if="member.did === activeDid"
|
||||||
|
icon="hand"
|
||||||
|
class="fa-fw text-blue-500"
|
||||||
|
/>
|
||||||
|
<font-awesome
|
||||||
|
v-if="
|
||||||
|
!member.member.admitted &&
|
||||||
|
(isOrganizer || member.did === activeDid)
|
||||||
|
"
|
||||||
|
icon="hourglass-half"
|
||||||
|
class="fa-fw text-slate-400"
|
||||||
|
/>
|
||||||
|
{{ member.name || unnamedMember }}
|
||||||
|
</h3>
|
||||||
|
<div
|
||||||
|
v-if="!getContactFor(member.did) && member.did !== activeDid"
|
||||||
|
class="flex items-center gap-1.5 ms-1"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
class="btn-add-contact"
|
||||||
|
title="Add as contact"
|
||||||
|
@click="addAsContact(member)"
|
||||||
|
>
|
||||||
|
<font-awesome icon="circle-user" />
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button
|
||||||
|
class="btn-info-contact"
|
||||||
|
title="Contact Info"
|
||||||
|
@click="
|
||||||
|
informAboutAddingContact(
|
||||||
|
getContactFor(member.did) !== undefined,
|
||||||
|
)
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<font-awesome icon="circle-info" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<span
|
||||||
|
v-if="
|
||||||
|
showOrganizerTools && isOrganizer && member.did !== activeDid
|
||||||
|
"
|
||||||
|
class="flex items-center gap-1.5"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
:class="
|
||||||
|
member.member.admitted
|
||||||
|
? 'btn-admission-remove'
|
||||||
|
: 'btn-admission-add'
|
||||||
|
"
|
||||||
|
:title="
|
||||||
|
member.member.admitted ? 'Remove member' : 'Admit member'
|
||||||
|
"
|
||||||
|
@click="checkWhetherContactBeforeAdmitting(member)"
|
||||||
|
>
|
||||||
|
<font-awesome
|
||||||
|
:icon="
|
||||||
|
member.member.admitted ? 'circle-minus' : 'circle-plus'
|
||||||
|
"
|
||||||
|
/>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button
|
||||||
|
class="btn-info-admission"
|
||||||
|
title="Admission Info"
|
||||||
|
@click="informAboutAdmission()"
|
||||||
|
>
|
||||||
|
<font-awesome icon="circle-info" />
|
||||||
|
</button>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<p class="text-xs text-gray-600 truncate">
|
||||||
|
{{ member.did }}
|
||||||
|
</p>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<div v-if="membersToShow().length > 0" class="flex justify-between">
|
||||||
|
<!--
|
||||||
|
always have at least one refresh button even without members in case the organizer
|
||||||
|
changes the password
|
||||||
|
-->
|
||||||
|
<button
|
||||||
|
class="text-sm bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-3 py-1.5 rounded-md"
|
||||||
|
title="Refresh members list now"
|
||||||
|
@click="refreshData(false)"
|
||||||
|
>
|
||||||
|
<font-awesome icon="rotate" :class="{ 'fa-spin': isLoading }" />
|
||||||
|
Refresh
|
||||||
|
<span class="text-xs">({{ countdownTimer }}s)</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<p v-if="members.length === 0" class="text-gray-500 py-4">
|
||||||
|
No members have joined this meeting yet
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p v-if="members.length === 0" class="text-gray-500 py-4">
|
|
||||||
No members have joined this meeting yet
|
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Set Visibility Dialog Component -->
|
<!-- Bulk Members Dialog for both admitting and setting visibility -->
|
||||||
<SetBulkVisibilityDialog
|
<BulkMembersDialog
|
||||||
:visible="showSetVisibilityDialog"
|
ref="bulkMembersDialog"
|
||||||
:members-data="visibilityDialogMembers"
|
:active-did="activeDid"
|
||||||
:active-did="activeDid"
|
:api-server="apiServer"
|
||||||
:api-server="apiServer"
|
:dialog-type="isOrganizer ? 'admit' : 'visibility'"
|
||||||
@close="closeSetVisibilityDialog"
|
:is-organizer="isOrganizer"
|
||||||
/>
|
@close="closeBulkMembersDialogCallback"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Vue, Prop, Emit } from "vue-facing-decorator";
|
import { Component, Vue, Prop, Emit } from "vue-facing-decorator";
|
||||||
|
|
||||||
import {
|
import { NotificationIface } from "@/constants/app";
|
||||||
errorStringForLog,
|
|
||||||
getHeaders,
|
|
||||||
register,
|
|
||||||
serverMessageForUser,
|
|
||||||
} from "../libs/endorserServer";
|
|
||||||
import { decryptMessage } from "../libs/crypto";
|
|
||||||
import { Contact } from "../db/tables/contacts";
|
|
||||||
import * as libsUtil from "../libs/util";
|
|
||||||
import { NotificationIface } from "../constants/app";
|
|
||||||
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
|
||||||
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
|
||||||
import {
|
import {
|
||||||
NOTIFY_ADD_CONTACT_FIRST,
|
NOTIFY_ADD_CONTACT_FIRST,
|
||||||
NOTIFY_CONTINUE_WITHOUT_ADDING,
|
NOTIFY_CONTINUE_WITHOUT_ADDING,
|
||||||
} from "@/constants/notifications";
|
} from "@/constants/notifications";
|
||||||
import { SOMEONE_UNNAMED } from "@/constants/entities";
|
import { SOMEONE_UNNAMED } from "@/constants/entities";
|
||||||
import SetBulkVisibilityDialog from "./SetBulkVisibilityDialog.vue";
|
import {
|
||||||
|
errorStringForLog,
|
||||||
|
getHeaders,
|
||||||
|
register,
|
||||||
|
serverMessageForUser,
|
||||||
|
} from "@/libs/endorserServer";
|
||||||
|
import { decryptMessage } from "@/libs/crypto";
|
||||||
|
import { Contact } from "@/db/tables/contacts";
|
||||||
|
import { MemberData } from "@/interfaces";
|
||||||
|
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
||||||
|
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
||||||
|
import BulkMembersDialog from "./BulkMembersDialog.vue";
|
||||||
|
|
||||||
interface Member {
|
interface Member {
|
||||||
admitted: boolean;
|
admitted: boolean;
|
||||||
@@ -208,7 +246,7 @@ interface DecryptedMember {
|
|||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {
|
components: {
|
||||||
SetBulkVisibilityDialog,
|
BulkMembersDialog,
|
||||||
},
|
},
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
})
|
})
|
||||||
@@ -216,7 +254,6 @@ export default class MembersList extends Vue {
|
|||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
||||||
|
|
||||||
notify!: ReturnType<typeof createNotifyHelpers>;
|
notify!: ReturnType<typeof createNotifyHelpers>;
|
||||||
libsUtil = libsUtil;
|
|
||||||
|
|
||||||
@Prop({ required: true }) password!: string;
|
@Prop({ required: true }) password!: string;
|
||||||
@Prop({ default: false }) showOrganizerTools!: boolean;
|
@Prop({ default: false }) showOrganizerTools!: boolean;
|
||||||
@@ -227,6 +264,7 @@ export default class MembersList extends Vue {
|
|||||||
return message;
|
return message;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
contacts: Array<Contact> = [];
|
||||||
decryptedMembers: DecryptedMember[] = [];
|
decryptedMembers: DecryptedMember[] = [];
|
||||||
firstName = "";
|
firstName = "";
|
||||||
isLoading = true;
|
isLoading = true;
|
||||||
@@ -237,23 +275,11 @@ export default class MembersList extends Vue {
|
|||||||
activeDid = "";
|
activeDid = "";
|
||||||
apiServer = "";
|
apiServer = "";
|
||||||
|
|
||||||
// Set Visibility Dialog state
|
|
||||||
showSetVisibilityDialog = false;
|
|
||||||
visibilityDialogMembers: Array<{
|
|
||||||
did: string;
|
|
||||||
name: string;
|
|
||||||
isContact: boolean;
|
|
||||||
member: { memberId: string };
|
|
||||||
}> = [];
|
|
||||||
contacts: Array<Contact> = [];
|
|
||||||
|
|
||||||
// Auto-refresh functionality
|
// Auto-refresh functionality
|
||||||
countdownTimer = 10;
|
countdownTimer = 10;
|
||||||
autoRefreshInterval: NodeJS.Timeout | null = null;
|
autoRefreshInterval: NodeJS.Timeout | null = null;
|
||||||
lastRefreshTime = 0;
|
lastRefreshTime = 0;
|
||||||
|
previousMemberDidsIgnored: string[] = [];
|
||||||
// Track previous visibility members to detect changes
|
|
||||||
previousVisibilityMembers: string[] = [];
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the unnamed member constant
|
* Get the unnamed member constant
|
||||||
@@ -274,23 +300,8 @@ export default class MembersList extends Vue {
|
|||||||
|
|
||||||
this.apiServer = settings.apiServer || "";
|
this.apiServer = settings.apiServer || "";
|
||||||
this.firstName = settings.firstName || "";
|
this.firstName = settings.firstName || "";
|
||||||
await this.fetchMembers();
|
|
||||||
await this.loadContacts();
|
|
||||||
|
|
||||||
// Start auto-refresh
|
this.refreshData();
|
||||||
this.startAutoRefresh();
|
|
||||||
|
|
||||||
// Check if we should show the visibility dialog on initial load
|
|
||||||
this.checkAndShowVisibilityDialog();
|
|
||||||
}
|
|
||||||
|
|
||||||
async refreshData() {
|
|
||||||
// Force refresh both contacts and members
|
|
||||||
await this.loadContacts();
|
|
||||||
await this.fetchMembers();
|
|
||||||
|
|
||||||
// Check if we should show the visibility dialog after refresh
|
|
||||||
this.checkAndShowVisibilityDialog();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async fetchMembers() {
|
async fetchMembers() {
|
||||||
@@ -336,7 +347,10 @@ export default class MembersList extends Vue {
|
|||||||
const content = JSON.parse(decryptedContent);
|
const content = JSON.parse(decryptedContent);
|
||||||
|
|
||||||
this.decryptedMembers.push({
|
this.decryptedMembers.push({
|
||||||
member: member,
|
member: {
|
||||||
|
...member,
|
||||||
|
admitted: member.admitted !== undefined ? member.admitted : true, // Default to true for non-organizers
|
||||||
|
},
|
||||||
name: content.name,
|
name: content.name,
|
||||||
did: content.did,
|
did: content.did,
|
||||||
isRegistered: !!content.isRegistered,
|
isRegistered: !!content.isRegistered,
|
||||||
@@ -378,17 +392,76 @@ export default class MembersList extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
membersToShow(): DecryptedMember[] {
|
membersToShow(): DecryptedMember[] {
|
||||||
|
let members: DecryptedMember[] = [];
|
||||||
|
|
||||||
if (this.isOrganizer) {
|
if (this.isOrganizer) {
|
||||||
if (this.showOrganizerTools) {
|
if (this.showOrganizerTools) {
|
||||||
return this.decryptedMembers;
|
members = this.decryptedMembers;
|
||||||
} else {
|
} else {
|
||||||
return this.decryptedMembers.filter(
|
members = this.decryptedMembers.filter(
|
||||||
(member: DecryptedMember) => member.member.admitted,
|
(member: DecryptedMember) => member.member.admitted,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// non-organizers only get visible members from server, plus themselves
|
||||||
|
|
||||||
|
// Check if current user is already in the decrypted members list
|
||||||
|
if (
|
||||||
|
!this.decryptedMembers.find((member) => member.did === this.activeDid)
|
||||||
|
) {
|
||||||
|
// this is a stub for this user just in case they are waiting to get in
|
||||||
|
// which is especially useful so they can see their own DID
|
||||||
|
const currentUser: DecryptedMember = {
|
||||||
|
member: {
|
||||||
|
admitted: false,
|
||||||
|
content: "{}",
|
||||||
|
memberId: -1,
|
||||||
|
},
|
||||||
|
name: this.firstName,
|
||||||
|
did: this.activeDid,
|
||||||
|
isRegistered: false,
|
||||||
|
};
|
||||||
|
members = [currentUser, ...this.decryptedMembers];
|
||||||
|
} else {
|
||||||
|
members = this.decryptedMembers;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// non-organizers only get visible members from server
|
|
||||||
return this.decryptedMembers;
|
// Sort members according to priority:
|
||||||
|
// 1. Organizer at the top
|
||||||
|
// 2. Current user next
|
||||||
|
// 3. Non-admitted members next
|
||||||
|
// 4. Everyone else after
|
||||||
|
return members.sort((a, b) => {
|
||||||
|
// Check if either member is the organizer (first member in original list)
|
||||||
|
const aIsOrganizer = a.member.memberId === this.members[0]?.memberId;
|
||||||
|
const bIsOrganizer = b.member.memberId === this.members[0]?.memberId;
|
||||||
|
|
||||||
|
// Check if either member is the current user
|
||||||
|
const aIsCurrentUser = a.did === this.activeDid;
|
||||||
|
const bIsCurrentUser = b.did === this.activeDid;
|
||||||
|
|
||||||
|
// Organizer always comes first
|
||||||
|
if (aIsOrganizer && !bIsOrganizer) return -1;
|
||||||
|
if (!aIsOrganizer && bIsOrganizer) return 1;
|
||||||
|
|
||||||
|
// If both are organizers, maintain original order
|
||||||
|
if (aIsOrganizer && bIsOrganizer) return 0;
|
||||||
|
|
||||||
|
// Current user comes second (after organizer)
|
||||||
|
if (aIsCurrentUser && !bIsCurrentUser && !bIsOrganizer) return -1;
|
||||||
|
if (!aIsCurrentUser && bIsCurrentUser && !aIsOrganizer) return 1;
|
||||||
|
|
||||||
|
// If both are current users, maintain original order
|
||||||
|
if (aIsCurrentUser && bIsCurrentUser) return 0;
|
||||||
|
|
||||||
|
// Non-admitted members come before admitted members
|
||||||
|
if (!a.member.admitted && b.member.admitted) return -1;
|
||||||
|
if (a.member.admitted && !b.member.admitted) return 1;
|
||||||
|
|
||||||
|
// If admission status is the same, maintain original order
|
||||||
|
return 0;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
informAboutAdmission() {
|
informAboutAdmission() {
|
||||||
@@ -412,92 +485,85 @@ export default class MembersList extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async loadContacts() {
|
|
||||||
this.contacts = await this.$getAllContacts();
|
|
||||||
}
|
|
||||||
|
|
||||||
getContactFor(did: string): Contact | undefined {
|
getContactFor(did: string): Contact | undefined {
|
||||||
return this.contacts.find((contact) => contact.did === did);
|
return this.contacts.find((contact) => contact.did === did);
|
||||||
}
|
}
|
||||||
|
|
||||||
getMembersForVisibility() {
|
getPendingMembersToAdmit(): MemberData[] {
|
||||||
return this.decryptedMembers
|
return this.decryptedMembers
|
||||||
.filter((member) => {
|
.filter(
|
||||||
// Exclude the current user
|
(member) => member.did !== this.activeDid && !member.member.admitted,
|
||||||
if (member.did === this.activeDid) {
|
)
|
||||||
return false;
|
.map(this.convertDecryptedMemberToMemberData);
|
||||||
}
|
}
|
||||||
|
|
||||||
const contact = this.getContactFor(member.did);
|
getNonContactMembers(): MemberData[] {
|
||||||
|
return this.decryptedMembers
|
||||||
|
.filter(
|
||||||
|
(member) =>
|
||||||
|
member.did !== this.activeDid && !this.getContactFor(member.did),
|
||||||
|
)
|
||||||
|
.map(this.convertDecryptedMemberToMemberData);
|
||||||
|
}
|
||||||
|
|
||||||
// Include members who:
|
convertDecryptedMemberToMemberData(
|
||||||
// 1. Haven't been added as contacts yet, OR
|
decryptedMember: DecryptedMember,
|
||||||
// 2. Are contacts but don't have visibility set (seesMe property)
|
): MemberData {
|
||||||
return !contact || !contact.seesMe;
|
return {
|
||||||
})
|
did: decryptedMember.did,
|
||||||
.map((member) => ({
|
name: decryptedMember.name,
|
||||||
did: member.did,
|
isContact: !!this.getContactFor(decryptedMember.did),
|
||||||
name: member.name,
|
member: {
|
||||||
isContact: !!this.getContactFor(member.did),
|
memberId: decryptedMember.member.memberId.toString(),
|
||||||
member: {
|
},
|
||||||
memberId: member.member.memberId.toString(),
|
};
|
||||||
},
|
|
||||||
}));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if we should show the visibility dialog
|
* Show the bulk members dialog if conditions are met
|
||||||
* Returns true if there are members for visibility and either:
|
* (admit pending members for organizers, add to contacts for non-organizers)
|
||||||
* - This is the first time (no previous members tracked), OR
|
|
||||||
* - New members have been added since last check (not removed)
|
|
||||||
*/
|
*/
|
||||||
shouldShowVisibilityDialog(): boolean {
|
async refreshData(bypassPromptIfAllWereIgnored = true) {
|
||||||
const currentMembers = this.getMembersForVisibility();
|
// Force refresh both contacts and members
|
||||||
|
this.contacts = await this.$getAllContacts();
|
||||||
|
await this.fetchMembers();
|
||||||
|
|
||||||
if (currentMembers.length === 0) {
|
const pendingMembers = this.isOrganizer
|
||||||
return false;
|
? this.getPendingMembersToAdmit()
|
||||||
|
: this.getNonContactMembers();
|
||||||
|
if (pendingMembers.length === 0) {
|
||||||
|
this.startAutoRefresh();
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
if (bypassPromptIfAllWereIgnored) {
|
||||||
// If no previous members tracked, show dialog
|
// only show if there are members that have not been ignored
|
||||||
if (this.previousVisibilityMembers.length === 0) {
|
const pendingMembersNotIgnored = pendingMembers.filter(
|
||||||
return true;
|
(member) => !this.previousMemberDidsIgnored.includes(member.did),
|
||||||
|
);
|
||||||
|
if (pendingMembersNotIgnored.length === 0) {
|
||||||
|
this.startAutoRefresh();
|
||||||
|
// everyone waiting has been ignored
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
this.stopAutoRefresh();
|
||||||
// Check if new members have been added (not just any change)
|
(this.$refs.bulkMembersDialog as BulkMembersDialog).open(pendingMembers);
|
||||||
const currentMemberIds = currentMembers.map((m) => m.did);
|
|
||||||
const previousMemberIds = this.previousVisibilityMembers;
|
|
||||||
|
|
||||||
// Find new members (members in current but not in previous)
|
|
||||||
const newMembers = currentMemberIds.filter(
|
|
||||||
(id) => !previousMemberIds.includes(id),
|
|
||||||
);
|
|
||||||
|
|
||||||
// Only show dialog if there are new members added
|
|
||||||
return newMembers.length > 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
// Bulk Members Dialog methods
|
||||||
* Update the tracking of previous visibility members
|
async closeBulkMembersDialogCallback(
|
||||||
*/
|
result: { notSelectedMemberDids: string[] } | undefined,
|
||||||
updatePreviousVisibilityMembers() {
|
) {
|
||||||
const currentMembers = this.getMembersForVisibility();
|
this.previousMemberDidsIgnored = result?.notSelectedMemberDids || [];
|
||||||
this.previousVisibilityMembers = currentMembers.map((m) => m.did);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
await this.refreshData();
|
||||||
* Show the visibility dialog if conditions are met
|
|
||||||
*/
|
|
||||||
checkAndShowVisibilityDialog() {
|
|
||||||
if (this.shouldShowVisibilityDialog()) {
|
|
||||||
this.showSetBulkVisibilityDialog();
|
|
||||||
}
|
|
||||||
this.updatePreviousVisibilityMembers();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
checkWhetherContactBeforeAdmitting(decrMember: DecryptedMember) {
|
checkWhetherContactBeforeAdmitting(decrMember: DecryptedMember) {
|
||||||
const contact = this.getContactFor(decrMember.did);
|
const contact = this.getContactFor(decrMember.did);
|
||||||
if (!decrMember.member.admitted && !contact) {
|
if (!decrMember.member.admitted && !contact) {
|
||||||
// If not a contact, show confirmation dialog
|
// If not a contact, stop auto-refresh and show confirmation dialog
|
||||||
|
this.stopAutoRefresh();
|
||||||
this.$notify(
|
this.$notify(
|
||||||
{
|
{
|
||||||
group: "modal",
|
group: "modal",
|
||||||
@@ -510,6 +576,7 @@ export default class MembersList extends Vue {
|
|||||||
await this.addAsContact(decrMember);
|
await this.addAsContact(decrMember);
|
||||||
// After adding as contact, proceed with admission
|
// After adding as contact, proceed with admission
|
||||||
await this.toggleAdmission(decrMember);
|
await this.toggleAdmission(decrMember);
|
||||||
|
this.startAutoRefresh();
|
||||||
},
|
},
|
||||||
onNo: async () => {
|
onNo: async () => {
|
||||||
// If they choose not to add as contact, show second confirmation
|
// If they choose not to add as contact, show second confirmation
|
||||||
@@ -522,14 +589,19 @@ export default class MembersList extends Vue {
|
|||||||
yesText: NOTIFY_CONTINUE_WITHOUT_ADDING.yesText,
|
yesText: NOTIFY_CONTINUE_WITHOUT_ADDING.yesText,
|
||||||
onYes: async () => {
|
onYes: async () => {
|
||||||
await this.toggleAdmission(decrMember);
|
await this.toggleAdmission(decrMember);
|
||||||
|
this.startAutoRefresh();
|
||||||
},
|
},
|
||||||
onCancel: async () => {
|
onCancel: async () => {
|
||||||
// Do nothing, effectively canceling the operation
|
// Do nothing, effectively canceling the operation
|
||||||
|
this.startAutoRefresh();
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
TIMEOUTS.MODAL,
|
TIMEOUTS.MODAL,
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
onCancel: async () => {
|
||||||
|
this.startAutoRefresh();
|
||||||
|
},
|
||||||
},
|
},
|
||||||
TIMEOUTS.MODAL,
|
TIMEOUTS.MODAL,
|
||||||
);
|
);
|
||||||
@@ -632,19 +704,8 @@ export default class MembersList extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
showSetBulkVisibilityDialog() {
|
|
||||||
// Filter members to show only those who need visibility set
|
|
||||||
const membersForVisibility = this.getMembersForVisibility();
|
|
||||||
|
|
||||||
// Pause auto-refresh when dialog opens
|
|
||||||
this.stopAutoRefresh();
|
|
||||||
|
|
||||||
// Open the dialog directly
|
|
||||||
this.visibilityDialogMembers = membersForVisibility;
|
|
||||||
this.showSetVisibilityDialog = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
startAutoRefresh() {
|
startAutoRefresh() {
|
||||||
|
this.stopAutoRefresh();
|
||||||
this.lastRefreshTime = Date.now();
|
this.lastRefreshTime = Date.now();
|
||||||
this.countdownTimer = 10;
|
this.countdownTimer = 10;
|
||||||
|
|
||||||
@@ -674,33 +735,6 @@ export default class MembersList extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
manualRefresh() {
|
|
||||||
// Clear existing auto-refresh interval
|
|
||||||
if (this.autoRefreshInterval) {
|
|
||||||
clearInterval(this.autoRefreshInterval);
|
|
||||||
this.autoRefreshInterval = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Trigger immediate refresh and restart timer
|
|
||||||
this.refreshData();
|
|
||||||
this.startAutoRefresh();
|
|
||||||
|
|
||||||
// Always show dialog on manual refresh if there are members for visibility
|
|
||||||
if (this.getMembersForVisibility().length > 0) {
|
|
||||||
this.showSetBulkVisibilityDialog();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set Visibility Dialog methods
|
|
||||||
closeSetVisibilityDialog() {
|
|
||||||
this.showSetVisibilityDialog = false;
|
|
||||||
this.visibilityDialogMembers = [];
|
|
||||||
// Refresh data when dialog is closed
|
|
||||||
this.refreshData();
|
|
||||||
// Resume auto-refresh when dialog is closed
|
|
||||||
this.startAutoRefresh();
|
|
||||||
}
|
|
||||||
|
|
||||||
beforeDestroy() {
|
beforeDestroy() {
|
||||||
this.stopAutoRefresh();
|
this.stopAutoRefresh();
|
||||||
}
|
}
|
||||||
@@ -718,23 +752,26 @@ export default class MembersList extends Vue {
|
|||||||
|
|
||||||
.btn-add-contact {
|
.btn-add-contact {
|
||||||
/* stylelint-disable-next-line at-rule-no-unknown */
|
/* stylelint-disable-next-line at-rule-no-unknown */
|
||||||
@apply w-6 h-6 flex items-center justify-center rounded-full
|
@apply text-lg text-green-600 hover:text-green-800
|
||||||
bg-green-100 text-green-600 hover:bg-green-200 hover:text-green-800
|
|
||||||
transition-colors;
|
transition-colors;
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-info-contact,
|
.btn-info-contact,
|
||||||
.btn-info-admission {
|
.btn-info-admission {
|
||||||
/* stylelint-disable-next-line at-rule-no-unknown */
|
/* stylelint-disable-next-line at-rule-no-unknown */
|
||||||
@apply w-6 h-6 flex items-center justify-center rounded-full
|
@apply text-slate-400 hover:text-slate-600
|
||||||
bg-slate-100 text-slate-400 hover:text-slate-600
|
|
||||||
transition-colors;
|
transition-colors;
|
||||||
}
|
}
|
||||||
|
|
||||||
.btn-admission {
|
.btn-admission-add {
|
||||||
/* stylelint-disable-next-line at-rule-no-unknown */
|
/* stylelint-disable-next-line at-rule-no-unknown */
|
||||||
@apply w-6 h-6 flex items-center justify-center rounded-full
|
@apply text-lg text-blue-500 hover:text-blue-700
|
||||||
bg-blue-100 text-blue-600 hover:bg-blue-200 hover:text-blue-800
|
transition-colors;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-admission-remove {
|
||||||
|
/* stylelint-disable-next-line at-rule-no-unknown */
|
||||||
|
@apply text-lg text-rose-500 hover:text-rose-700
|
||||||
transition-colors;
|
transition-colors;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -3,25 +3,30 @@ GiftedDialog.vue to handle person entity display * with selection states and
|
|||||||
conflict detection. * * @author Matthew Raymer */
|
conflict detection. * * @author Matthew Raymer */
|
||||||
<template>
|
<template>
|
||||||
<li :class="cardClasses" @click="handleClick">
|
<li :class="cardClasses" @click="handleClick">
|
||||||
<div>
|
<div class="relative w-fit mx-auto">
|
||||||
<EntityIcon
|
<EntityIcon
|
||||||
v-if="person.did"
|
v-if="person.did"
|
||||||
:contact="person"
|
:contact="person"
|
||||||
class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
|
class="!size-[3rem] mx-auto border border-slate-300 bg-white overflow-hidden rounded-full mb-1"
|
||||||
/>
|
/>
|
||||||
<font-awesome
|
<font-awesome
|
||||||
v-else
|
v-else
|
||||||
icon="circle-question"
|
icon="circle-question"
|
||||||
class="text-slate-400 text-5xl mb-1 shrink-0"
|
class="text-slate-400 text-5xl mb-1"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<!-- Time icon overlay for contacts -->
|
||||||
|
<div
|
||||||
|
v-if="person.did && showTimeIcon"
|
||||||
|
class="rounded-full bg-slate-400 absolute bottom-0 right-0 p-1 translate-x-1/3"
|
||||||
|
>
|
||||||
|
<font-awesome icon="clock" class="block text-white text-xs w-[1em]" />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="overflow-hidden">
|
<h3 :class="nameClasses">
|
||||||
<h3 :class="nameClasses">
|
{{ displayName }}
|
||||||
{{ displayName }}
|
</h3>
|
||||||
</h3>
|
|
||||||
<p class="text-xs text-slate-500 truncate">{{ person.did }}</p>
|
|
||||||
</div>
|
|
||||||
</li>
|
</li>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -76,32 +81,29 @@ export default class PersonCard extends Vue {
|
|||||||
* Computed CSS classes for the card
|
* Computed CSS classes for the card
|
||||||
*/
|
*/
|
||||||
get cardClasses(): string {
|
get cardClasses(): string {
|
||||||
const baseCardClasses =
|
|
||||||
"flex items-center gap-2 px-2 py-1.5 border-b border-slate-300";
|
|
||||||
|
|
||||||
if (!this.selectable || this.conflicted) {
|
if (!this.selectable || this.conflicted) {
|
||||||
return `${baseCardClasses} *:opacity-50 cursor-not-allowed`;
|
return "opacity-50 cursor-not-allowed";
|
||||||
}
|
}
|
||||||
|
return "cursor-pointer hover:bg-slate-50";
|
||||||
return `${baseCardClasses} cursor-pointer hover:bg-slate-50`;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed CSS classes for the person name
|
* Computed CSS classes for the person name
|
||||||
*/
|
*/
|
||||||
get nameClasses(): string {
|
get nameClasses(): string {
|
||||||
const baseNameClasses = "text-sm font-semibold truncate";
|
const baseClasses =
|
||||||
|
"text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden";
|
||||||
|
|
||||||
if (this.conflicted) {
|
if (this.conflicted) {
|
||||||
return `${baseNameClasses} text-slate-500`;
|
return `${baseClasses} text-slate-400`;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add italic styling for entities without set names
|
// Add italic styling for entities without set names
|
||||||
if (!this.person.name) {
|
if (!this.person.name) {
|
||||||
return `${baseNameClasses} italic text-slate-500`;
|
return `${baseClasses} italic text-slate-500`;
|
||||||
}
|
}
|
||||||
|
|
||||||
return baseNameClasses;
|
return baseClasses;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -2,26 +2,25 @@
|
|||||||
GiftedDialog.vue to handle project entity display * with selection states and
|
GiftedDialog.vue to handle project entity display * with selection states and
|
||||||
issuer information. * * @author Matthew Raymer */
|
issuer information. * * @author Matthew Raymer */
|
||||||
<template>
|
<template>
|
||||||
<li
|
<li class="cursor-pointer" @click="handleClick">
|
||||||
class="flex items-center gap-2 px-2 py-1.5 border-b border-slate-300 hover:bg-slate-50 cursor-pointer"
|
<div class="relative w-fit mx-auto">
|
||||||
@click="handleClick"
|
<ProjectIcon
|
||||||
>
|
:entity-id="project.handleId"
|
||||||
<ProjectIcon
|
:icon-size="48"
|
||||||
:entity-id="project.handleId"
|
:image-url="project.image"
|
||||||
:icon-size="48"
|
class="!size-[3rem] mx-auto border border-slate-300 bg-white overflow-hidden rounded-full mb-1"
|
||||||
:image-url="project.image"
|
/>
|
||||||
class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
|
</div>
|
||||||
/>
|
|
||||||
|
|
||||||
<div class="overflow-hidden">
|
<h3
|
||||||
<h3 class="text-sm font-semibold truncate">
|
class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
|
||||||
{{ project.name || unnamedProject }}
|
>
|
||||||
</h3>
|
{{ project.name || unnamedProject }}
|
||||||
|
</h3>
|
||||||
|
|
||||||
<div class="text-xs text-slate-500 truncate">
|
<div class="text-xs text-slate-500 truncate">
|
||||||
<font-awesome icon="user" class="text-slate-400" />
|
<font-awesome icon="user" class="fa-fw text-slate-400" />
|
||||||
{{ issuerDisplayName }}
|
{{ issuerDisplayName }}
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
66
src/components/ShowAllCard.vue
Normal file
66
src/components/ShowAllCard.vue
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
/** * ShowAllCard.vue - Show All navigation card component * * Extracted from
|
||||||
|
GiftedDialog.vue to handle "Show All" navigation * for both people and projects
|
||||||
|
entity types. * * @author Matthew Raymer */
|
||||||
|
<template>
|
||||||
|
<li class="cursor-pointer">
|
||||||
|
<router-link :to="navigationRoute" class="block text-center">
|
||||||
|
<font-awesome icon="circle-right" class="text-blue-500 text-5xl mb-1" />
|
||||||
|
<h3
|
||||||
|
class="text-xs text-slate-500 font-medium italic text-ellipsis whitespace-nowrap overflow-hidden"
|
||||||
|
>
|
||||||
|
Show All
|
||||||
|
</h3>
|
||||||
|
</router-link>
|
||||||
|
</li>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script lang="ts">
|
||||||
|
import { Component, Prop, Vue } from "vue-facing-decorator";
|
||||||
|
import { RouteLocationRaw } from "vue-router";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ShowAllCard - Displays "Show All" navigation for entity grids
|
||||||
|
*
|
||||||
|
* Features:
|
||||||
|
* - Provides navigation to full entity listings
|
||||||
|
* - Supports different routes based on entity type
|
||||||
|
* - Maintains context through query parameters
|
||||||
|
* - Consistent visual styling with other cards
|
||||||
|
*/
|
||||||
|
@Component({ name: "ShowAllCard" })
|
||||||
|
export default class ShowAllCard extends Vue {
|
||||||
|
/** Type of entities being shown */
|
||||||
|
@Prop({ required: true })
|
||||||
|
entityType!: "people" | "projects";
|
||||||
|
|
||||||
|
/** Route name to navigate to */
|
||||||
|
@Prop({ required: true })
|
||||||
|
routeName!: string;
|
||||||
|
|
||||||
|
/** Query parameters to pass to the route */
|
||||||
|
@Prop({ default: () => ({}) })
|
||||||
|
queryParams!: Record<string, string>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Computed navigation route with query parameters
|
||||||
|
*/
|
||||||
|
get navigationRoute(): RouteLocationRaw {
|
||||||
|
return {
|
||||||
|
name: this.routeName,
|
||||||
|
query: this.queryParams,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
/* Ensure router-link styling is consistent */
|
||||||
|
a {
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
a:hover .fa-circle-right {
|
||||||
|
transform: scale(1.1);
|
||||||
|
transition: transform 0.2s ease;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -63,24 +63,23 @@ export default class SpecialEntityCard extends Vue {
|
|||||||
conflictContext!: string;
|
conflictContext!: string;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed CSS classes for the card
|
* Computed CSS classes for the card container
|
||||||
*/
|
*/
|
||||||
get cardClasses(): string {
|
get cardClasses(): string {
|
||||||
const baseCardClasses =
|
const baseClasses = "block";
|
||||||
"flex items-center gap-2 px-2 py-1.5 border-b border-slate-300";
|
|
||||||
|
|
||||||
if (!this.selectable || this.conflicted) {
|
if (!this.selectable || this.conflicted) {
|
||||||
return `${baseCardClasses} *:opacity-50 cursor-not-allowed`;
|
return `${baseClasses} cursor-not-allowed opacity-50`;
|
||||||
}
|
}
|
||||||
|
|
||||||
return `${baseCardClasses} cursor-pointer hover:bg-slate-50`;
|
return `${baseClasses} cursor-pointer`;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed CSS classes for the icon
|
* Computed CSS classes for the icon
|
||||||
*/
|
*/
|
||||||
get iconClasses(): string {
|
get iconClasses(): string {
|
||||||
const baseClasses = "text-[2rem]";
|
const baseClasses = "text-5xl mb-1";
|
||||||
|
|
||||||
if (this.conflicted) {
|
if (this.conflicted) {
|
||||||
return `${baseClasses} text-slate-400`;
|
return `${baseClasses} text-slate-400`;
|
||||||
@@ -102,7 +101,7 @@ export default class SpecialEntityCard extends Vue {
|
|||||||
*/
|
*/
|
||||||
get nameClasses(): string {
|
get nameClasses(): string {
|
||||||
const baseClasses =
|
const baseClasses =
|
||||||
"text-sm font-semibold text-ellipsis whitespace-nowrap overflow-hidden";
|
"text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden";
|
||||||
|
|
||||||
if (this.conflicted) {
|
if (this.conflicted) {
|
||||||
return `${baseClasses} text-slate-400`;
|
return `${baseClasses} text-slate-400`;
|
||||||
|
|||||||
@@ -6,3 +6,12 @@ export interface UserInfo {
|
|||||||
profileImageUrl?: string;
|
profileImageUrl?: string;
|
||||||
nextPublicEncKeyHash?: string;
|
nextPublicEncKeyHash?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface MemberData {
|
||||||
|
did: string;
|
||||||
|
name: string;
|
||||||
|
isContact: boolean;
|
||||||
|
member: {
|
||||||
|
memberId: string;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ import {
|
|||||||
PlanSummaryAndPreviousClaim,
|
PlanSummaryAndPreviousClaim,
|
||||||
PlanSummaryRecord,
|
PlanSummaryRecord,
|
||||||
} from "../interfaces/records";
|
} from "../interfaces/records";
|
||||||
import { logger } from "../utils/logger";
|
import { logger, safeStringify } 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";
|
||||||
import { SOMEONE_UNNAMED } from "@/constants/entities";
|
import { SOMEONE_UNNAMED } from "@/constants/entities";
|
||||||
@@ -702,7 +702,7 @@ export function serverMessageForUser(error: unknown): string | undefined {
|
|||||||
export function errorStringForLog(error: unknown) {
|
export function errorStringForLog(error: unknown) {
|
||||||
let stringifiedError = "" + error;
|
let stringifiedError = "" + error;
|
||||||
try {
|
try {
|
||||||
stringifiedError = JSON.stringify(error);
|
stringifiedError = safeStringify(error);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
// can happen with Dexie, eg:
|
// can happen with Dexie, eg:
|
||||||
// TypeError: Converting circular structure to JSON
|
// TypeError: Converting circular structure to JSON
|
||||||
@@ -714,7 +714,7 @@ export function errorStringForLog(error: unknown) {
|
|||||||
|
|
||||||
if (error && typeof error === "object" && "response" in error) {
|
if (error && typeof error === "object" && "response" in error) {
|
||||||
const err = error as AxiosErrorResponse;
|
const err = error as AxiosErrorResponse;
|
||||||
const errorResponseText = JSON.stringify(err.response);
|
const errorResponseText = safeStringify(err.response);
|
||||||
// for some reason, error.response is not included in stringify result (eg. for 400 errors on invite redemptions)
|
// for some reason, error.response is not included in stringify result (eg. for 400 errors on invite redemptions)
|
||||||
if (!R.empty(errorResponseText) && !fullError.includes(errorResponseText)) {
|
if (!R.empty(errorResponseText) && !fullError.includes(errorResponseText)) {
|
||||||
// add error.response stuff
|
// add error.response stuff
|
||||||
@@ -724,7 +724,7 @@ export function errorStringForLog(error: unknown) {
|
|||||||
R.equals(err.config, err.response.config)
|
R.equals(err.config, err.response.config)
|
||||||
) {
|
) {
|
||||||
// but exclude "config" because it's already in there
|
// but exclude "config" because it's already in there
|
||||||
const newErrorResponseText = JSON.stringify(
|
const newErrorResponseText = safeStringify(
|
||||||
R.omit(["config"] as never[], err.response),
|
R.omit(["config"] as never[], err.response),
|
||||||
);
|
);
|
||||||
fullError +=
|
fullError +=
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ import {
|
|||||||
faCircle,
|
faCircle,
|
||||||
faCircleCheck,
|
faCircleCheck,
|
||||||
faCircleInfo,
|
faCircleInfo,
|
||||||
|
faCircleMinus,
|
||||||
faCirclePlus,
|
faCirclePlus,
|
||||||
faCircleQuestion,
|
faCircleQuestion,
|
||||||
faCircleRight,
|
faCircleRight,
|
||||||
@@ -37,6 +38,7 @@ import {
|
|||||||
faCoins,
|
faCoins,
|
||||||
faComment,
|
faComment,
|
||||||
faCopy,
|
faCopy,
|
||||||
|
faCrown,
|
||||||
faDollar,
|
faDollar,
|
||||||
faDownload,
|
faDownload,
|
||||||
faEllipsis,
|
faEllipsis,
|
||||||
@@ -58,6 +60,7 @@ import {
|
|||||||
faHand,
|
faHand,
|
||||||
faHandHoldingDollar,
|
faHandHoldingDollar,
|
||||||
faHandHoldingHeart,
|
faHandHoldingHeart,
|
||||||
|
faHourglassHalf,
|
||||||
faHouseChimney,
|
faHouseChimney,
|
||||||
faImage,
|
faImage,
|
||||||
faImagePortrait,
|
faImagePortrait,
|
||||||
@@ -123,6 +126,7 @@ library.add(
|
|||||||
faCircle,
|
faCircle,
|
||||||
faCircleCheck,
|
faCircleCheck,
|
||||||
faCircleInfo,
|
faCircleInfo,
|
||||||
|
faCircleMinus,
|
||||||
faCirclePlus,
|
faCirclePlus,
|
||||||
faCircleQuestion,
|
faCircleQuestion,
|
||||||
faCircleRight,
|
faCircleRight,
|
||||||
@@ -131,6 +135,7 @@ library.add(
|
|||||||
faCoins,
|
faCoins,
|
||||||
faComment,
|
faComment,
|
||||||
faCopy,
|
faCopy,
|
||||||
|
faCrown,
|
||||||
faDollar,
|
faDollar,
|
||||||
faDownload,
|
faDownload,
|
||||||
faEllipsis,
|
faEllipsis,
|
||||||
@@ -152,6 +157,7 @@ library.add(
|
|||||||
faHand,
|
faHand,
|
||||||
faHandHoldingDollar,
|
faHandHoldingDollar,
|
||||||
faHandHoldingHeart,
|
faHandHoldingHeart,
|
||||||
|
faHourglassHalf,
|
||||||
faHouseChimney,
|
faHouseChimney,
|
||||||
faImage,
|
faImage,
|
||||||
faImagePortrait,
|
faImagePortrait,
|
||||||
|
|||||||
@@ -5,5 +5,6 @@ export interface UserProfile {
|
|||||||
locLat2?: number;
|
locLat2?: number;
|
||||||
locLon2?: number;
|
locLon2?: number;
|
||||||
issuerDid: string;
|
issuerDid: string;
|
||||||
|
issuerDidVisibleToDids?: Array<string>;
|
||||||
rowId?: string; // set on profile retrieved from server
|
rowId?: string; // set on profile retrieved from server
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -988,11 +988,6 @@ export async function importFromMnemonic(
|
|||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const mne: string = mnemonic.trim().toLowerCase();
|
const mne: string = mnemonic.trim().toLowerCase();
|
||||||
|
|
||||||
// Check if this is Test User #0
|
|
||||||
const TEST_USER_0_MNEMONIC =
|
|
||||||
"rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage";
|
|
||||||
const isTestUser0 = mne === TEST_USER_0_MNEMONIC;
|
|
||||||
|
|
||||||
// Derive address and keys from mnemonic
|
// Derive address and keys from mnemonic
|
||||||
const [address, privateHex, publicHex] = deriveAddress(mne, derivationPath);
|
const [address, privateHex, publicHex] = deriveAddress(mne, derivationPath);
|
||||||
|
|
||||||
@@ -1007,90 +1002,6 @@ export async function importFromMnemonic(
|
|||||||
|
|
||||||
// Save the new identity
|
// Save the new identity
|
||||||
await saveNewIdentity(newId, mne, derivationPath);
|
await saveNewIdentity(newId, mne, derivationPath);
|
||||||
|
|
||||||
// Set up Test User #0 specific settings
|
|
||||||
if (isTestUser0) {
|
|
||||||
// Set up Test User #0 specific settings with enhanced error handling
|
|
||||||
const platformService = await getPlatformService();
|
|
||||||
|
|
||||||
try {
|
|
||||||
// First, ensure the DID-specific settings record exists
|
|
||||||
await platformService.insertNewDidIntoSettings(newId.did);
|
|
||||||
|
|
||||||
// Then update with Test User #0 specific settings
|
|
||||||
await platformService.updateDidSpecificSettings(newId.did, {
|
|
||||||
firstName: "User Zero",
|
|
||||||
isRegistered: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
// Verify the settings were saved correctly
|
|
||||||
const verificationResult = await platformService.dbQuery(
|
|
||||||
"SELECT firstName, isRegistered FROM settings WHERE accountDid = ?",
|
|
||||||
[newId.did],
|
|
||||||
);
|
|
||||||
|
|
||||||
if (verificationResult?.values?.length) {
|
|
||||||
const settings = verificationResult.values[0];
|
|
||||||
const firstName = settings[0];
|
|
||||||
const isRegistered = settings[1];
|
|
||||||
|
|
||||||
logger.debug(
|
|
||||||
"[importFromMnemonic] Test User #0 settings verification",
|
|
||||||
{
|
|
||||||
did: newId.did,
|
|
||||||
firstName,
|
|
||||||
isRegistered,
|
|
||||||
expectedFirstName: "User Zero",
|
|
||||||
expectedIsRegistered: true,
|
|
||||||
},
|
|
||||||
);
|
|
||||||
|
|
||||||
// If settings weren't saved correctly, try individual updates
|
|
||||||
if (firstName !== "User Zero" || isRegistered !== 1) {
|
|
||||||
logger.warn(
|
|
||||||
"[importFromMnemonic] Test User #0 settings not saved correctly, retrying with individual updates",
|
|
||||||
);
|
|
||||||
|
|
||||||
await platformService.dbExec(
|
|
||||||
"UPDATE settings SET firstName = ? WHERE accountDid = ?",
|
|
||||||
["User Zero", newId.did],
|
|
||||||
);
|
|
||||||
|
|
||||||
await platformService.dbExec(
|
|
||||||
"UPDATE settings SET isRegistered = ? WHERE accountDid = ?",
|
|
||||||
[1, newId.did],
|
|
||||||
);
|
|
||||||
|
|
||||||
// Verify again
|
|
||||||
const retryResult = await platformService.dbQuery(
|
|
||||||
"SELECT firstName, isRegistered FROM settings WHERE accountDid = ?",
|
|
||||||
[newId.did],
|
|
||||||
);
|
|
||||||
|
|
||||||
if (retryResult?.values?.length) {
|
|
||||||
const retrySettings = retryResult.values[0];
|
|
||||||
logger.debug(
|
|
||||||
"[importFromMnemonic] Test User #0 settings after retry",
|
|
||||||
{
|
|
||||||
firstName: retrySettings[0],
|
|
||||||
isRegistered: retrySettings[1],
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
logger.error(
|
|
||||||
"[importFromMnemonic] Failed to verify Test User #0 settings - no record found",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"[importFromMnemonic] Error setting up Test User #0 settings:",
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
// Don't throw - allow the import to continue even if settings fail
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
297
src/services/platforms/BaseDatabaseService.ts
Normal file
297
src/services/platforms/BaseDatabaseService.ts
Normal file
@@ -0,0 +1,297 @@
|
|||||||
|
/**
|
||||||
|
* @fileoverview Base Database Service for Platform Services
|
||||||
|
* @author Matthew Raymer
|
||||||
|
*
|
||||||
|
* This abstract base class provides common database operations that are
|
||||||
|
* identical across all platform implementations. It eliminates code
|
||||||
|
* duplication and ensures consistency in database operations.
|
||||||
|
*
|
||||||
|
* Key Features:
|
||||||
|
* - Common database utility methods
|
||||||
|
* - Consistent settings management
|
||||||
|
* - Active identity management
|
||||||
|
* - Abstract methods for platform-specific database operations
|
||||||
|
*
|
||||||
|
* Architecture:
|
||||||
|
* - Abstract base class with common implementations
|
||||||
|
* - Platform services extend this class
|
||||||
|
* - Platform-specific database operations remain abstract
|
||||||
|
*
|
||||||
|
* @since 1.1.1-beta
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { logger } from "../../utils/logger";
|
||||||
|
import { QueryExecResult } from "@/interfaces/database";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Abstract base class for platform-specific database services.
|
||||||
|
*
|
||||||
|
* This class provides common database operations that are identical
|
||||||
|
* across all platform implementations (Web, Capacitor, Electron).
|
||||||
|
* Platform-specific services extend this class and implement the
|
||||||
|
* abstract database operation methods.
|
||||||
|
*
|
||||||
|
* Common Operations:
|
||||||
|
* - Settings management (update, retrieve, insert)
|
||||||
|
* - Active identity management
|
||||||
|
* - Database utility methods
|
||||||
|
*
|
||||||
|
* @abstract
|
||||||
|
* @example
|
||||||
|
* ```typescript
|
||||||
|
* export class WebPlatformService extends BaseDatabaseService {
|
||||||
|
* async dbQuery(sql: string, params?: unknown[]): Promise<QueryExecResult> {
|
||||||
|
* // Web-specific implementation
|
||||||
|
* }
|
||||||
|
* }
|
||||||
|
* ```
|
||||||
|
*/
|
||||||
|
export abstract class BaseDatabaseService {
|
||||||
|
/**
|
||||||
|
* Generate an INSERT statement for a model object.
|
||||||
|
*
|
||||||
|
* Creates a parameterized INSERT statement with placeholders for
|
||||||
|
* all properties in the model object. This ensures safe SQL
|
||||||
|
* execution and prevents SQL injection.
|
||||||
|
*
|
||||||
|
* @param model - Object containing the data to insert
|
||||||
|
* @param tableName - Name of the target table
|
||||||
|
* @returns Object containing the SQL statement and parameters
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* ```typescript
|
||||||
|
* const { sql, params } = this.generateInsertStatement(
|
||||||
|
* { name: 'John', age: 30 },
|
||||||
|
* 'users'
|
||||||
|
* );
|
||||||
|
* // sql: "INSERT INTO users (name, age) VALUES (?, ?)"
|
||||||
|
* // params: ['John', 30]
|
||||||
|
* ```
|
||||||
|
*/
|
||||||
|
generateInsertStatement(
|
||||||
|
model: Record<string, unknown>,
|
||||||
|
tableName: string,
|
||||||
|
): { sql: string; params: unknown[] } {
|
||||||
|
const keys = Object.keys(model);
|
||||||
|
const placeholders = keys.map(() => "?").join(", ");
|
||||||
|
const sql = `INSERT INTO ${tableName} (${keys.join(", ")}) VALUES (${placeholders})`;
|
||||||
|
const params = keys.map((key) => model[key]);
|
||||||
|
return { sql, params };
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update default settings for the currently active account.
|
||||||
|
*
|
||||||
|
* Retrieves the active DID from the active_identity table and updates
|
||||||
|
* the corresponding settings record. This ensures settings are always
|
||||||
|
* updated for the correct account.
|
||||||
|
*
|
||||||
|
* @param settings - Object containing the settings to update
|
||||||
|
* @returns Promise that resolves when settings are updated
|
||||||
|
*
|
||||||
|
* @throws {Error} If no active DID is found or database operation fails
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* ```typescript
|
||||||
|
* await this.updateDefaultSettings({
|
||||||
|
* theme: 'dark',
|
||||||
|
* notifications: true
|
||||||
|
* });
|
||||||
|
* ```
|
||||||
|
*/
|
||||||
|
async updateDefaultSettings(
|
||||||
|
settings: Record<string, unknown>,
|
||||||
|
): Promise<void> {
|
||||||
|
// Get current active DID and update that identity's settings
|
||||||
|
const activeIdentity = await this.getActiveIdentity();
|
||||||
|
const activeDid = activeIdentity.activeDid;
|
||||||
|
|
||||||
|
if (!activeDid) {
|
||||||
|
logger.warn(
|
||||||
|
"[BaseDatabaseService] No active DID found, cannot update default settings",
|
||||||
|
);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const keys = Object.keys(settings);
|
||||||
|
const setClause = keys.map((key) => `${key} = ?`).join(", ");
|
||||||
|
const sql = `UPDATE settings SET ${setClause} WHERE accountDid = ?`;
|
||||||
|
const params = [...keys.map((key) => settings[key]), activeDid];
|
||||||
|
await this.dbExec(sql, params);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update the active DID in the active_identity table.
|
||||||
|
*
|
||||||
|
* Sets the active DID and updates the lastUpdated timestamp.
|
||||||
|
* This is used when switching between different accounts/identities.
|
||||||
|
*
|
||||||
|
* @param did - The DID to set as active
|
||||||
|
* @returns Promise that resolves when the update is complete
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* ```typescript
|
||||||
|
* await this.updateActiveDid('did:example:123');
|
||||||
|
* ```
|
||||||
|
*/
|
||||||
|
async updateActiveDid(did: string): Promise<void> {
|
||||||
|
await this.dbExec(
|
||||||
|
"UPDATE active_identity SET activeDid = ?, lastUpdated = datetime('now') WHERE id = 1",
|
||||||
|
[did],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the currently active DID from the active_identity table.
|
||||||
|
*
|
||||||
|
* Retrieves the active DID that represents the currently selected
|
||||||
|
* account/identity. This is used throughout the application to
|
||||||
|
* ensure operations are performed on the correct account.
|
||||||
|
*
|
||||||
|
* @returns Promise resolving to object containing the active DID
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* ```typescript
|
||||||
|
* const { activeDid } = await this.getActiveIdentity();
|
||||||
|
* console.log('Current active DID:', activeDid);
|
||||||
|
* ```
|
||||||
|
*/
|
||||||
|
async getActiveIdentity(): Promise<{ activeDid: string }> {
|
||||||
|
const result = (await this.dbQuery(
|
||||||
|
"SELECT activeDid FROM active_identity WHERE id = 1",
|
||||||
|
)) as QueryExecResult;
|
||||||
|
return {
|
||||||
|
activeDid: (result?.values?.[0]?.[0] as string) || "",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Insert a new DID into the settings table with default values.
|
||||||
|
*
|
||||||
|
* Creates a new settings record for a DID with default configuration
|
||||||
|
* values. Uses INSERT OR REPLACE to handle cases where settings
|
||||||
|
* already exist for the DID.
|
||||||
|
*
|
||||||
|
* @param did - The DID to create settings for
|
||||||
|
* @returns Promise that resolves when settings are created
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* ```typescript
|
||||||
|
* await this.insertNewDidIntoSettings('did:example:123');
|
||||||
|
* ```
|
||||||
|
*/
|
||||||
|
async insertNewDidIntoSettings(did: string): Promise<void> {
|
||||||
|
// Import constants dynamically to avoid circular dependencies
|
||||||
|
const { DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER } =
|
||||||
|
await import("@/constants/app");
|
||||||
|
|
||||||
|
// Use INSERT OR REPLACE to handle case where settings already exist for this DID
|
||||||
|
// This prevents duplicate accountDid entries and ensures data integrity
|
||||||
|
await this.dbExec(
|
||||||
|
"INSERT OR REPLACE INTO settings (accountDid, finishedOnboarding, apiServer, partnerApiServer) VALUES (?, ?, ?, ?)",
|
||||||
|
[did, false, DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Update settings for a specific DID.
|
||||||
|
*
|
||||||
|
* Updates settings for a particular DID rather than the active one.
|
||||||
|
* This is useful for bulk operations or when managing multiple accounts.
|
||||||
|
*
|
||||||
|
* @param did - The DID to update settings for
|
||||||
|
* @param settings - Object containing the settings to update
|
||||||
|
* @returns Promise that resolves when settings are updated
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* ```typescript
|
||||||
|
* await this.updateDidSpecificSettings('did:example:123', {
|
||||||
|
* theme: 'light',
|
||||||
|
* notifications: false
|
||||||
|
* });
|
||||||
|
* ```
|
||||||
|
*/
|
||||||
|
async updateDidSpecificSettings(
|
||||||
|
did: string,
|
||||||
|
settings: Record<string, unknown>,
|
||||||
|
): Promise<void> {
|
||||||
|
const keys = Object.keys(settings);
|
||||||
|
const setClause = keys.map((key) => `${key} = ?`).join(", ");
|
||||||
|
const sql = `UPDATE settings SET ${setClause} WHERE accountDid = ?`;
|
||||||
|
const params = [...keys.map((key) => settings[key]), did];
|
||||||
|
await this.dbExec(sql, params);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieve settings for the currently active account.
|
||||||
|
*
|
||||||
|
* Gets the active DID and retrieves all settings for that account.
|
||||||
|
* Excludes the 'id' column from the returned settings object.
|
||||||
|
*
|
||||||
|
* @returns Promise resolving to settings object or null if no active DID
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* ```typescript
|
||||||
|
* const settings = await this.retrieveSettingsForActiveAccount();
|
||||||
|
* if (settings) {
|
||||||
|
* console.log('Theme:', settings.theme);
|
||||||
|
* console.log('Notifications:', settings.notifications);
|
||||||
|
* }
|
||||||
|
* ```
|
||||||
|
*/
|
||||||
|
async retrieveSettingsForActiveAccount(): Promise<Record<
|
||||||
|
string,
|
||||||
|
unknown
|
||||||
|
> | null> {
|
||||||
|
// Get current active DID from active_identity table
|
||||||
|
const activeIdentity = await this.getActiveIdentity();
|
||||||
|
const activeDid = activeIdentity.activeDid;
|
||||||
|
|
||||||
|
if (!activeDid) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = (await this.dbQuery(
|
||||||
|
"SELECT * FROM settings WHERE accountDid = ?",
|
||||||
|
[activeDid],
|
||||||
|
)) as QueryExecResult;
|
||||||
|
if (result?.values?.[0]) {
|
||||||
|
// Convert the row to an object
|
||||||
|
const row = result.values[0];
|
||||||
|
const columns = result.columns || [];
|
||||||
|
const settings: Record<string, unknown> = {};
|
||||||
|
|
||||||
|
columns.forEach((column: string, index: number) => {
|
||||||
|
if (column !== "id") {
|
||||||
|
// Exclude the id column
|
||||||
|
settings[column] = row[index];
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return settings;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Abstract methods that must be implemented by platform-specific services
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Execute a database query (SELECT operations).
|
||||||
|
*
|
||||||
|
* @abstract
|
||||||
|
* @param sql - SQL query string
|
||||||
|
* @param params - Optional parameters for prepared statements
|
||||||
|
* @returns Promise resolving to query results
|
||||||
|
*/
|
||||||
|
abstract dbQuery(sql: string, params?: unknown[]): Promise<unknown>;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Execute a database statement (INSERT, UPDATE, DELETE operations).
|
||||||
|
*
|
||||||
|
* @abstract
|
||||||
|
* @param sql - SQL statement string
|
||||||
|
* @param params - Optional parameters for prepared statements
|
||||||
|
* @returns Promise resolving to execution results
|
||||||
|
*/
|
||||||
|
abstract dbExec(sql: string, params?: unknown[]): Promise<unknown>;
|
||||||
|
}
|
||||||
@@ -22,6 +22,7 @@ import {
|
|||||||
PlatformCapabilities,
|
PlatformCapabilities,
|
||||||
} from "../PlatformService";
|
} from "../PlatformService";
|
||||||
import { logger } from "../../utils/logger";
|
import { logger } from "../../utils/logger";
|
||||||
|
import { BaseDatabaseService } from "./BaseDatabaseService";
|
||||||
|
|
||||||
interface QueuedOperation {
|
interface QueuedOperation {
|
||||||
type: "run" | "query" | "rawQuery";
|
type: "run" | "query" | "rawQuery";
|
||||||
@@ -39,7 +40,10 @@ interface QueuedOperation {
|
|||||||
* - Platform-specific features
|
* - Platform-specific features
|
||||||
* - SQLite database operations
|
* - SQLite database operations
|
||||||
*/
|
*/
|
||||||
export class CapacitorPlatformService implements PlatformService {
|
export class CapacitorPlatformService
|
||||||
|
extends BaseDatabaseService
|
||||||
|
implements PlatformService
|
||||||
|
{
|
||||||
/** Current camera direction */
|
/** Current camera direction */
|
||||||
private currentDirection: CameraDirection = CameraDirection.Rear;
|
private currentDirection: CameraDirection = CameraDirection.Rear;
|
||||||
|
|
||||||
@@ -52,6 +56,7 @@ export class CapacitorPlatformService implements PlatformService {
|
|||||||
private isProcessingQueue: boolean = false;
|
private isProcessingQueue: boolean = false;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
|
super();
|
||||||
this.sqlite = new SQLiteConnection(CapacitorSQLite);
|
this.sqlite = new SQLiteConnection(CapacitorSQLite);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1328,79 +1333,8 @@ export class CapacitorPlatformService implements PlatformService {
|
|||||||
// --- PWA/Web-only methods (no-op for Capacitor) ---
|
// --- PWA/Web-only methods (no-op for Capacitor) ---
|
||||||
public registerServiceWorker(): void {}
|
public registerServiceWorker(): void {}
|
||||||
|
|
||||||
// Database utility methods
|
// Database utility methods - inherited from BaseDatabaseService
|
||||||
generateInsertStatement(
|
// generateInsertStatement, updateDefaultSettings, updateActiveDid,
|
||||||
model: Record<string, unknown>,
|
// getActiveIdentity, insertNewDidIntoSettings, updateDidSpecificSettings,
|
||||||
tableName: string,
|
// retrieveSettingsForActiveAccount are all inherited from BaseDatabaseService
|
||||||
): { sql: string; params: unknown[] } {
|
|
||||||
const keys = Object.keys(model);
|
|
||||||
const placeholders = keys.map(() => "?").join(", ");
|
|
||||||
const sql = `INSERT INTO ${tableName} (${keys.join(", ")}) VALUES (${placeholders})`;
|
|
||||||
const params = keys.map((key) => model[key]);
|
|
||||||
return { sql, params };
|
|
||||||
}
|
|
||||||
|
|
||||||
async updateDefaultSettings(
|
|
||||||
settings: Record<string, unknown>,
|
|
||||||
): Promise<void> {
|
|
||||||
const keys = Object.keys(settings);
|
|
||||||
const setClause = keys.map((key) => `${key} = ?`).join(", ");
|
|
||||||
const sql = `UPDATE settings SET ${setClause} WHERE id = 1`;
|
|
||||||
const params = keys.map((key) => settings[key]);
|
|
||||||
await this.dbExec(sql, params);
|
|
||||||
}
|
|
||||||
|
|
||||||
async updateActiveDid(did: string): Promise<void> {
|
|
||||||
await this.dbExec(
|
|
||||||
"UPDATE active_identity SET activeDid = ?, lastUpdated = datetime('now') WHERE id = 1",
|
|
||||||
[did],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
async insertNewDidIntoSettings(did: string): Promise<void> {
|
|
||||||
// Import constants dynamically to avoid circular dependencies
|
|
||||||
const { DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER } =
|
|
||||||
await import("@/constants/app");
|
|
||||||
|
|
||||||
// Use INSERT OR REPLACE to handle case where settings already exist for this DID
|
|
||||||
// This prevents duplicate accountDid entries and ensures data integrity
|
|
||||||
await this.dbExec(
|
|
||||||
"INSERT OR REPLACE INTO settings (accountDid, finishedOnboarding, apiServer, partnerApiServer) VALUES (?, ?, ?, ?)",
|
|
||||||
[did, false, DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
async updateDidSpecificSettings(
|
|
||||||
did: string,
|
|
||||||
settings: Record<string, unknown>,
|
|
||||||
): Promise<void> {
|
|
||||||
const keys = Object.keys(settings);
|
|
||||||
const setClause = keys.map((key) => `${key} = ?`).join(", ");
|
|
||||||
const sql = `UPDATE settings SET ${setClause} WHERE accountDid = ?`;
|
|
||||||
const params = [...keys.map((key) => settings[key]), did];
|
|
||||||
await this.dbExec(sql, params);
|
|
||||||
}
|
|
||||||
|
|
||||||
async retrieveSettingsForActiveAccount(): Promise<Record<
|
|
||||||
string,
|
|
||||||
unknown
|
|
||||||
> | null> {
|
|
||||||
const result = await this.dbQuery("SELECT * FROM settings WHERE id = 1");
|
|
||||||
if (result?.values?.[0]) {
|
|
||||||
// Convert the row to an object
|
|
||||||
const row = result.values[0];
|
|
||||||
const columns = result.columns || [];
|
|
||||||
const settings: Record<string, unknown> = {};
|
|
||||||
|
|
||||||
columns.forEach((column, index) => {
|
|
||||||
if (column !== "id") {
|
|
||||||
// Exclude the id column
|
|
||||||
settings[column] = row[index];
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return settings;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import {
|
|||||||
} from "../PlatformService";
|
} from "../PlatformService";
|
||||||
import { logger } from "../../utils/logger";
|
import { logger } from "../../utils/logger";
|
||||||
import { QueryExecResult } from "@/interfaces/database";
|
import { QueryExecResult } from "@/interfaces/database";
|
||||||
|
import { BaseDatabaseService } from "./BaseDatabaseService";
|
||||||
// Dynamic import of initBackend to prevent worker context errors
|
// Dynamic import of initBackend to prevent worker context errors
|
||||||
import type {
|
import type {
|
||||||
WorkerRequest,
|
WorkerRequest,
|
||||||
@@ -29,7 +30,10 @@ import type {
|
|||||||
* Note: File system operations are not available in the web platform
|
* Note: File system operations are not available in the web platform
|
||||||
* due to browser security restrictions. These methods throw appropriate errors.
|
* due to browser security restrictions. These methods throw appropriate errors.
|
||||||
*/
|
*/
|
||||||
export class WebPlatformService implements PlatformService {
|
export class WebPlatformService
|
||||||
|
extends BaseDatabaseService
|
||||||
|
implements PlatformService
|
||||||
|
{
|
||||||
private static instanceCount = 0; // Debug counter
|
private static instanceCount = 0; // Debug counter
|
||||||
private worker: Worker | null = null;
|
private worker: Worker | null = null;
|
||||||
private workerReady = false;
|
private workerReady = false;
|
||||||
@@ -46,6 +50,7 @@ export class WebPlatformService implements PlatformService {
|
|||||||
private readonly messageTimeout = 30000; // 30 seconds
|
private readonly messageTimeout = 30000; // 30 seconds
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
|
super();
|
||||||
WebPlatformService.instanceCount++;
|
WebPlatformService.instanceCount++;
|
||||||
|
|
||||||
logger.debug("[WebPlatformService] Initializing web platform service");
|
logger.debug("[WebPlatformService] Initializing web platform service");
|
||||||
@@ -668,105 +673,8 @@ export class WebPlatformService implements PlatformService {
|
|||||||
// SharedArrayBuffer initialization is handled by initBackend call in initializeWorker
|
// SharedArrayBuffer initialization is handled by initBackend call in initializeWorker
|
||||||
}
|
}
|
||||||
|
|
||||||
// Database utility methods
|
// Database utility methods - inherited from BaseDatabaseService
|
||||||
generateInsertStatement(
|
// generateInsertStatement, updateDefaultSettings, updateActiveDid,
|
||||||
model: Record<string, unknown>,
|
// getActiveIdentity, insertNewDidIntoSettings, updateDidSpecificSettings,
|
||||||
tableName: string,
|
// retrieveSettingsForActiveAccount are all inherited from BaseDatabaseService
|
||||||
): { sql: string; params: unknown[] } {
|
|
||||||
const keys = Object.keys(model);
|
|
||||||
const placeholders = keys.map(() => "?").join(", ");
|
|
||||||
const sql = `INSERT INTO ${tableName} (${keys.join(", ")}) VALUES (${placeholders})`;
|
|
||||||
const params = keys.map((key) => model[key]);
|
|
||||||
return { sql, params };
|
|
||||||
}
|
|
||||||
|
|
||||||
async updateDefaultSettings(
|
|
||||||
settings: Record<string, unknown>,
|
|
||||||
): Promise<void> {
|
|
||||||
// Get current active DID and update that identity's settings
|
|
||||||
const activeIdentity = await this.getActiveIdentity();
|
|
||||||
const activeDid = activeIdentity.activeDid;
|
|
||||||
|
|
||||||
if (!activeDid) {
|
|
||||||
logger.warn(
|
|
||||||
"[WebPlatformService] No active DID found, cannot update default settings",
|
|
||||||
);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const keys = Object.keys(settings);
|
|
||||||
const setClause = keys.map((key) => `${key} = ?`).join(", ");
|
|
||||||
const sql = `UPDATE settings SET ${setClause} WHERE accountDid = ?`;
|
|
||||||
const params = [...keys.map((key) => settings[key]), activeDid];
|
|
||||||
await this.dbExec(sql, params);
|
|
||||||
}
|
|
||||||
|
|
||||||
async updateActiveDid(did: string): Promise<void> {
|
|
||||||
await this.dbExec(
|
|
||||||
"INSERT OR REPLACE INTO active_identity (id, activeDid, lastUpdated) VALUES (1, ?, ?)",
|
|
||||||
[did, new Date().toISOString()],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
async getActiveIdentity(): Promise<{ activeDid: string }> {
|
|
||||||
const result = await this.dbQuery(
|
|
||||||
"SELECT activeDid FROM active_identity WHERE id = 1",
|
|
||||||
);
|
|
||||||
return {
|
|
||||||
activeDid: (result?.values?.[0]?.[0] as string) || "",
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
async insertNewDidIntoSettings(did: string): Promise<void> {
|
|
||||||
// Import constants dynamically to avoid circular dependencies
|
|
||||||
const { DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER } =
|
|
||||||
await import("@/constants/app");
|
|
||||||
|
|
||||||
// Use INSERT OR REPLACE to handle case where settings already exist for this DID
|
|
||||||
// This prevents duplicate accountDid entries and ensures data integrity
|
|
||||||
await this.dbExec(
|
|
||||||
"INSERT OR REPLACE INTO settings (accountDid, finishedOnboarding, apiServer, partnerApiServer) VALUES (?, ?, ?, ?)",
|
|
||||||
[did, false, DEFAULT_ENDORSER_API_SERVER, DEFAULT_PARTNER_API_SERVER],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
async updateDidSpecificSettings(
|
|
||||||
did: string,
|
|
||||||
settings: Record<string, unknown>,
|
|
||||||
): Promise<void> {
|
|
||||||
const keys = Object.keys(settings);
|
|
||||||
const setClause = keys.map((key) => `${key} = ?`).join(", ");
|
|
||||||
const sql = `UPDATE settings SET ${setClause} WHERE accountDid = ?`;
|
|
||||||
const params = [...keys.map((key) => settings[key]), did];
|
|
||||||
// Log update operation for debugging
|
|
||||||
logger.debug(
|
|
||||||
"[WebPlatformService] updateDidSpecificSettings",
|
|
||||||
sql,
|
|
||||||
JSON.stringify(params, null, 2),
|
|
||||||
);
|
|
||||||
await this.dbExec(sql, params);
|
|
||||||
}
|
|
||||||
|
|
||||||
async retrieveSettingsForActiveAccount(): Promise<Record<
|
|
||||||
string,
|
|
||||||
unknown
|
|
||||||
> | null> {
|
|
||||||
const result = await this.dbQuery("SELECT * FROM settings WHERE id = 1");
|
|
||||||
if (result?.values?.[0]) {
|
|
||||||
// Convert the row to an object
|
|
||||||
const row = result.values[0];
|
|
||||||
const columns = result.columns || [];
|
|
||||||
const settings: Record<string, unknown> = {};
|
|
||||||
|
|
||||||
columns.forEach((column, index) => {
|
|
||||||
if (column !== "id") {
|
|
||||||
// Exclude the id column
|
|
||||||
settings[column] = row[index];
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
return settings;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
<EntityGrid
|
<EntityGrid
|
||||||
entity-type="people"
|
entity-type="people"
|
||||||
:entities="people"
|
:entities="people"
|
||||||
|
:max-items="5"
|
||||||
:active-did="activeDid"
|
:active-did="activeDid"
|
||||||
:all-my-dids="allMyDids"
|
:all-my-dids="allMyDids"
|
||||||
:all-contacts="people"
|
:all-contacts="people"
|
||||||
@@ -38,6 +39,7 @@
|
|||||||
<EntityGrid
|
<EntityGrid
|
||||||
entity-type="projects"
|
entity-type="projects"
|
||||||
:entities="projects"
|
:entities="projects"
|
||||||
|
:max-items="3"
|
||||||
:active-did="activeDid"
|
:active-did="activeDid"
|
||||||
:all-my-dids="allMyDids"
|
:all-my-dids="allMyDids"
|
||||||
:all-contacts="people"
|
:all-contacts="people"
|
||||||
@@ -150,8 +152,11 @@ export default class EntityGridFunctionPropTest extends Vue {
|
|||||||
customPeopleFunction = (
|
customPeopleFunction = (
|
||||||
entities: Contact[],
|
entities: Contact[],
|
||||||
_entityType: string,
|
_entityType: string,
|
||||||
|
maxItems: number,
|
||||||
): Contact[] => {
|
): Contact[] => {
|
||||||
return entities.filter((person) => person.profileImageUrl);
|
return entities
|
||||||
|
.filter((person) => person.profileImageUrl)
|
||||||
|
.slice(0, maxItems);
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -160,6 +165,7 @@ export default class EntityGridFunctionPropTest extends Vue {
|
|||||||
customProjectsFunction = (
|
customProjectsFunction = (
|
||||||
entities: PlanData[],
|
entities: PlanData[],
|
||||||
_entityType: string,
|
_entityType: string,
|
||||||
|
_maxItems: number,
|
||||||
): PlanData[] => {
|
): PlanData[] => {
|
||||||
return entities.sort((a, b) => a.name.localeCompare(b.name)).slice(0, 3);
|
return entities.sort((a, b) => a.name.localeCompare(b.name)).slice(0, 3);
|
||||||
};
|
};
|
||||||
@@ -194,16 +200,16 @@ export default class EntityGridFunctionPropTest extends Vue {
|
|||||||
*/
|
*/
|
||||||
get displayedPeopleCount(): number {
|
get displayedPeopleCount(): number {
|
||||||
if (this.useCustomFunction) {
|
if (this.useCustomFunction) {
|
||||||
return this.customPeopleFunction(this.people, "people").length;
|
return this.customPeopleFunction(this.people, "people", 5).length;
|
||||||
}
|
}
|
||||||
return Math.min(10, this.people.length); // Initial batch size for infinite scroll
|
return Math.min(5, this.people.length);
|
||||||
}
|
}
|
||||||
|
|
||||||
get displayedProjectsCount(): number {
|
get displayedProjectsCount(): number {
|
||||||
if (this.useCustomFunction) {
|
if (this.useCustomFunction) {
|
||||||
return this.customProjectsFunction(this.projects, "projects").length;
|
return this.customProjectsFunction(this.projects, "projects", 3).length;
|
||||||
}
|
}
|
||||||
return Math.min(10, this.projects.length); // Initial batch size for infinite scroll
|
return Math.min(7, this.projects.length);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -970,20 +970,6 @@ export const PlatformServiceMixin = {
|
|||||||
return this.$normalizeContacts(rawContacts);
|
return this.$normalizeContacts(rawContacts);
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
|
||||||
* Load all contacts sorted by when they were added (by ID)
|
|
||||||
* Always fetches fresh data from database for consistency
|
|
||||||
* Handles JSON string/object duality for contactMethods field
|
|
||||||
* @returns Promise<Contact[]> Array of normalized contact objects sorted by addition date (newest first)
|
|
||||||
*/
|
|
||||||
async $contactsByDateAdded(): Promise<Contact[]> {
|
|
||||||
const rawContacts = (await this.$query(
|
|
||||||
"SELECT * FROM contacts ORDER BY id DESC",
|
|
||||||
)) as ContactMaybeWithJsonStrings[];
|
|
||||||
|
|
||||||
return this.$normalizeContacts(rawContacts);
|
|
||||||
},
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ultra-concise shortcut for getting number of contacts
|
* Ultra-concise shortcut for getting number of contacts
|
||||||
* @returns Promise<number> Total number of contacts
|
* @returns Promise<number> Total number of contacts
|
||||||
@@ -2071,7 +2057,6 @@ declare module "@vue/runtime-core" {
|
|||||||
|
|
||||||
// Specialized shortcuts - contacts cached, settings fresh
|
// Specialized shortcuts - contacts cached, settings fresh
|
||||||
$contacts(): Promise<Contact[]>;
|
$contacts(): Promise<Contact[]>;
|
||||||
$contactsByDateAdded(): Promise<Contact[]>;
|
|
||||||
$contactCount(): Promise<number>;
|
$contactCount(): Promise<number>;
|
||||||
$settings(defaults?: Settings): Promise<Settings>;
|
$settings(defaults?: Settings): Promise<Settings>;
|
||||||
$accountSettings(did?: string, defaults?: Settings): Promise<Settings>;
|
$accountSettings(did?: string, defaults?: Settings): Promise<Settings>;
|
||||||
|
|||||||
@@ -1488,18 +1488,21 @@ export default class AccountViewView extends Vue {
|
|||||||
status?: number;
|
status?: number;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
logger.error("[Server Limits] Error retrieving limits:", {
|
logger.warn(
|
||||||
error: error instanceof Error ? error.message : String(error),
|
"[Server Limits] Error retrieving limits, expected for unregistered users:",
|
||||||
did: did,
|
{
|
||||||
apiServer: this.apiServer,
|
error: error instanceof Error ? error.message : String(error),
|
||||||
imageServer: this.DEFAULT_IMAGE_API_SERVER,
|
did: did,
|
||||||
partnerApiServer: this.partnerApiServer,
|
apiServer: this.apiServer,
|
||||||
errorCode: axiosError?.response?.data?.error?.code,
|
imageServer: this.DEFAULT_IMAGE_API_SERVER,
|
||||||
errorMessage: axiosError?.response?.data?.error?.message,
|
partnerApiServer: this.partnerApiServer,
|
||||||
httpStatus: axiosError?.response?.status,
|
errorCode: axiosError?.response?.data?.error?.code,
|
||||||
needsUserMigration: true,
|
errorMessage: axiosError?.response?.data?.error?.message,
|
||||||
timestamp: new Date().toISOString(),
|
httpStatus: axiosError?.response?.status,
|
||||||
});
|
needsUserMigration: true,
|
||||||
|
timestamp: new Date().toISOString(),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
// this.notify.error(this.limitsMessage, TIMEOUTS.STANDARD);
|
// this.notify.error(this.limitsMessage, TIMEOUTS.STANDARD);
|
||||||
} finally {
|
} finally {
|
||||||
@@ -2168,7 +2171,7 @@ export default class AccountViewView extends Vue {
|
|||||||
const headers = await getHeaders(did);
|
const headers = await getHeaders(did);
|
||||||
|
|
||||||
const response = await this.axios.delete(
|
const response = await this.axios.delete(
|
||||||
`${this.partnerApiServer}/api/partner/userProfile/${did}`,
|
`${this.partnerApiServer}/api/partner/userProfile`,
|
||||||
{ headers },
|
{ headers },
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -706,7 +706,7 @@ export default class HomeView extends Vue {
|
|||||||
};
|
};
|
||||||
|
|
||||||
logger.warn(
|
logger.warn(
|
||||||
"[HomeView Settings Trace] ⚠️ Registration check failed",
|
"[HomeView Settings Trace] ⚠️ Registration check failed, expected for unregistered users.",
|
||||||
{
|
{
|
||||||
error: errorMessage,
|
error: errorMessage,
|
||||||
did: this.activeDid,
|
did: this.activeDid,
|
||||||
|
|||||||
@@ -77,7 +77,7 @@
|
|||||||
v-if="meetings.length === 0 && !isRegistered"
|
v-if="meetings.length === 0 && !isRegistered"
|
||||||
class="text-center text-gray-500 py-8"
|
class="text-center text-gray-500 py-8"
|
||||||
>
|
>
|
||||||
No onboarding meetings available
|
No onboarding meetings are available
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -54,6 +54,161 @@
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Issuer Information Section -->
|
||||||
|
<div v-if="profile" class="mt-6">
|
||||||
|
<div
|
||||||
|
v-if="issuerContact"
|
||||||
|
class="bg-blue-50 border border-blue-200 rounded-lg p-4"
|
||||||
|
>
|
||||||
|
<h3 class="text-lg font-semibold text-blue-800 mb-2">
|
||||||
|
<font-awesome icon="user-check" class="fa-fw mr-2" />
|
||||||
|
Contact Information
|
||||||
|
</h3>
|
||||||
|
<p class="text-sm text-blue-700 mb-3">
|
||||||
|
{{ issuerContact.name || "Contact" }} is in your contacts.
|
||||||
|
</p>
|
||||||
|
<div
|
||||||
|
v-if="
|
||||||
|
issuerContact.contactMethods &&
|
||||||
|
issuerContact.contactMethods.length > 0
|
||||||
|
"
|
||||||
|
class="space-y-2"
|
||||||
|
>
|
||||||
|
<h4 class="font-medium text-blue-800">Contact Methods:</h4>
|
||||||
|
<div
|
||||||
|
v-for="method in issuerContact.contactMethods"
|
||||||
|
:key="method.label"
|
||||||
|
class="flex items-center text-sm"
|
||||||
|
>
|
||||||
|
<span class="font-medium text-blue-700 w-20"
|
||||||
|
>{{ method.label }}:</span
|
||||||
|
>
|
||||||
|
<span class="text-blue-600">{{ method.value }}</span>
|
||||||
|
<span class="text-xs text-blue-500 ml-2"
|
||||||
|
>({{ method.type }})</span
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-else
|
||||||
|
class="bg-yellow-50 border border-yellow-200 rounded-lg p-4"
|
||||||
|
>
|
||||||
|
<h3 class="text-lg font-semibold text-yellow-800 mb-2">
|
||||||
|
<font-awesome icon="user-plus" class="fa-fw mr-2" />
|
||||||
|
Not in Contacts
|
||||||
|
</h3>
|
||||||
|
<p class="text-sm text-yellow-700 mb-3">
|
||||||
|
This person has been connected but they're not in your contacts on
|
||||||
|
this device.
|
||||||
|
</p>
|
||||||
|
<button
|
||||||
|
class="text-blue-600 hover:text-blue-800 font-medium text-sm flex items-center"
|
||||||
|
@click="toggleConnectInstructions"
|
||||||
|
>
|
||||||
|
<font-awesome icon="link" class="fa-fw mr-1" />
|
||||||
|
Connect Me...
|
||||||
|
<font-awesome
|
||||||
|
:icon="showConnectInstructions ? 'chevron-up' : 'chevron-down'"
|
||||||
|
class="fa-fw ml-1"
|
||||||
|
/>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<!-- Expandable Instructions -->
|
||||||
|
<div
|
||||||
|
v-if="showConnectInstructions"
|
||||||
|
class="mt-4 p-4 bg-white border border-yellow-300 rounded-md"
|
||||||
|
>
|
||||||
|
<h4 class="font-medium text-gray-800 mb-3">How to Connect:</h4>
|
||||||
|
|
||||||
|
<!-- Copy Profile Link Instructions -->
|
||||||
|
<div class="mb-4">
|
||||||
|
<p class="text-sm text-gray-700 mb-2">
|
||||||
|
1. Copy a deep link to this profile and send it to someone in
|
||||||
|
your network:
|
||||||
|
</p>
|
||||||
|
<button
|
||||||
|
class="bg-blue-500 hover:bg-blue-600 text-white text-sm px-3 py-1 rounded flex items-center"
|
||||||
|
@click="onCopyLinkClick()"
|
||||||
|
>
|
||||||
|
<font-awesome icon="copy" class="fa-fw mr-1" />
|
||||||
|
Copy Profile Link
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Contact List -->
|
||||||
|
<div class="mb-4">
|
||||||
|
<p class="text-sm text-gray-700 mb-2">
|
||||||
|
2. Send the link to one of these people:
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<!-- Contacts from issuerDidVisibleToDids -->
|
||||||
|
<div v-if="visibleToContacts.length > 0" class="mb-3">
|
||||||
|
<h5 class="text-xs font-medium text-gray-600 mb-2">
|
||||||
|
People who can see this profile:
|
||||||
|
</h5>
|
||||||
|
<div class="space-y-1">
|
||||||
|
<div
|
||||||
|
v-for="contact in visibleToContacts"
|
||||||
|
:key="contact.did"
|
||||||
|
class="flex items-center text-sm bg-gray-50 p-2 rounded"
|
||||||
|
>
|
||||||
|
<font-awesome
|
||||||
|
icon="user"
|
||||||
|
class="fa-fw text-gray-500 mr-2"
|
||||||
|
/>
|
||||||
|
<span class="font-medium">{{
|
||||||
|
contact.name || "Unnamed Contact"
|
||||||
|
}}</span>
|
||||||
|
<span class="text-xs text-gray-500 ml-2"
|
||||||
|
>({{ contact.did.substring(0, 20) }}...)</span
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Nearest Neighbors -->
|
||||||
|
<div v-if="nearestNeighbors.length > 0" class="mb-3">
|
||||||
|
<h5 class="text-xs font-medium text-gray-600 mb-2">
|
||||||
|
<span v-if="visibleToContacts.length > 0"
|
||||||
|
>Other nearby people:</span
|
||||||
|
>
|
||||||
|
<span v-else>Nearby people:</span>
|
||||||
|
</h5>
|
||||||
|
<div class="space-y-1">
|
||||||
|
<div
|
||||||
|
v-for="neighbor in nearestNeighbors"
|
||||||
|
:key="neighbor.issuerDid"
|
||||||
|
class="flex items-center text-sm bg-gray-50 p-2 rounded"
|
||||||
|
>
|
||||||
|
<font-awesome
|
||||||
|
icon="user"
|
||||||
|
class="fa-fw text-gray-500 mr-2"
|
||||||
|
/>
|
||||||
|
<span class="font-medium">{{
|
||||||
|
neighborDisplayName(neighbor)
|
||||||
|
}}</span>
|
||||||
|
<span class="text-xs text-gray-500 ml-2"
|
||||||
|
>({{ neighbor.issuerDid.substring(0, 20) }}...)</span
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Loading state for nearest neighbors -->
|
||||||
|
<div
|
||||||
|
v-if="loadingNearestNeighbors"
|
||||||
|
class="text-sm text-gray-500 flex items-center"
|
||||||
|
>
|
||||||
|
<font-awesome icon="spinner" class="fa-spin fa-fw mr-2" />
|
||||||
|
Loading nearby people...
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- Map for first coordinates -->
|
<!-- Map for first coordinates -->
|
||||||
<div v-if="hasFirstLocation" class="mt-4">
|
<div v-if="hasFirstLocation" class="mt-4">
|
||||||
<h2 class="text-lg font-semibold">Location</h2>
|
<h2 class="text-lg font-semibold">Location</h2>
|
||||||
@@ -113,7 +268,12 @@ import {
|
|||||||
APP_SERVER,
|
APP_SERVER,
|
||||||
} from "../constants/app";
|
} from "../constants/app";
|
||||||
import { Contact } from "../db/tables/contacts";
|
import { Contact } from "../db/tables/contacts";
|
||||||
import { didInfo, getHeaders } from "../libs/endorserServer";
|
import {
|
||||||
|
didInfo,
|
||||||
|
getHeaders,
|
||||||
|
isHiddenDid,
|
||||||
|
contactForDid,
|
||||||
|
} from "../libs/endorserServer";
|
||||||
import { UserProfile } from "../libs/partnerServer";
|
import { UserProfile } from "../libs/partnerServer";
|
||||||
import { retrieveAccountDids } from "../libs/util";
|
import { retrieveAccountDids } from "../libs/util";
|
||||||
import { logger } from "../utils/logger";
|
import { logger } from "../utils/logger";
|
||||||
@@ -162,9 +322,13 @@ export default class UserProfileView extends Vue {
|
|||||||
isLoading = true;
|
isLoading = true;
|
||||||
partnerApiServer = DEFAULT_PARTNER_API_SERVER;
|
partnerApiServer = DEFAULT_PARTNER_API_SERVER;
|
||||||
profile: UserProfile | null = null;
|
profile: UserProfile | null = null;
|
||||||
|
showConnectInstructions = false;
|
||||||
|
nearestNeighbors: Array<UserProfile> = [];
|
||||||
|
loadingNearestNeighbors = false;
|
||||||
|
|
||||||
// make this function available to the Vue template
|
// make this function available to the Vue template
|
||||||
didInfo = didInfo;
|
didInfo = didInfo;
|
||||||
|
isHiddenDid = isHiddenDid;
|
||||||
/** Production share domain for deep links */
|
/** Production share domain for deep links */
|
||||||
APP_SERVER = APP_SERVER;
|
APP_SERVER = APP_SERVER;
|
||||||
|
|
||||||
@@ -266,6 +430,63 @@ export default class UserProfileView extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Loads nearest neighbors from the partner API
|
||||||
|
* Called when the Connect Me section is expanded
|
||||||
|
*/
|
||||||
|
async loadNearestNeighbors() {
|
||||||
|
if (!this.profile?.issuerDid || this.loadingNearestNeighbors) return;
|
||||||
|
|
||||||
|
this.loadingNearestNeighbors = true;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(
|
||||||
|
`${this.partnerApiServer}/api/partner/userProfileNearestNeighbors?issuerDid=${encodeURIComponent(this.profile.issuerDid)}`,
|
||||||
|
{
|
||||||
|
method: "GET",
|
||||||
|
headers: await getHeaders(this.activeDid),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
if (response.status === 200) {
|
||||||
|
const result = await response.json();
|
||||||
|
this.nearestNeighbors = result.data || [];
|
||||||
|
} else {
|
||||||
|
logger.warn("Failed to load nearest neighbors:", response.status);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
logger.error("Error loading nearest neighbors:", error);
|
||||||
|
} finally {
|
||||||
|
this.loadingNearestNeighbors = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets display name for a neighbor profile
|
||||||
|
* @param neighbor UserProfile object
|
||||||
|
* @returns Display name for the neighbor
|
||||||
|
*/
|
||||||
|
neighborDisplayName(neighbor: UserProfile) {
|
||||||
|
return this.didInfo(
|
||||||
|
neighbor.issuerDid,
|
||||||
|
this.activeDid,
|
||||||
|
this.allMyDids,
|
||||||
|
this.allContacts,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Toggles the Connect Me instructions and loads nearest neighbors if needed
|
||||||
|
*/
|
||||||
|
async toggleConnectInstructions() {
|
||||||
|
this.showConnectInstructions = !this.showConnectInstructions;
|
||||||
|
|
||||||
|
// Load nearest neighbors when expanding for the first time
|
||||||
|
if (this.showConnectInstructions && this.nearestNeighbors.length === 0) {
|
||||||
|
await this.loadNearestNeighbors();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed properties for template logic streamlining
|
* Computed properties for template logic streamlining
|
||||||
*/
|
*/
|
||||||
@@ -283,6 +504,27 @@ export default class UserProfileView extends Vue {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the contact information for the profile issuer
|
||||||
|
* @returns Contact object if issuer is in contacts, undefined otherwise
|
||||||
|
*/
|
||||||
|
get issuerContact() {
|
||||||
|
if (!this.profile?.issuerDid) return undefined;
|
||||||
|
return contactForDid(this.profile.issuerDid, this.allContacts);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets contacts that are in the issuerDidVisibleToDids list
|
||||||
|
* @returns Array of contacts who can see this profile
|
||||||
|
*/
|
||||||
|
get visibleToContacts() {
|
||||||
|
if (!this.profile?.issuerDidVisibleToDids) return [];
|
||||||
|
|
||||||
|
return this.profile.issuerDidVisibleToDids
|
||||||
|
.map((did) => contactForDid(did, this.allContacts))
|
||||||
|
.filter((contact): contact is Contact => contact !== undefined);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Checks if the profile has first location coordinates
|
* Checks if the profile has first location coordinates
|
||||||
* @returns True if both latitude and longitude are available
|
* @returns True if both latitude and longitude are available
|
||||||
|
|||||||
@@ -49,6 +49,10 @@ export async function importUserFromAccount(page: Page, id?: string): Promise<st
|
|||||||
|
|
||||||
await page.getByRole("button", { name: "Import" }).click();
|
await page.getByRole("button", { name: "Import" }).click();
|
||||||
|
|
||||||
|
// PHASE 1 FIX: Wait for registration status to settle
|
||||||
|
// This ensures that components have the correct isRegistered status
|
||||||
|
await waitForRegistrationStatusToSettle(page);
|
||||||
|
|
||||||
return userZeroData.did;
|
return userZeroData.did;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -69,6 +73,11 @@ export async function importUser(page: Page, id?: string): Promise<string> {
|
|||||||
await expect(
|
await expect(
|
||||||
page.locator("#sectionUsageLimits").getByText("Checking")
|
page.locator("#sectionUsageLimits").getByText("Checking")
|
||||||
).toBeHidden();
|
).toBeHidden();
|
||||||
|
|
||||||
|
// PHASE 1 FIX: Wait for registration check to complete and update UI elements
|
||||||
|
// This ensures that components like InviteOneView have the correct isRegistered status
|
||||||
|
await waitForRegistrationStatusToSettle(page);
|
||||||
|
|
||||||
return did;
|
return did;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -337,3 +346,78 @@ export function getElementWaitTimeout(): number {
|
|||||||
export function getPageLoadTimeout(): number {
|
export function getPageLoadTimeout(): number {
|
||||||
return getAdaptiveTimeout(30000, 1.4);
|
return getAdaptiveTimeout(30000, 1.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* PHASE 1 FIX: Wait for registration status to settle
|
||||||
|
*
|
||||||
|
* This function addresses the timing issue where:
|
||||||
|
* 1. User imports identity → Database shows isRegistered: false
|
||||||
|
* 2. HomeView loads → Starts async registration check
|
||||||
|
* 3. Other views load → Use cached isRegistered: false
|
||||||
|
* 4. Async check completes → Updates database to isRegistered: true
|
||||||
|
* 5. But other views don't re-check → Plus buttons don't appear
|
||||||
|
*
|
||||||
|
* This function waits for the async registration check to complete
|
||||||
|
* without interfering with test navigation.
|
||||||
|
*/
|
||||||
|
export async function waitForRegistrationStatusToSettle(page: Page): Promise<void> {
|
||||||
|
try {
|
||||||
|
// Wait for the initial registration check to complete
|
||||||
|
// This is indicated by the "Checking" text disappearing from usage limits
|
||||||
|
await expect(
|
||||||
|
page.locator("#sectionUsageLimits").getByText("Checking")
|
||||||
|
).toBeHidden({ timeout: 15000 });
|
||||||
|
|
||||||
|
// Before navigating back to the page, we'll trigger a registration check
|
||||||
|
// by navigating to home and waiting for the registration process to complete
|
||||||
|
|
||||||
|
const currentUrl = page.url();
|
||||||
|
|
||||||
|
// Navigate to home to trigger the registration check
|
||||||
|
await page.goto('./');
|
||||||
|
await page.waitForLoadState('networkidle');
|
||||||
|
|
||||||
|
// Wait for the registration check to complete by monitoring the usage limits section
|
||||||
|
// This ensures the async registration check has finished
|
||||||
|
await page.waitForFunction(() => {
|
||||||
|
const usageLimits = document.querySelector('#sectionUsageLimits');
|
||||||
|
if (!usageLimits) return true; // No usage limits section, assume ready
|
||||||
|
|
||||||
|
// Check if the "Checking..." spinner is gone
|
||||||
|
const checkingSpinner = usageLimits.querySelector('.fa-spin');
|
||||||
|
if (checkingSpinner) return false; // Still loading
|
||||||
|
|
||||||
|
// Check if we have actual content (not just the spinner)
|
||||||
|
const hasContent = usageLimits.querySelector('p') || usageLimits.querySelector('button');
|
||||||
|
return hasContent !== null; // Has actual content, not just spinner
|
||||||
|
}, { timeout: 10000 });
|
||||||
|
|
||||||
|
// Also navigate to account page to ensure activeDid is set and usage limits are loaded
|
||||||
|
await page.goto('./account');
|
||||||
|
await page.waitForLoadState('networkidle');
|
||||||
|
|
||||||
|
// Wait for the usage limits section to be visible and loaded
|
||||||
|
await page.waitForFunction(() => {
|
||||||
|
const usageLimits = document.querySelector('#sectionUsageLimits');
|
||||||
|
if (!usageLimits) return false; // Section should exist on account page
|
||||||
|
|
||||||
|
// Check if the "Checking..." spinner is gone
|
||||||
|
const checkingSpinner = usageLimits.querySelector('.fa-spin');
|
||||||
|
if (checkingSpinner) return false; // Still loading
|
||||||
|
|
||||||
|
// Check if we have actual content (not just the spinner)
|
||||||
|
const hasContent = usageLimits.querySelector('p') || usageLimits.querySelector('button');
|
||||||
|
return hasContent !== null; // Has actual content, not just spinner
|
||||||
|
}, { timeout: 15000 });
|
||||||
|
|
||||||
|
// Navigate back to the original page if it wasn't home
|
||||||
|
if (!currentUrl.includes('/')) {
|
||||||
|
await page.goto(currentUrl);
|
||||||
|
await page.waitForLoadState('networkidle');
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (error) {
|
||||||
|
// Registration status check timed out, continuing anyway
|
||||||
|
// This may indicate the user is not registered or there's a server issue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user