Compare commits
13 Commits
accountvie
...
refactor-i
| Author | SHA1 | Date | |
|---|---|---|---|
| 2ca2c1d4b3 | |||
|
|
cb8d8bed4c | ||
|
|
11658140ae | ||
|
|
85a64b06d7 | ||
|
|
72e23a9109 | ||
|
|
ceaf4ede11 | ||
|
|
523f88fd0d | ||
|
|
ee57fe9ea6 | ||
|
|
471bdd6b92 | ||
|
|
c26b8daaf7 | ||
|
|
16db790c5f | ||
|
|
59434ff5f7 | ||
|
|
239666e137 |
@@ -1156,6 +1156,9 @@ gem_path=$(which gem)
|
|||||||
shortened_path="${gem_path:h:h}"
|
shortened_path="${gem_path:h:h}"
|
||||||
export GEM_HOME=$shortened_path
|
export GEM_HOME=$shortened_path
|
||||||
export GEM_PATH=$shortened_path
|
export GEM_PATH=$shortened_path
|
||||||
|
|
||||||
|
cd ios/App
|
||||||
|
pod install
|
||||||
```
|
```
|
||||||
|
|
||||||
##### 1. Bump the version in package.json for `MARKETING_VERSION`, then `grep CURRENT_PROJECT_VERSION ios/App/App.xcodeproj/project.pbxproj` and add 1 for the numbered version;
|
##### 1. Bump the version in package.json for `MARKETING_VERSION`, then `grep CURRENT_PROJECT_VERSION ios/App/App.xcodeproj/project.pbxproj` and add 1 for the numbered version;
|
||||||
|
|||||||
@@ -31,8 +31,8 @@ android {
|
|||||||
applicationId "app.timesafari.app"
|
applicationId "app.timesafari.app"
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 47
|
versionCode 48
|
||||||
versionName "1.1.2"
|
versionName "1.1.3-beta"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
aaptOptions {
|
aaptOptions {
|
||||||
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ messages * - Conditional UI based on platform capabilities * * @component *
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div id="sectionDataExport" :class="containerClasses">
|
<div id="sectionDataExport" :class="containerClasses">
|
||||||
<div :class="titleClasses">Data Management</div>
|
<div :class="titleClasses">Data Export</div>
|
||||||
<router-link
|
<router-link
|
||||||
v-if="activeDid"
|
v-if="activeDid"
|
||||||
:to="{ name: 'seed-backup' }"
|
:to="{ name: 'seed-backup' }"
|
||||||
@@ -30,7 +30,7 @@ messages * - Conditional UI based on platform capabilities * * @component *
|
|||||||
:class="exportButtonClasses"
|
:class="exportButtonClasses"
|
||||||
@click="exportDatabase()"
|
@click="exportDatabase()"
|
||||||
>
|
>
|
||||||
{{ isExporting ? "Exporting..." : "Export Contacts" }}
|
{{ isExporting ? "Exporting..." : "Download Contacts" }}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
@@ -55,54 +55,11 @@ messages * - Conditional UI based on platform capabilities * * @component *
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Import Contacts -->
|
|
||||||
<div id="sectionImportContactsSettings" class="mt-4">
|
|
||||||
<h2 class="text-slate-500 text-sm font-bold">Import Contacts</h2>
|
|
||||||
|
|
||||||
<div class="mt-2">
|
|
||||||
<input
|
|
||||||
type="file"
|
|
||||||
class="w-full bg-white rounded-md pe-2 file:border-0 file:bg-gradient-to-b file:from-blue-400 file:to-blue-700 file:shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] file:text-white file:px-3 file:py-2 file:me-2 file:rounded-s-md"
|
|
||||||
@change="uploadImportFile"
|
|
||||||
/>
|
|
||||||
<transition
|
|
||||||
enter-active-class="transform ease-out duration-300 transition"
|
|
||||||
enter-from-class="translate-y-2 opacity-0 sm:translate-y-4"
|
|
||||||
enter-to-class="translate-y-0 opacity-100 sm:translate-y-0"
|
|
||||||
leave-active-class="transition ease-in duration-500"
|
|
||||||
leave-from-class="opacity-100"
|
|
||||||
leave-to-class="opacity-0"
|
|
||||||
>
|
|
||||||
<div v-if="showContactImport()" class="mt-2">
|
|
||||||
<!-- Bulk import has an error
|
|
||||||
<div class="flex justify-center">
|
|
||||||
<button
|
|
||||||
class="block text-center text-md bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-6"
|
|
||||||
@click="confirmSubmitImportFile()"
|
|
||||||
>
|
|
||||||
Overwrite Settings & Contacts
|
|
||||||
<br />
|
|
||||||
(which doesn't include Identifier Data)
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
-->
|
|
||||||
<button
|
|
||||||
class="block w-full text-center text-md bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md"
|
|
||||||
@click="checkContactImports()"
|
|
||||||
>
|
|
||||||
Import Contacts
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</transition>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { Component, Prop, Vue } from "vue-facing-decorator";
|
import { Component, Prop, Vue } from "vue-facing-decorator";
|
||||||
import { Router } from "vue-router";
|
|
||||||
import * as R from "ramda";
|
import * as R from "ramda";
|
||||||
|
|
||||||
import { AppString, NotificationIface } from "../constants/app";
|
import { AppString, NotificationIface } from "../constants/app";
|
||||||
@@ -110,10 +67,8 @@ import { Contact } from "../db/tables/contacts";
|
|||||||
|
|
||||||
import { logger } from "../utils/logger";
|
import { logger } from "../utils/logger";
|
||||||
import { contactsToExportJson } from "../libs/util";
|
import { contactsToExportJson } from "../libs/util";
|
||||||
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
import { createNotifyHelpers } from "@/utils/notify";
|
||||||
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
||||||
import { ACCOUNT_VIEW_CONSTANTS } from "@/constants/accountView";
|
|
||||||
import { ImportContent } from "@/interfaces/accountView";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @vue-component
|
* @vue-component
|
||||||
@@ -136,12 +91,6 @@ export default class DataExportSection extends Vue {
|
|||||||
*/
|
*/
|
||||||
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
$notify!: (notification: NotificationIface, timeout?: number) => void;
|
||||||
|
|
||||||
/**
|
|
||||||
* Router instance injected by Vue
|
|
||||||
* Used for navigation
|
|
||||||
*/
|
|
||||||
$router!: Router;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Active DID (Decentralized Identifier) of the user
|
* Active DID (Decentralized Identifier) of the user
|
||||||
* Controls visibility of seed backup option
|
* Controls visibility of seed backup option
|
||||||
@@ -161,12 +110,6 @@ export default class DataExportSection extends Vue {
|
|||||||
*/
|
*/
|
||||||
showRedNotificationDot = false;
|
showRedNotificationDot = false;
|
||||||
|
|
||||||
/**
|
|
||||||
* Reference to the selected import file
|
|
||||||
* Used to store the file selected by the user for import
|
|
||||||
*/
|
|
||||||
private inputImportFileName: Blob | undefined;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Notification helper for consistent notification patterns
|
* Notification helper for consistent notification patterns
|
||||||
* Created as a getter to ensure $notify is available when called
|
* Created as a getter to ensure $notify is available when called
|
||||||
@@ -257,30 +200,12 @@ export default class DataExportSection extends Vue {
|
|||||||
// first remove the contactMethods field, mostly to cast to a clear type (that will end up with JSON objects)
|
// first remove the contactMethods field, mostly to cast to a clear type (that will end up with JSON objects)
|
||||||
const exContact: Contact = R.omit(["contactMethods"], contact);
|
const exContact: Contact = R.omit(["contactMethods"], contact);
|
||||||
// now add contactMethods as a true array of ContactMethod objects
|
// now add contactMethods as a true array of ContactMethod objects
|
||||||
// $contacts() returns normalized contacts where contactMethods is already an array,
|
exContact.contactMethods = contact.contactMethods
|
||||||
// but we handle both array and string cases for robustness
|
? typeof contact.contactMethods === "string" &&
|
||||||
if (contact.contactMethods) {
|
contact.contactMethods.trim() !== ""
|
||||||
if (Array.isArray(contact.contactMethods)) {
|
? JSON.parse(contact.contactMethods)
|
||||||
// Already an array, use it directly
|
: []
|
||||||
exContact.contactMethods = contact.contactMethods;
|
: [];
|
||||||
} else {
|
|
||||||
// Check if it's a string that needs parsing (shouldn't happen with normalized contacts, but handle for robustness)
|
|
||||||
const contactMethodsValue = contact.contactMethods as unknown;
|
|
||||||
if (
|
|
||||||
typeof contactMethodsValue === "string" &&
|
|
||||||
contactMethodsValue.trim() !== ""
|
|
||||||
) {
|
|
||||||
// String that needs parsing
|
|
||||||
exContact.contactMethods = JSON.parse(contactMethodsValue);
|
|
||||||
} else {
|
|
||||||
// Invalid data, use empty array
|
|
||||||
exContact.contactMethods = [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// No contactMethods, use empty array
|
|
||||||
exContact.contactMethods = [];
|
|
||||||
}
|
|
||||||
return exContact;
|
return exContact;
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -323,58 +248,5 @@ export default class DataExportSection extends Vue {
|
|||||||
this.showRedNotificationDot = false;
|
this.showRedNotificationDot = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Handles file selection for contact import
|
|
||||||
* Stores the selected file for later processing
|
|
||||||
*/
|
|
||||||
async uploadImportFile(event: Event): Promise<void> {
|
|
||||||
this.inputImportFileName = (event.target as HTMLInputElement).files?.[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Checks if a contact import file has been selected
|
|
||||||
* Used to conditionally show the import button
|
|
||||||
*/
|
|
||||||
showContactImport(): boolean {
|
|
||||||
return !!this.inputImportFileName;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Processes the selected import file and navigates to the contact import view
|
|
||||||
* Parses the JSON file and extracts contact data for import
|
|
||||||
*/
|
|
||||||
async checkContactImports(): Promise<void> {
|
|
||||||
if (!this.inputImportFileName) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const reader = new FileReader();
|
|
||||||
reader.onload = (event) => {
|
|
||||||
const fileContent: string = (event.target?.result as string) || "{}";
|
|
||||||
try {
|
|
||||||
const contents: ImportContent = JSON.parse(fileContent);
|
|
||||||
const contactTableRows: Array<Contact> = (
|
|
||||||
contents.data?.data as [{ tableName: string; rows: Array<Contact> }]
|
|
||||||
)?.find((table) => table.tableName === "contacts")
|
|
||||||
?.rows as Array<Contact>;
|
|
||||||
const contactRows = contactTableRows.map(
|
|
||||||
// @ts-expect-error for omitting this field that is found in the Dexie format
|
|
||||||
(contact) => R.omit(["$types"], contact) as Contact,
|
|
||||||
);
|
|
||||||
this.$router.push({
|
|
||||||
name: "contact-import",
|
|
||||||
query: { contacts: JSON.stringify(contactRows) },
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
logger.error("Error checking contact imports:", error);
|
|
||||||
this.notify.error(
|
|
||||||
ACCOUNT_VIEW_CONSTANTS.ERRORS.IMPORT_ERROR,
|
|
||||||
TIMEOUTS.STANDARD,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
reader.readAsText(this.inputImportFileName);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ projects, and special entities with selection. * * @author Matthew Raymer */
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<!-- Empty state message -->
|
<!-- Empty state message -->
|
||||||
<li v-if="hasNoEntities" :class="emptyStateClasses">
|
<li v-if="entities.length === 0" :class="emptyStateClasses">
|
||||||
{{ emptyStateMessage }}
|
{{ emptyStateMessage }}
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
@@ -108,7 +108,7 @@ projects, and special entities with selection. * * @author Matthew Raymer */
|
|||||||
<li
|
<li
|
||||||
class="text-xs font-semibold text-slate-500 uppercase pt-5 pb-1.5 px-2 border-b border-slate-300"
|
class="text-xs font-semibold text-slate-500 uppercase pt-5 pb-1.5 px-2 border-b border-slate-300"
|
||||||
>
|
>
|
||||||
Everyone
|
Everyone Else
|
||||||
</li>
|
</li>
|
||||||
<PersonCard
|
<PersonCard
|
||||||
v-for="person in alphabeticalContacts"
|
v-for="person in alphabeticalContacts"
|
||||||
@@ -164,10 +164,6 @@ import { Contact } from "../db/tables/contacts";
|
|||||||
import { PlanData } from "../interfaces/records";
|
import { PlanData } from "../interfaces/records";
|
||||||
import { NotificationIface } from "../constants/app";
|
import { NotificationIface } from "../constants/app";
|
||||||
import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
|
import { UNNAMED_ENTITY_NAME } from "@/constants/entities";
|
||||||
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
|
||||||
import { getHeaders } from "../libs/endorserServer";
|
|
||||||
import { logger } from "../utils/logger";
|
|
||||||
import { TIMEOUTS } from "@/utils/notify";
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constants for infinite scroll configuration
|
* Constants for infinite scroll configuration
|
||||||
@@ -195,7 +191,6 @@ const RECENT_CONTACTS_COUNT = 3;
|
|||||||
ProjectCard,
|
ProjectCard,
|
||||||
SpecialEntityCard,
|
SpecialEntityCard,
|
||||||
},
|
},
|
||||||
mixins: [PlatformServiceMixin],
|
|
||||||
})
|
})
|
||||||
export default class EntityGrid extends Vue {
|
export default class EntityGrid extends Vue {
|
||||||
/** Type of entities to display */
|
/** Type of entities to display */
|
||||||
@@ -207,36 +202,15 @@ export default class EntityGrid extends Vue {
|
|||||||
isSearching = false;
|
isSearching = false;
|
||||||
searchTimeout: NodeJS.Timeout | null = null;
|
searchTimeout: NodeJS.Timeout | null = null;
|
||||||
filteredEntities: Contact[] | PlanData[] = [];
|
filteredEntities: Contact[] | PlanData[] = [];
|
||||||
searchBeforeId: string | undefined = undefined;
|
|
||||||
isLoadingSearchMore = false;
|
|
||||||
|
|
||||||
// API server for project searches
|
|
||||||
apiServer = "";
|
|
||||||
|
|
||||||
// Internal project state (when entities prop not provided for projects)
|
|
||||||
allProjects: PlanData[] = [];
|
|
||||||
loadBeforeId: string | undefined = undefined;
|
|
||||||
isLoadingProjects = false;
|
|
||||||
|
|
||||||
// Infinite scroll state
|
// Infinite scroll state
|
||||||
displayedCount = INITIAL_BATCH_SIZE;
|
displayedCount = INITIAL_BATCH_SIZE;
|
||||||
infiniteScrollReset?: () => void;
|
infiniteScrollReset?: () => void;
|
||||||
scrollContainer?: HTMLElement;
|
scrollContainer?: HTMLElement;
|
||||||
|
|
||||||
/**
|
/** Array of entities to display */
|
||||||
* Array of entities to display
|
@Prop({ required: true })
|
||||||
*
|
entities!: Contact[] | PlanData[];
|
||||||
* For contacts (entityType === 'people'): REQUIRED - Must be a COMPLETE list from local database.
|
|
||||||
* Use $contactsByDateAdded() to ensure all contacts are included.
|
|
||||||
* Client-side filtering assumes the complete list is available.
|
|
||||||
* IMPORTANT: When passing Contact[] arrays, they must be sorted by date added
|
|
||||||
* (newest first) for the "Recently Added" section to display correctly.
|
|
||||||
*
|
|
||||||
* For projects (entityType === 'projects'): OPTIONAL - If not provided, EntityGrid loads
|
|
||||||
* projects internally from the API server. If provided, uses the provided list.
|
|
||||||
*/
|
|
||||||
@Prop({ required: false })
|
|
||||||
entities?: Contact[] | PlanData[];
|
|
||||||
|
|
||||||
/** Active user's DID */
|
/** Active user's DID */
|
||||||
@Prop({ required: true })
|
@Prop({ required: true })
|
||||||
@@ -308,33 +282,6 @@ export default class EntityGrid extends Vue {
|
|||||||
return "text-xs text-slate-500 italic col-span-full";
|
return "text-xs text-slate-500 italic col-span-full";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if there are no entities to display
|
|
||||||
*/
|
|
||||||
get hasNoEntities(): boolean {
|
|
||||||
if (this.entityType === "projects") {
|
|
||||||
// For projects: check internal state if no entities prop, otherwise check prop
|
|
||||||
const projectsToCheck = this.entities || this.allProjects;
|
|
||||||
return projectsToCheck.length === 0;
|
|
||||||
} else {
|
|
||||||
// For people: entities prop is required
|
|
||||||
return !this.entities || this.entities.length === 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the entities array to use (prop or internal state)
|
|
||||||
*/
|
|
||||||
get entitiesToUse(): Contact[] | PlanData[] {
|
|
||||||
if (this.entityType === "projects") {
|
|
||||||
// For projects: use prop if provided, otherwise use internal state
|
|
||||||
return this.entities || this.allProjects;
|
|
||||||
} else {
|
|
||||||
// For people: entities prop is required
|
|
||||||
return this.entities || [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed entities to display - uses function prop if provided, otherwise uses infinite scroll
|
* Computed entities to display - uses function prop if provided, otherwise uses infinite scroll
|
||||||
* When searching, returns filtered results with infinite scroll applied
|
* When searching, returns filtered results with infinite scroll applied
|
||||||
@@ -347,12 +294,12 @@ export default class EntityGrid extends Vue {
|
|||||||
|
|
||||||
// If custom function provided, use it (disables infinite scroll)
|
// If custom function provided, use it (disables infinite scroll)
|
||||||
if (this.displayEntitiesFunction) {
|
if (this.displayEntitiesFunction) {
|
||||||
return this.displayEntitiesFunction(this.entitiesToUse, this.entityType);
|
return this.displayEntitiesFunction(this.entities, this.entityType);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Default: projects use infinite scroll
|
// Default: projects use infinite scroll
|
||||||
if (this.entityType === "projects") {
|
if (this.entityType === "projects") {
|
||||||
return (this.entitiesToUse as PlanData[]).slice(0, this.displayedCount);
|
return (this.entities as PlanData[]).slice(0, this.displayedCount);
|
||||||
}
|
}
|
||||||
|
|
||||||
// People: handled by recentContacts + alphabeticalContacts (both use displayedCount)
|
// People: handled by recentContacts + alphabeticalContacts (both use displayedCount)
|
||||||
@@ -360,21 +307,14 @@ export default class EntityGrid extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the most recently added contacts (when showing contacts and not searching)
|
* Get the 3 most recently added contacts (when showing contacts and not searching)
|
||||||
*
|
|
||||||
* NOTE: This assumes entities are already sorted by date added (newest first).
|
|
||||||
* See the entities prop documentation for details on using $contactsByDateAdded().
|
|
||||||
*/
|
*/
|
||||||
get recentContacts(): Contact[] {
|
get recentContacts(): Contact[] {
|
||||||
if (
|
if (this.entityType !== "people" || this.searchTerm.trim()) {
|
||||||
this.entityType !== "people" ||
|
|
||||||
this.searchTerm.trim() ||
|
|
||||||
!this.entities
|
|
||||||
) {
|
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
// Entities are already sorted by date added (newest first)
|
// Entities are already sorted by date added (newest first)
|
||||||
return (this.entities as Contact[]).slice(0, RECENT_CONTACTS_COUNT);
|
return (this.entities as Contact[]).slice(0, 3);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -382,23 +322,19 @@ export default class EntityGrid extends Vue {
|
|||||||
* Uses infinite scroll to control how many are displayed
|
* Uses infinite scroll to control how many are displayed
|
||||||
*/
|
*/
|
||||||
get alphabeticalContacts(): Contact[] {
|
get alphabeticalContacts(): Contact[] {
|
||||||
if (
|
if (this.entityType !== "people" || this.searchTerm.trim()) {
|
||||||
this.entityType !== "people" ||
|
|
||||||
this.searchTerm.trim() ||
|
|
||||||
!this.entities
|
|
||||||
) {
|
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
// Skip the first few (recent contacts) and sort the rest alphabetically
|
// Skip the first 3 (recent contacts) and sort the rest alphabetically
|
||||||
// Create a copy to avoid mutating the original array
|
// Create a copy to avoid mutating the original array
|
||||||
const remaining = this.entities as Contact[];
|
const remaining = (this.entities as Contact[]).slice(RECENT_CONTACTS_COUNT);
|
||||||
const sorted = [...remaining].sort((a: Contact, b: Contact) => {
|
const sorted = [...remaining].sort((a: Contact, b: Contact) => {
|
||||||
// Sort alphabetically by name, falling back to DID if name is missing
|
// Sort alphabetically by name, falling back to DID if name is missing
|
||||||
const nameA = (a.name || a.did).toLowerCase();
|
const nameA = (a.name || a.did).toLowerCase();
|
||||||
const nameB = (b.name || b.did).toLowerCase();
|
const nameB = (b.name || b.did).toLowerCase();
|
||||||
return nameA.localeCompare(nameB);
|
return nameA.localeCompare(nameB);
|
||||||
});
|
});
|
||||||
// Apply infinite scroll: show based on displayedCount (minus the recent contacts)
|
// Apply infinite scroll: show based on displayedCount (minus the 3 recent)
|
||||||
const toShow = Math.max(0, this.displayedCount - RECENT_CONTACTS_COUNT);
|
const toShow = Math.max(0, this.displayedCount - RECENT_CONTACTS_COUNT);
|
||||||
return sorted.slice(0, toShow);
|
return sorted.slice(0, toShow);
|
||||||
}
|
}
|
||||||
@@ -507,28 +443,47 @@ export default class EntityGrid extends Vue {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Perform the actual search
|
* Perform the actual search
|
||||||
* Routes to server-side search for projects or client-side filtering for contacts
|
|
||||||
*/
|
*/
|
||||||
async performSearch(): Promise<void> {
|
async performSearch(): Promise<void> {
|
||||||
if (!this.searchTerm.trim()) {
|
if (!this.searchTerm.trim()) {
|
||||||
this.filteredEntities = [];
|
this.filteredEntities = [];
|
||||||
this.displayedCount = INITIAL_BATCH_SIZE;
|
this.displayedCount = INITIAL_BATCH_SIZE;
|
||||||
this.searchBeforeId = undefined;
|
|
||||||
this.infiniteScrollReset?.();
|
this.infiniteScrollReset?.();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.isSearching = true;
|
this.isSearching = true;
|
||||||
this.searchBeforeId = undefined; // Reset pagination for new search
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
if (this.entityType === "projects") {
|
// Simulate async search (in case we need to add API calls later)
|
||||||
// Server-side search for projects (initial load, no beforeId)
|
await new Promise((resolve) => setTimeout(resolve, 100));
|
||||||
const searchLower = this.searchTerm.toLowerCase().trim();
|
|
||||||
await this.fetchProjects(undefined, searchLower);
|
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 {
|
} else {
|
||||||
// Client-side filtering for contacts (complete list)
|
this.filteredEntities = (this.entities as PlanData[])
|
||||||
await this.performContactSearch();
|
.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
|
// Reset displayed count when search completes
|
||||||
@@ -539,194 +494,6 @@ export default class EntityGrid extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Fetch projects from API server
|
|
||||||
* Unified method for both loading all projects and searching projects.
|
|
||||||
* If claimContents is provided, performs search and updates filteredEntities.
|
|
||||||
* If claimContents is not provided, loads all projects and updates allProjects.
|
|
||||||
*
|
|
||||||
* @param beforeId - Optional rowId for pagination (loads projects before this ID)
|
|
||||||
* @param claimContents - Optional search term (if provided, performs search; if not, loads all)
|
|
||||||
*/
|
|
||||||
async fetchProjects(
|
|
||||||
beforeId?: string,
|
|
||||||
claimContents?: string,
|
|
||||||
): Promise<void> {
|
|
||||||
if (!this.apiServer) {
|
|
||||||
if (claimContents) {
|
|
||||||
this.filteredEntities = [];
|
|
||||||
} else {
|
|
||||||
this.allProjects = [];
|
|
||||||
}
|
|
||||||
if (this.notify) {
|
|
||||||
this.notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "API server not configured",
|
|
||||||
},
|
|
||||||
TIMEOUTS.SHORT,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const isSearch = !!claimContents;
|
|
||||||
let url = `${this.apiServer}/api/v2/report/plans`;
|
|
||||||
|
|
||||||
// Build query parameters
|
|
||||||
const params: string[] = [];
|
|
||||||
if (claimContents) {
|
|
||||||
params.push(
|
|
||||||
`claimContents=${encodeURIComponent(claimContents.toLowerCase().trim())}`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (beforeId) {
|
|
||||||
params.push(`beforeId=${encodeURIComponent(beforeId)}`);
|
|
||||||
}
|
|
||||||
if (params.length > 0) {
|
|
||||||
url += `?${params.join("&")}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const response = await fetch(url, {
|
|
||||||
method: "GET",
|
|
||||||
headers: await getHeaders(this.activeDid),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (response.status !== 200) {
|
|
||||||
throw new Error(
|
|
||||||
isSearch ? "Failed to search projects" : "Failed to load projects",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const results = await response.json();
|
|
||||||
if (results.data) {
|
|
||||||
const newProjects = results.data.map(
|
|
||||||
(plan: PlanData & { rowId?: string }) => ({
|
|
||||||
...plan,
|
|
||||||
rowId: plan.rowId,
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
||||||
if (isSearch) {
|
|
||||||
// Search mode: update filteredEntities
|
|
||||||
if (beforeId) {
|
|
||||||
// Pagination: append new projects to existing search results
|
|
||||||
this.filteredEntities.push(...newProjects);
|
|
||||||
} else {
|
|
||||||
// Initial search: replace array
|
|
||||||
this.filteredEntities = newProjects;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update searchBeforeId for next pagination
|
|
||||||
if (newProjects.length > 0) {
|
|
||||||
const lastProject = newProjects[newProjects.length - 1];
|
|
||||||
this.searchBeforeId = lastProject.rowId || undefined;
|
|
||||||
} else {
|
|
||||||
this.searchBeforeId = undefined; // No more results
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Load mode: update allProjects
|
|
||||||
if (beforeId) {
|
|
||||||
// Pagination: append new projects
|
|
||||||
this.allProjects.push(...newProjects);
|
|
||||||
} else {
|
|
||||||
// Initial load: replace array
|
|
||||||
this.allProjects = newProjects;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update loadBeforeId for next pagination
|
|
||||||
if (newProjects.length > 0) {
|
|
||||||
const lastProject = newProjects[newProjects.length - 1];
|
|
||||||
this.loadBeforeId = lastProject.rowId || undefined;
|
|
||||||
} else {
|
|
||||||
this.loadBeforeId = undefined; // No more results
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// No data in response
|
|
||||||
if (isSearch) {
|
|
||||||
if (!beforeId) {
|
|
||||||
// Only clear on initial search, not pagination
|
|
||||||
this.filteredEntities = [];
|
|
||||||
}
|
|
||||||
this.searchBeforeId = undefined;
|
|
||||||
} else {
|
|
||||||
if (!beforeId) {
|
|
||||||
// Only clear on initial load, not pagination
|
|
||||||
this.allProjects = [];
|
|
||||||
}
|
|
||||||
this.loadBeforeId = undefined;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
`Error ${isSearch ? "searching" : "loading"} projects:`,
|
|
||||||
error,
|
|
||||||
);
|
|
||||||
if (isSearch) {
|
|
||||||
if (!beforeId) {
|
|
||||||
// Only clear on initial search error, not pagination error
|
|
||||||
this.filteredEntities = [];
|
|
||||||
}
|
|
||||||
this.searchBeforeId = undefined;
|
|
||||||
} else {
|
|
||||||
if (!beforeId) {
|
|
||||||
// Only clear on initial load error, not pagination error
|
|
||||||
this.allProjects = [];
|
|
||||||
}
|
|
||||||
this.loadBeforeId = undefined;
|
|
||||||
}
|
|
||||||
if (this.notify) {
|
|
||||||
this.notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: isSearch
|
|
||||||
? "Failed to search projects. Please try again."
|
|
||||||
: "Failed to load projects. Please try again.",
|
|
||||||
},
|
|
||||||
TIMEOUTS.STANDARD,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Client-side contact search
|
|
||||||
* Assumes entities prop contains complete contact list from local database
|
|
||||||
*/
|
|
||||||
async performContactSearch(): Promise<void> {
|
|
||||||
if (!this.entities) {
|
|
||||||
this.filteredEntities = [];
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Simulate async (for consistency with project search)
|
|
||||||
await new Promise((resolve) => setTimeout(resolve, 100));
|
|
||||||
|
|
||||||
const searchLower = this.searchTerm.toLowerCase().trim();
|
|
||||||
|
|
||||||
this.filteredEntities = (this.entities as Contact[])
|
|
||||||
.filter((contact: Contact) => {
|
|
||||||
const name = contact.name?.toLowerCase() || "";
|
|
||||||
const did = contact.did.toLowerCase();
|
|
||||||
return name.includes(searchLower) || did.includes(searchLower);
|
|
||||||
})
|
|
||||||
.sort((a: Contact, b: Contact) => {
|
|
||||||
// Sort alphabetically by name, falling back to DID if name is missing
|
|
||||||
const nameA = (a.name || a.did).toLowerCase();
|
|
||||||
const nameB = (b.name || b.did).toLowerCase();
|
|
||||||
return nameA.localeCompare(nameB);
|
|
||||||
});
|
|
||||||
|
|
||||||
// Contacts don't need pagination (complete list)
|
|
||||||
this.searchBeforeId = undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clear the search
|
* Clear the search
|
||||||
*/
|
*/
|
||||||
@@ -735,7 +502,6 @@ export default class EntityGrid extends Vue {
|
|||||||
this.filteredEntities = [];
|
this.filteredEntities = [];
|
||||||
this.isSearching = false;
|
this.isSearching = false;
|
||||||
this.displayedCount = INITIAL_BATCH_SIZE;
|
this.displayedCount = INITIAL_BATCH_SIZE;
|
||||||
this.searchBeforeId = undefined;
|
|
||||||
this.infiniteScrollReset?.();
|
this.infiniteScrollReset?.();
|
||||||
|
|
||||||
// Clear any pending timeout
|
// Clear any pending timeout
|
||||||
@@ -755,161 +521,35 @@ export default class EntityGrid extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (this.searchTerm.trim()) {
|
if (this.searchTerm.trim()) {
|
||||||
// Search mode: check if more results available
|
// Search mode: check filtered entities
|
||||||
if (this.entityType === "projects") {
|
return this.displayedCount < this.filteredEntities.length;
|
||||||
// Projects: can load more if:
|
|
||||||
// 1. We have more already-loaded results to show, OR
|
|
||||||
// 2. We've shown all loaded results AND there's a searchBeforeId to load more
|
|
||||||
const hasMoreLoaded =
|
|
||||||
this.displayedCount < this.filteredEntities.length;
|
|
||||||
const canLoadMoreFromServer =
|
|
||||||
this.displayedCount >= this.filteredEntities.length &&
|
|
||||||
!!this.searchBeforeId &&
|
|
||||||
!this.isLoadingSearchMore;
|
|
||||||
return hasMoreLoaded || canLoadMoreFromServer;
|
|
||||||
} else {
|
|
||||||
// Contacts: client-side filtering returns all results at once
|
|
||||||
return this.displayedCount < this.filteredEntities.length;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Non-search mode
|
|
||||||
if (this.entityType === "projects") {
|
if (this.entityType === "projects") {
|
||||||
// Projects: check internal state or prop
|
// Projects: check if more available
|
||||||
const projectsToCheck = this.entities || this.allProjects;
|
return this.displayedCount < this.entities.length;
|
||||||
const beforeId = this.entities ? undefined : this.loadBeforeId;
|
|
||||||
|
|
||||||
// Can load more if:
|
|
||||||
// 1. We have more already-loaded results to show, OR
|
|
||||||
// 2. We've shown all loaded results AND there's a beforeId to load more (and not using entities prop)
|
|
||||||
const hasMoreLoaded = this.displayedCount < projectsToCheck.length;
|
|
||||||
const canLoadMoreFromServer =
|
|
||||||
!this.entities &&
|
|
||||||
this.displayedCount >= projectsToCheck.length &&
|
|
||||||
!!beforeId &&
|
|
||||||
!this.isLoadingProjects;
|
|
||||||
|
|
||||||
return hasMoreLoaded || canLoadMoreFromServer;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// People: check if more alphabetical contacts available
|
// People: check if more alphabetical contacts available
|
||||||
// Total available = recent + all alphabetical
|
// Total available = 3 recent + all alphabetical
|
||||||
if (!this.entities) {
|
const remaining = (this.entities as Contact[]).slice(RECENT_CONTACTS_COUNT);
|
||||||
return false;
|
const totalAvailable = RECENT_CONTACTS_COUNT + remaining.length;
|
||||||
}
|
|
||||||
const totalAvailable = RECENT_CONTACTS_COUNT + this.entities.length;
|
|
||||||
return this.displayedCount < totalAvailable;
|
return this.displayedCount < totalAvailable;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize infinite scroll on mount
|
* Initialize infinite scroll on mount
|
||||||
*/
|
*/
|
||||||
async mounted(): Promise<void> {
|
mounted(): void {
|
||||||
// Load apiServer for project searches/loads
|
|
||||||
if (this.entityType === "projects") {
|
|
||||||
const settings = await this.$accountSettings();
|
|
||||||
this.apiServer = settings.apiServer || "";
|
|
||||||
|
|
||||||
// Load projects on mount if entities prop not provided
|
|
||||||
if (!this.entities && this.apiServer) {
|
|
||||||
this.isLoadingProjects = true;
|
|
||||||
try {
|
|
||||||
await this.fetchProjects();
|
|
||||||
} catch (error) {
|
|
||||||
logger.error("Error loading projects on mount:", error);
|
|
||||||
} finally {
|
|
||||||
this.isLoadingProjects = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Validate entities prop for people
|
|
||||||
if (this.entityType === "people" && !this.entities) {
|
|
||||||
logger.error(
|
|
||||||
"EntityGrid: entities prop is required when entityType is 'people'",
|
|
||||||
);
|
|
||||||
if (this.notify) {
|
|
||||||
this.notify(
|
|
||||||
{
|
|
||||||
group: "alert",
|
|
||||||
type: "danger",
|
|
||||||
title: "Error",
|
|
||||||
text: "Contacts data is required but not provided.",
|
|
||||||
},
|
|
||||||
TIMEOUTS.SHORT,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
const container = this.$refs.scrollContainer as HTMLElement;
|
const container = this.$refs.scrollContainer as HTMLElement;
|
||||||
|
|
||||||
if (container) {
|
if (container) {
|
||||||
const { reset } = useInfiniteScroll(
|
const { reset } = useInfiniteScroll(
|
||||||
container,
|
container,
|
||||||
async () => {
|
() => {
|
||||||
// Search mode: handle search pagination
|
// Load more: increment displayedCount
|
||||||
if (this.searchTerm.trim()) {
|
this.displayedCount += INCREMENT_SIZE;
|
||||||
if (this.entityType === "projects") {
|
|
||||||
// Projects: load more search results if available
|
|
||||||
if (
|
|
||||||
this.displayedCount >= this.filteredEntities.length &&
|
|
||||||
this.searchBeforeId &&
|
|
||||||
!this.isLoadingSearchMore
|
|
||||||
) {
|
|
||||||
this.isLoadingSearchMore = true;
|
|
||||||
try {
|
|
||||||
const searchLower = this.searchTerm.toLowerCase().trim();
|
|
||||||
await this.fetchProjects(this.searchBeforeId, searchLower);
|
|
||||||
// After loading more, reset scroll state to allow further loading
|
|
||||||
this.infiniteScrollReset?.();
|
|
||||||
} catch (error) {
|
|
||||||
logger.error("Error loading more search results:", error);
|
|
||||||
// Error already handled in fetchProjects
|
|
||||||
} finally {
|
|
||||||
this.isLoadingSearchMore = false;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Show more from already-loaded search results
|
|
||||||
this.displayedCount += INCREMENT_SIZE;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Contacts: show more from already-filtered results
|
|
||||||
this.displayedCount += INCREMENT_SIZE;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Non-search mode
|
|
||||||
if (this.entityType === "projects") {
|
|
||||||
const projectsToCheck = this.entities || this.allProjects;
|
|
||||||
const beforeId = this.entities ? undefined : this.loadBeforeId;
|
|
||||||
|
|
||||||
// If using internal state and need to load more from server
|
|
||||||
if (
|
|
||||||
!this.entities &&
|
|
||||||
this.displayedCount >= projectsToCheck.length &&
|
|
||||||
beforeId &&
|
|
||||||
!this.isLoadingProjects
|
|
||||||
) {
|
|
||||||
this.isLoadingProjects = true;
|
|
||||||
try {
|
|
||||||
await this.fetchProjects(beforeId);
|
|
||||||
// After loading more, reset scroll state to allow further loading
|
|
||||||
this.infiniteScrollReset?.();
|
|
||||||
} catch (error) {
|
|
||||||
logger.error("Error loading more projects:", error);
|
|
||||||
// Error already handled in fetchProjects
|
|
||||||
} finally {
|
|
||||||
this.isLoadingProjects = false;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Normal case: increment displayedCount to show more from memory
|
|
||||||
this.displayedCount += INCREMENT_SIZE;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// People: increment displayedCount to show more from memory
|
|
||||||
this.displayedCount += INCREMENT_SIZE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
distance: 50, // pixels from bottom
|
distance: 50, // pixels from bottom
|
||||||
@@ -935,35 +575,21 @@ export default class EntityGrid extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Watch for changes in search term to reset displayed count and pagination
|
* Watch for changes in search term to reset displayed count
|
||||||
*/
|
*/
|
||||||
@Watch("searchTerm")
|
@Watch("searchTerm")
|
||||||
onSearchTermChange(): void {
|
onSearchTermChange(): void {
|
||||||
// Reset displayed count and pagination when search term changes
|
|
||||||
this.displayedCount = INITIAL_BATCH_SIZE;
|
this.displayedCount = INITIAL_BATCH_SIZE;
|
||||||
this.searchBeforeId = undefined;
|
|
||||||
this.infiniteScrollReset?.();
|
this.infiniteScrollReset?.();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Watch for changes in entities prop to clear search and reset displayed count
|
* Watch for changes in entities prop to reset displayed count
|
||||||
*/
|
*/
|
||||||
@Watch("entities")
|
@Watch("entities")
|
||||||
onEntitiesChange(): void {
|
onEntitiesChange(): void {
|
||||||
// Clear search when entities change (fresh dialog open)
|
|
||||||
if (this.searchTerm) {
|
|
||||||
this.searchTerm = "";
|
|
||||||
this.filteredEntities = [];
|
|
||||||
this.searchBeforeId = undefined;
|
|
||||||
}
|
|
||||||
this.displayedCount = INITIAL_BATCH_SIZE;
|
this.displayedCount = INITIAL_BATCH_SIZE;
|
||||||
this.infiniteScrollReset?.();
|
this.infiniteScrollReset?.();
|
||||||
|
|
||||||
// For projects: if entities prop is provided, clear internal state
|
|
||||||
if (this.entityType === "projects" && this.entities) {
|
|
||||||
this.allProjects = [];
|
|
||||||
this.loadBeforeId = undefined;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ properties * * @author Matthew Raymer */
|
|||||||
|
|
||||||
<EntityGrid
|
<EntityGrid
|
||||||
:entity-type="shouldShowProjects ? 'projects' : 'people'"
|
:entity-type="shouldShowProjects ? 'projects' : 'people'"
|
||||||
:entities="shouldShowProjects ? projects || undefined : allContacts"
|
:entities="shouldShowProjects ? projects : allContacts"
|
||||||
:active-did="activeDid"
|
:active-did="activeDid"
|
||||||
:all-my-dids="allMyDids"
|
:all-my-dids="allMyDids"
|
||||||
:all-contacts="allContacts"
|
:all-contacts="allContacts"
|
||||||
@@ -94,9 +94,9 @@ export default class EntitySelectionStep extends Vue {
|
|||||||
@Prop({ default: false })
|
@Prop({ default: false })
|
||||||
isFromProjectView!: boolean;
|
isFromProjectView!: boolean;
|
||||||
|
|
||||||
/** Array of available projects (optional - EntityGrid loads internally if not provided) */
|
/** Array of available projects */
|
||||||
@Prop({ required: false })
|
@Prop({ required: true })
|
||||||
projects?: PlanData[];
|
projects!: PlanData[];
|
||||||
|
|
||||||
/** Array of available contacts */
|
/** Array of available contacts */
|
||||||
@Prop({ required: true })
|
@Prop({ required: true })
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
giverEntityType === 'project' || recipientEntityType === 'project'
|
giverEntityType === 'project' || recipientEntityType === 'project'
|
||||||
"
|
"
|
||||||
:is-from-project-view="isFromProjectView"
|
:is-from-project-view="isFromProjectView"
|
||||||
|
:projects="projects"
|
||||||
:all-contacts="allContacts"
|
:all-contacts="allContacts"
|
||||||
:active-did="activeDid"
|
:active-did="activeDid"
|
||||||
:all-my-dids="allMyDids"
|
:all-my-dids="allMyDids"
|
||||||
@@ -67,6 +68,7 @@ import {
|
|||||||
createAndSubmitGive,
|
createAndSubmitGive,
|
||||||
didInfo,
|
didInfo,
|
||||||
serverMessageForUser,
|
serverMessageForUser,
|
||||||
|
getHeaders,
|
||||||
} from "../libs/endorserServer";
|
} from "../libs/endorserServer";
|
||||||
import * as libsUtil from "../libs/util";
|
import * as libsUtil from "../libs/util";
|
||||||
import { Contact } from "../db/tables/contacts";
|
import { Contact } from "../db/tables/contacts";
|
||||||
@@ -132,6 +134,7 @@ export default class GiftedDialog extends Vue {
|
|||||||
firstStep = true; // true = Step 1 (giver/recipient selection), false = Step 2 (amount/description)
|
firstStep = true; // true = Step 1 (giver/recipient selection), false = Step 2 (amount/description)
|
||||||
giver?: libsUtil.GiverReceiverInputInfo; // undefined means no identified giver agent
|
giver?: libsUtil.GiverReceiverInputInfo; // undefined means no identified giver agent
|
||||||
offerId = "";
|
offerId = "";
|
||||||
|
projects: PlanData[] = [];
|
||||||
prompt = "";
|
prompt = "";
|
||||||
receiver?: libsUtil.GiverReceiverInputInfo;
|
receiver?: libsUtil.GiverReceiverInputInfo;
|
||||||
stepType = "giver";
|
stepType = "giver";
|
||||||
@@ -231,6 +234,16 @@ export default class GiftedDialog extends Vue {
|
|||||||
this.allContacts = await this.$contactsByDateAdded();
|
this.allContacts = await this.$contactsByDateAdded();
|
||||||
|
|
||||||
this.allMyDids = await retrieveAccountDids();
|
this.allMyDids = await retrieveAccountDids();
|
||||||
|
|
||||||
|
if (
|
||||||
|
this.giverEntityType === "project" ||
|
||||||
|
this.recipientEntityType === "project"
|
||||||
|
) {
|
||||||
|
await this.loadProjects();
|
||||||
|
} else {
|
||||||
|
// Clear projects array when not needed
|
||||||
|
this.projects = [];
|
||||||
|
}
|
||||||
} catch (err: unknown) {
|
} catch (err: unknown) {
|
||||||
logger.error("Error retrieving settings from database:", err);
|
logger.error("Error retrieving settings from database:", err);
|
||||||
this.safeNotify.error(
|
this.safeNotify.error(
|
||||||
@@ -476,6 +489,27 @@ export default class GiftedDialog extends Vue {
|
|||||||
this.firstStep = false;
|
this.firstStep = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async loadProjects() {
|
||||||
|
try {
|
||||||
|
const response = await fetch(this.apiServer + "/api/v2/report/plans", {
|
||||||
|
method: "GET",
|
||||||
|
headers: await getHeaders(this.activeDid),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.status !== 200) {
|
||||||
|
throw new Error("Failed to load projects");
|
||||||
|
}
|
||||||
|
|
||||||
|
const results = await response.json();
|
||||||
|
if (results.data) {
|
||||||
|
this.projects = results.data;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
logger.error("Error loading projects:", error);
|
||||||
|
this.safeNotify.error("Failed to load projects", TIMEOUTS.STANDARD);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
selectProject(project: PlanData) {
|
selectProject(project: PlanData) {
|
||||||
this.giver = {
|
this.giver = {
|
||||||
did: project.handleId,
|
did: project.handleId,
|
||||||
|
|||||||
@@ -1,130 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div v-if="visible" class="dialog-overlay">
|
|
||||||
<div class="dialog">
|
|
||||||
<!-- Header -->
|
|
||||||
<h2 class="text-lg font-semibold leading-[1.25] mb-4">Select Project</h2>
|
|
||||||
|
|
||||||
<!-- EntityGrid for projects -->
|
|
||||||
<EntityGrid
|
|
||||||
:entity-type="'projects'"
|
|
||||||
:active-did="activeDid"
|
|
||||||
:all-my-dids="allMyDids"
|
|
||||||
:all-contacts="allContacts"
|
|
||||||
:conflict-checker="() => false"
|
|
||||||
:show-you-entity="false"
|
|
||||||
:show-unnamed-entity="false"
|
|
||||||
:notify="notify"
|
|
||||||
:conflict-context="'project'"
|
|
||||||
@entity-selected="handleEntitySelected"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<!-- Cancel Button -->
|
|
||||||
<div class="flex gap-2 mt-4">
|
|
||||||
<button
|
|
||||||
class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-2 rounded-md"
|
|
||||||
@click="handleCancel"
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
|
|
||||||
import EntityGrid from "./EntityGrid.vue";
|
|
||||||
import { Contact } from "../db/tables/contacts";
|
|
||||||
import { PlanData } from "../interfaces/records";
|
|
||||||
import { NotificationIface } from "../constants/app";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* MeetingProjectDialog - Dialog for selecting a project link for a meeting
|
|
||||||
*
|
|
||||||
* Features:
|
|
||||||
* - EntityGrid integration for project selection
|
|
||||||
* - No special entities (You, Unnamed)
|
|
||||||
* - Immediate assignment on project selection
|
|
||||||
* - Cancel button to close without selection
|
|
||||||
*/
|
|
||||||
@Component({
|
|
||||||
components: {
|
|
||||||
EntityGrid,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
export default class MeetingProjectDialog extends Vue {
|
|
||||||
/** Whether the dialog is visible */
|
|
||||||
visible = false;
|
|
||||||
|
|
||||||
/** Active user's DID */
|
|
||||||
@Prop({ required: true })
|
|
||||||
activeDid!: string;
|
|
||||||
|
|
||||||
/** All user's DIDs */
|
|
||||||
@Prop({ required: true })
|
|
||||||
allMyDids!: string[];
|
|
||||||
|
|
||||||
/** All contacts */
|
|
||||||
@Prop({ required: true })
|
|
||||||
allContacts!: Contact[];
|
|
||||||
|
|
||||||
/** Notification function from parent component */
|
|
||||||
@Prop()
|
|
||||||
notify?: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle entity selection from EntityGrid
|
|
||||||
* Immediately assigns the selected project and closes the dialog
|
|
||||||
*/
|
|
||||||
handleEntitySelected(event: {
|
|
||||||
type: "person" | "project";
|
|
||||||
data: Contact | PlanData;
|
|
||||||
}) {
|
|
||||||
const project = event.data as PlanData;
|
|
||||||
this.emitAssign(project);
|
|
||||||
this.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle cancel button click
|
|
||||||
*/
|
|
||||||
handleCancel(): void {
|
|
||||||
this.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open the dialog
|
|
||||||
*/
|
|
||||||
open(): void {
|
|
||||||
this.visible = true;
|
|
||||||
this.emitOpen();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Close the dialog
|
|
||||||
*/
|
|
||||||
close(): void {
|
|
||||||
this.visible = false;
|
|
||||||
this.emitClose();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Emit methods using @Emit decorator
|
|
||||||
|
|
||||||
@Emit("assign")
|
|
||||||
emitAssign(project: PlanData): PlanData {
|
|
||||||
return project;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Emit("open")
|
|
||||||
emitOpen(): void {
|
|
||||||
// Emit when dialog opens
|
|
||||||
}
|
|
||||||
|
|
||||||
@Emit("close")
|
|
||||||
emitClose(): void {
|
|
||||||
// Emit when dialog closes
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style scoped></style>
|
|
||||||
@@ -8,7 +8,7 @@ issuer information. * * @author Matthew Raymer */
|
|||||||
>
|
>
|
||||||
<ProjectIcon
|
<ProjectIcon
|
||||||
:entity-id="project.handleId"
|
:entity-id="project.handleId"
|
||||||
:icon-size="30"
|
:icon-size="48"
|
||||||
:image-url="project.image"
|
:image-url="project.image"
|
||||||
class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
|
class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -1,117 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div v-if="visible" class="dialog-overlay">
|
|
||||||
<div class="dialog">
|
|
||||||
<!-- Header -->
|
|
||||||
<h2 class="text-lg font-semibold leading-[1.25] mb-4">
|
|
||||||
Select Representative
|
|
||||||
</h2>
|
|
||||||
|
|
||||||
<!-- EntityGrid for contacts -->
|
|
||||||
<EntityGrid
|
|
||||||
:entity-type="'people'"
|
|
||||||
:entities="allContacts"
|
|
||||||
:active-did="activeDid"
|
|
||||||
:all-my-dids="allMyDids"
|
|
||||||
:all-contacts="allContacts"
|
|
||||||
:conflict-checker="() => false"
|
|
||||||
:show-you-entity="false"
|
|
||||||
:show-unnamed-entity="false"
|
|
||||||
:notify="notify"
|
|
||||||
:conflict-context="'representative'"
|
|
||||||
@entity-selected="handleEntitySelected"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<!-- Cancel Button -->
|
|
||||||
<div class="flex gap-2 mt-4">
|
|
||||||
<button
|
|
||||||
class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-2 rounded-md"
|
|
||||||
@click="handleCancel"
|
|
||||||
>
|
|
||||||
Cancel
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
|
|
||||||
import EntityGrid from "./EntityGrid.vue";
|
|
||||||
import { Contact } from "../db/tables/contacts";
|
|
||||||
import { NotificationIface } from "../constants/app";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* ProjectRepresentativeDialog - Dialog for selecting an authorized representative
|
|
||||||
*
|
|
||||||
* Features:
|
|
||||||
* - EntityGrid integration for contact selection
|
|
||||||
* - No special entities (You, Unnamed)
|
|
||||||
* - Immediate assignment on contact selection
|
|
||||||
* - Cancel button to close without selection
|
|
||||||
*/
|
|
||||||
@Component({
|
|
||||||
components: {
|
|
||||||
EntityGrid,
|
|
||||||
},
|
|
||||||
})
|
|
||||||
export default class ProjectRepresentativeDialog extends Vue {
|
|
||||||
/** Whether the dialog is visible */
|
|
||||||
visible = false;
|
|
||||||
|
|
||||||
/** Array of available contacts */
|
|
||||||
@Prop({ required: true })
|
|
||||||
allContacts!: Contact[];
|
|
||||||
|
|
||||||
/** Active user's DID */
|
|
||||||
@Prop({ required: true })
|
|
||||||
activeDid!: string;
|
|
||||||
|
|
||||||
/** All user's DIDs */
|
|
||||||
@Prop({ required: true })
|
|
||||||
allMyDids!: string[];
|
|
||||||
|
|
||||||
/** Notification function from parent component */
|
|
||||||
@Prop()
|
|
||||||
notify?: (notification: NotificationIface, timeout?: number) => void;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle entity selection from EntityGrid
|
|
||||||
* Immediately assigns the selected contact and closes the dialog
|
|
||||||
*/
|
|
||||||
handleEntitySelected(event: { type: "person" | "project"; data: Contact }) {
|
|
||||||
const contact = event.data as Contact;
|
|
||||||
this.emitAssign(contact);
|
|
||||||
this.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle cancel button click
|
|
||||||
*/
|
|
||||||
handleCancel(): void {
|
|
||||||
this.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open the dialog
|
|
||||||
*/
|
|
||||||
open(): void {
|
|
||||||
this.visible = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Close the dialog
|
|
||||||
*/
|
|
||||||
close(): void {
|
|
||||||
this.visible = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Emit methods using @Emit decorator
|
|
||||||
|
|
||||||
@Emit("assign")
|
|
||||||
emitAssign(contact: Contact): Contact {
|
|
||||||
return contact;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style scoped></style>
|
|
||||||
@@ -57,12 +57,7 @@ export interface OfferToPlanSummaryRecord extends OfferSummaryRecord {
|
|||||||
planName: string;
|
planName: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
// a summary record; the VC is not currently part of this record
|
||||||
* A summary record
|
|
||||||
* The VC is not currently part of this record.
|
|
||||||
*
|
|
||||||
* If you change this, you may want to update NewActivityView.vue to handle differences correctly.
|
|
||||||
*/
|
|
||||||
export interface PlanSummaryRecord {
|
export interface PlanSummaryRecord {
|
||||||
agentDid?: string;
|
agentDid?: string;
|
||||||
description: string;
|
description: string;
|
||||||
@@ -81,9 +76,7 @@ export interface PlanSummaryRecord {
|
|||||||
|
|
||||||
export interface PlanSummaryAndPreviousClaim {
|
export interface PlanSummaryAndPreviousClaim {
|
||||||
plan: PlanSummaryRecord;
|
plan: PlanSummaryRecord;
|
||||||
// This can be undefined, eg. if a project is starred after the stored last-seen-change-jwt ID.
|
wrappedClaimBefore: GenericCredWrapper<PlanActionClaim>;
|
||||||
// The endorser-ch test code shows some cases.
|
|
||||||
wrappedClaimBefore?: GenericCredWrapper<PlanActionClaim>;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -21,14 +21,8 @@ import IndexedDBBackend from "absurd-sql/dist/indexeddb-backend";
|
|||||||
import { runMigrations } from "../db-sql/migration";
|
import { runMigrations } from "../db-sql/migration";
|
||||||
import type { DatabaseService, QueryExecResult } from "../interfaces/database";
|
import type { DatabaseService, QueryExecResult } from "../interfaces/database";
|
||||||
import { logger } from "@/utils/logger";
|
import { logger } from "@/utils/logger";
|
||||||
|
import { OperationQueue, QueueExecutor } from "./platforms/OperationQueue";
|
||||||
interface QueuedOperation {
|
import { QueuedOperation } from "./platforms/types";
|
||||||
type: "run" | "query";
|
|
||||||
sql: string;
|
|
||||||
params: unknown[];
|
|
||||||
resolve: (value: unknown) => void;
|
|
||||||
reject: (reason: unknown) => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface AbsurdSqlDatabase {
|
interface AbsurdSqlDatabase {
|
||||||
exec: (sql: string, params?: unknown[]) => Promise<QueryExecResult[]>;
|
exec: (sql: string, params?: unknown[]) => Promise<QueryExecResult[]>;
|
||||||
@@ -43,8 +37,7 @@ class AbsurdSqlDatabaseService implements DatabaseService {
|
|||||||
private db: AbsurdSqlDatabase | null;
|
private db: AbsurdSqlDatabase | null;
|
||||||
private initialized: boolean;
|
private initialized: boolean;
|
||||||
private initializationPromise: Promise<void> | null = null;
|
private initializationPromise: Promise<void> | null = null;
|
||||||
private operationQueue: Array<QueuedOperation> = [];
|
private operationQueue = new OperationQueue<AbsurdSqlDatabase>();
|
||||||
private isProcessingQueue: boolean = false;
|
|
||||||
|
|
||||||
private constructor() {
|
private constructor() {
|
||||||
this.db = null;
|
this.db = null;
|
||||||
@@ -161,42 +154,30 @@ class AbsurdSqlDatabaseService implements DatabaseService {
|
|||||||
this.processQueue();
|
this.processQueue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create executor adapter for AbsurdSQL API
|
||||||
|
*/
|
||||||
|
private createExecutor(): QueueExecutor<AbsurdSqlDatabase> {
|
||||||
|
return {
|
||||||
|
executeRun: async (db, sql, params) => {
|
||||||
|
return await db.run(sql, params);
|
||||||
|
},
|
||||||
|
executeQuery: async (db, sql, params) => {
|
||||||
|
return await db.exec(sql, params);
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
private async processQueue(): Promise<void> {
|
private async processQueue(): Promise<void> {
|
||||||
if (this.isProcessingQueue || !this.initialized || !this.db) {
|
if (!this.initialized || !this.db) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.isProcessingQueue = true;
|
await this.operationQueue.processQueue(
|
||||||
|
this.db,
|
||||||
while (this.operationQueue.length > 0) {
|
this.createExecutor(),
|
||||||
const operation = this.operationQueue.shift();
|
"AbsurdSqlDatabaseService",
|
||||||
if (!operation) continue;
|
);
|
||||||
|
|
||||||
try {
|
|
||||||
let result: unknown;
|
|
||||||
switch (operation.type) {
|
|
||||||
case "run":
|
|
||||||
result = await this.db.run(operation.sql, operation.params);
|
|
||||||
break;
|
|
||||||
case "query":
|
|
||||||
result = await this.db.exec(operation.sql, operation.params);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
operation.resolve(result);
|
|
||||||
} catch (error) {
|
|
||||||
logger.error(
|
|
||||||
"Error while processing SQL queue:",
|
|
||||||
error,
|
|
||||||
" ... for sql:",
|
|
||||||
operation.sql,
|
|
||||||
" ... with params:",
|
|
||||||
operation.params,
|
|
||||||
);
|
|
||||||
operation.reject(error);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
this.isProcessingQueue = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async queueOperation<R>(
|
private async queueOperation<R>(
|
||||||
@@ -204,21 +185,24 @@ class AbsurdSqlDatabaseService implements DatabaseService {
|
|||||||
sql: string,
|
sql: string,
|
||||||
params: unknown[] = [],
|
params: unknown[] = [],
|
||||||
): Promise<R> {
|
): Promise<R> {
|
||||||
return new Promise<R>((resolve, reject) => {
|
const operation: QueuedOperation = {
|
||||||
const operation: QueuedOperation = {
|
type,
|
||||||
type,
|
sql,
|
||||||
sql,
|
params,
|
||||||
params,
|
resolve: (_value: unknown) => {
|
||||||
resolve: (value: unknown) => resolve(value as R),
|
// No-op, will be wrapped by OperationQueue
|
||||||
reject,
|
},
|
||||||
};
|
reject: () => {
|
||||||
this.operationQueue.push(operation);
|
// No-op, will be wrapped by OperationQueue
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
// If we're already initialized, start processing the queue
|
return this.operationQueue.queueOperation<R>(
|
||||||
if (this.initialized && this.db) {
|
operation,
|
||||||
this.processQueue();
|
this.initialized,
|
||||||
}
|
this.db,
|
||||||
});
|
() => this.processQueue(),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async waitForInitialization(): Promise<void> {
|
private async waitForInitialization(): Promise<void> {
|
||||||
|
|||||||
@@ -4,76 +4,144 @@ import { CapacitorPlatformService } from "./platforms/CapacitorPlatformService";
|
|||||||
import { ElectronPlatformService } from "./platforms/ElectronPlatformService";
|
import { ElectronPlatformService } from "./platforms/ElectronPlatformService";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Factory class for creating platform-specific service implementations.
|
* HMR-safe global singleton storage for PlatformService
|
||||||
* Implements the Singleton pattern to ensure only one instance of PlatformService exists.
|
|
||||||
*
|
*
|
||||||
* The factory determines which platform implementation to use based on the VITE_PLATFORM
|
* Uses multiple fallbacks to ensure persistence across module reloads:
|
||||||
* environment variable. Supported platforms are:
|
* 1. globalThis (standard, works in most environments)
|
||||||
* - capacitor: Mobile platform using Capacitor
|
* 2. window (browser fallback)
|
||||||
* - electron: Desktop platform using Electron with Capacitor
|
* 3. self (web worker fallback)
|
||||||
* - web: Default web platform (fallback)
|
*/
|
||||||
|
declare global {
|
||||||
|
// eslint-disable-next-line no-var
|
||||||
|
var __PLATFORM_SERVICE_SINGLETON__: PlatformService | undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the global object for singleton storage
|
||||||
|
* Uses multiple fallbacks to ensure compatibility
|
||||||
|
*/
|
||||||
|
function getGlobal(): typeof globalThis {
|
||||||
|
if (typeof globalThis !== "undefined") return globalThis;
|
||||||
|
if (typeof window !== "undefined") return window as typeof globalThis;
|
||||||
|
if (typeof self !== "undefined") return self as typeof globalThis;
|
||||||
|
// Fallback for Node.js environments
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
return {} as any;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Factory function to create platform-specific service implementation
|
||||||
|
*
|
||||||
|
* Uses console.log instead of logger to avoid circular dependency
|
||||||
|
* (logger imports PlatformServiceFactory)
|
||||||
|
*/
|
||||||
|
function create(): PlatformService {
|
||||||
|
const which = import.meta.env?.VITE_PLATFORM ?? "web";
|
||||||
|
|
||||||
|
if (which === "capacitor") return new CapacitorPlatformService();
|
||||||
|
if (which === "electron") return new ElectronPlatformService();
|
||||||
|
return new WebPlatformService();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get or create the HMR-safe singleton instance of PlatformService
|
||||||
|
*
|
||||||
|
* Uses lazy initialization to avoid circular dependency issues at module load time.
|
||||||
|
*/
|
||||||
|
function getPlatformSvc(): PlatformService {
|
||||||
|
const global = getGlobal();
|
||||||
|
|
||||||
|
const exists = global.__PLATFORM_SERVICE_SINGLETON__ !== undefined;
|
||||||
|
|
||||||
|
if (!exists) {
|
||||||
|
global.__PLATFORM_SERVICE_SINGLETON__ = create();
|
||||||
|
// Verify it was stored
|
||||||
|
if (!global.__PLATFORM_SERVICE_SINGLETON__) {
|
||||||
|
// eslint-disable-next-line no-console
|
||||||
|
console.error(
|
||||||
|
"[PlatformServiceFactory] ERROR: Singleton creation failed - storage returned undefined",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Type guard: ensure singleton exists (should never be undefined at this point)
|
||||||
|
const singleton = global.__PLATFORM_SERVICE_SINGLETON__;
|
||||||
|
if (!singleton) {
|
||||||
|
// eslint-disable-next-line no-console
|
||||||
|
console.error(
|
||||||
|
"[PlatformServiceFactory] CRITICAL: Singleton is undefined after creation/retrieval",
|
||||||
|
);
|
||||||
|
// Fallback: create a new one
|
||||||
|
global.__PLATFORM_SERVICE_SINGLETON__ = create();
|
||||||
|
return global.__PLATFORM_SERVICE_SINGLETON__;
|
||||||
|
}
|
||||||
|
|
||||||
|
return singleton;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* HMR-safe singleton instance of PlatformService
|
||||||
|
*
|
||||||
|
* This is the ONLY way to access PlatformService throughout the application.
|
||||||
|
* Do not create new instances of platform services directly.
|
||||||
|
*
|
||||||
|
* Uses lazy initialization via Proxy to avoid circular dependency issues at module load time.
|
||||||
*
|
*
|
||||||
* @example
|
* @example
|
||||||
* ```typescript
|
* ```typescript
|
||||||
* const platformService = PlatformServiceFactory.getInstance();
|
* import { PlatformSvc } from "./services/PlatformServiceFactory";
|
||||||
* await platformService.takePicture();
|
* await PlatformSvc.takePicture();
|
||||||
* ```
|
* ```
|
||||||
*/
|
*/
|
||||||
export class PlatformServiceFactory {
|
export const PlatformSvc = new Proxy({} as PlatformService, {
|
||||||
private static instance: PlatformService | null = null;
|
get(_target, prop) {
|
||||||
private static callCount = 0; // Debug counter
|
const svc = getPlatformSvc();
|
||||||
private static creationLogged = false; // Only log creation once
|
const value = (svc as unknown as Record<string, unknown>)[prop as string];
|
||||||
|
// Bind methods to maintain 'this' context
|
||||||
|
if (typeof value === "function") {
|
||||||
|
return value.bind(svc);
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
// Preserve singleton across Vite HMR
|
||||||
|
if (import.meta?.hot) {
|
||||||
|
import.meta.hot.accept(() => {
|
||||||
|
// Don't recreate on HMR - keep existing instance
|
||||||
|
const global = getGlobal();
|
||||||
|
if (!global.__PLATFORM_SERVICE_SINGLETON__) {
|
||||||
|
// Restore singleton if it was lost during HMR
|
||||||
|
global.__PLATFORM_SERVICE_SINGLETON__ = getPlatformSvc();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
import.meta.hot.dispose(() => {
|
||||||
|
// Don't delete - keep the global instance
|
||||||
|
// The singleton will persist in globalThis/window/self
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Legacy factory class for backward compatibility
|
||||||
|
* @deprecated Use `PlatformSvc` directly instead
|
||||||
|
*/
|
||||||
|
export class PlatformServiceFactory {
|
||||||
/**
|
/**
|
||||||
* Gets or creates the singleton instance of PlatformService.
|
* Gets the singleton instance of PlatformService.
|
||||||
* Creates the appropriate platform-specific implementation based on environment.
|
* @deprecated Use `PlatformSvc` directly instead
|
||||||
*
|
|
||||||
* @returns {PlatformService} The singleton instance of PlatformService
|
|
||||||
*/
|
*/
|
||||||
public static getInstance(): PlatformService {
|
public static getInstance(): PlatformService {
|
||||||
PlatformServiceFactory.callCount++;
|
return PlatformSvc;
|
||||||
|
|
||||||
if (PlatformServiceFactory.instance) {
|
|
||||||
// Normal case - return existing instance silently
|
|
||||||
return PlatformServiceFactory.instance;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only log when actually creating the instance
|
|
||||||
const platform = process.env.VITE_PLATFORM || "web";
|
|
||||||
|
|
||||||
if (!PlatformServiceFactory.creationLogged) {
|
|
||||||
// Use console for critical startup message to avoid circular dependency
|
|
||||||
// eslint-disable-next-line no-console
|
|
||||||
console.log(
|
|
||||||
`[PlatformServiceFactory] Creating singleton instance for platform: ${platform}`,
|
|
||||||
);
|
|
||||||
PlatformServiceFactory.creationLogged = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (platform) {
|
|
||||||
case "capacitor":
|
|
||||||
PlatformServiceFactory.instance = new CapacitorPlatformService();
|
|
||||||
break;
|
|
||||||
case "electron":
|
|
||||||
// Use a specialized electron service that extends CapacitorPlatformService
|
|
||||||
PlatformServiceFactory.instance = new ElectronPlatformService();
|
|
||||||
break;
|
|
||||||
case "web":
|
|
||||||
default:
|
|
||||||
PlatformServiceFactory.instance = new WebPlatformService();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
return PlatformServiceFactory.instance;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Debug method to check singleton usage stats
|
* Debug method to check singleton usage stats
|
||||||
*/
|
*/
|
||||||
public static getStats(): { callCount: number; instanceExists: boolean } {
|
public static getStats(): { callCount: number; instanceExists: boolean } {
|
||||||
|
const global = getGlobal();
|
||||||
return {
|
return {
|
||||||
callCount: PlatformServiceFactory.callCount,
|
callCount: 0, // Deprecated - no longer tracking
|
||||||
instanceExists: PlatformServiceFactory.instance !== null,
|
instanceExists: global.__PLATFORM_SERVICE_SINGLETON__ !== undefined,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
135
src/services/platforms/OperationQueue.ts
Normal file
135
src/services/platforms/OperationQueue.ts
Normal file
@@ -0,0 +1,135 @@
|
|||||||
|
/**
|
||||||
|
* Shared operation queue handler for database services
|
||||||
|
*
|
||||||
|
* Provides a reusable queue mechanism for database operations that need to
|
||||||
|
* wait for initialization before execution.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { QueuedOperation } from "./types";
|
||||||
|
import { logger } from "../../utils/logger";
|
||||||
|
|
||||||
|
export interface QueueExecutor<TDb> {
|
||||||
|
executeRun(db: TDb, sql: string, params: unknown[]): Promise<unknown>;
|
||||||
|
executeQuery(db: TDb, sql: string, params: unknown[]): Promise<unknown>;
|
||||||
|
executeRawQuery?(db: TDb, sql: string, params: unknown[]): Promise<unknown>;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class OperationQueue<TDb> {
|
||||||
|
private operationQueue: Array<QueuedOperation> = [];
|
||||||
|
private isProcessingQueue: boolean = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Process queued operations
|
||||||
|
*/
|
||||||
|
async processQueue(
|
||||||
|
db: TDb,
|
||||||
|
executor: QueueExecutor<TDb>,
|
||||||
|
serviceName: string,
|
||||||
|
): Promise<void> {
|
||||||
|
if (this.isProcessingQueue || !db) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.isProcessingQueue = true;
|
||||||
|
|
||||||
|
while (this.operationQueue.length > 0) {
|
||||||
|
const operation = this.operationQueue.shift();
|
||||||
|
if (!operation) continue;
|
||||||
|
|
||||||
|
try {
|
||||||
|
let result: unknown;
|
||||||
|
switch (operation.type) {
|
||||||
|
case "run":
|
||||||
|
result = await executor.executeRun(
|
||||||
|
db,
|
||||||
|
operation.sql,
|
||||||
|
operation.params,
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
case "query":
|
||||||
|
result = await executor.executeQuery(
|
||||||
|
db,
|
||||||
|
operation.sql,
|
||||||
|
operation.params,
|
||||||
|
);
|
||||||
|
break;
|
||||||
|
case "rawQuery":
|
||||||
|
if (executor.executeRawQuery) {
|
||||||
|
result = await executor.executeRawQuery(
|
||||||
|
db,
|
||||||
|
operation.sql,
|
||||||
|
operation.params,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
// Fallback to query if rawQuery not supported
|
||||||
|
result = await executor.executeQuery(
|
||||||
|
db,
|
||||||
|
operation.sql,
|
||||||
|
operation.params,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
operation.resolve(result);
|
||||||
|
} catch (error) {
|
||||||
|
logger.error(
|
||||||
|
`[${serviceName}] Error while processing SQL queue:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
|
logger.error(
|
||||||
|
`[${serviceName}] Failed operation - Type: ${operation.type}, SQL: ${operation.sql}`,
|
||||||
|
);
|
||||||
|
logger.error(
|
||||||
|
`[${serviceName}] Failed operation - Params:`,
|
||||||
|
operation.params,
|
||||||
|
);
|
||||||
|
operation.reject(error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.isProcessingQueue = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Queue an operation for later execution
|
||||||
|
*
|
||||||
|
* @param operation - Pre-constructed operation object (allows platform-specific parameter conversion)
|
||||||
|
* @param initialized - Whether the database is initialized
|
||||||
|
* @param db - Database connection (if available)
|
||||||
|
* @param onQueue - Callback to trigger queue processing
|
||||||
|
*/
|
||||||
|
queueOperation<R>(
|
||||||
|
operation: QueuedOperation,
|
||||||
|
initialized: boolean,
|
||||||
|
db: TDb | null,
|
||||||
|
onQueue: () => void,
|
||||||
|
): Promise<R> {
|
||||||
|
return new Promise<R>((resolve, reject) => {
|
||||||
|
// Wrap the operation's resolve/reject to match our Promise
|
||||||
|
const wrappedOperation: QueuedOperation = {
|
||||||
|
...operation,
|
||||||
|
resolve: (value: unknown) => {
|
||||||
|
operation.resolve(value);
|
||||||
|
resolve(value as R);
|
||||||
|
},
|
||||||
|
reject: (reason: unknown) => {
|
||||||
|
operation.reject(reason);
|
||||||
|
reject(reason);
|
||||||
|
},
|
||||||
|
};
|
||||||
|
this.operationQueue.push(wrappedOperation);
|
||||||
|
|
||||||
|
// If already initialized, trigger queue processing
|
||||||
|
if (initialized && db) {
|
||||||
|
onQueue();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get current queue length (for debugging)
|
||||||
|
*/
|
||||||
|
getQueueLength(): number {
|
||||||
|
return this.operationQueue.length;
|
||||||
|
}
|
||||||
|
}
|
||||||
20
src/services/platforms/sqlite.ts
Normal file
20
src/services/platforms/sqlite.ts
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
/**
|
||||||
|
* Shared SQLite connection manager for Capacitor platform
|
||||||
|
*
|
||||||
|
* Ensures only one SQLiteConnection instance exists across the application,
|
||||||
|
* preventing connection desync issues and unnecessary connection recreation.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { CapacitorSQLite, SQLiteConnection } from "@capacitor-community/sqlite";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Native Capacitor SQLite plugin instance
|
||||||
|
* This is the bridge to the native SQLite implementation
|
||||||
|
*/
|
||||||
|
export const CAP_SQLITE = CapacitorSQLite;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Shared SQLite connection manager
|
||||||
|
* Use this instance throughout the application - do not create new SQLiteConnection instances
|
||||||
|
*/
|
||||||
|
export const SQLITE = new SQLiteConnection(CAP_SQLITE);
|
||||||
13
src/services/platforms/types.ts
Normal file
13
src/services/platforms/types.ts
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
/**
|
||||||
|
* Types for platform services
|
||||||
|
*/
|
||||||
|
|
||||||
|
export interface QueuedOperation {
|
||||||
|
type: "run" | "query" | "rawQuery";
|
||||||
|
sql: string;
|
||||||
|
params: unknown[];
|
||||||
|
resolve: (value: unknown) => void;
|
||||||
|
reject: (reason: unknown) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type QueuedOperationType = QueuedOperation["type"];
|
||||||
@@ -1367,9 +1367,6 @@ export const PlatformServiceMixin = {
|
|||||||
contact.profileImageUrl !== undefined
|
contact.profileImageUrl !== undefined
|
||||||
? contact.profileImageUrl
|
? contact.profileImageUrl
|
||||||
: null,
|
: null,
|
||||||
notes: contact.notes !== undefined ? contact.notes : null,
|
|
||||||
iViewContent:
|
|
||||||
contact.iViewContent !== undefined ? contact.iViewContent : null,
|
|
||||||
contactMethods:
|
contactMethods:
|
||||||
contact.contactMethods !== undefined
|
contact.contactMethods !== undefined
|
||||||
? Array.isArray(contact.contactMethods)
|
? Array.isArray(contact.contactMethods)
|
||||||
@@ -1380,8 +1377,8 @@ export const PlatformServiceMixin = {
|
|||||||
|
|
||||||
await this.$dbExec(
|
await this.$dbExec(
|
||||||
`INSERT OR REPLACE INTO contacts
|
`INSERT OR REPLACE INTO contacts
|
||||||
(did, name, publicKeyBase64, seesMe, registered, nextPubKeyHashB64, profileImageUrl, notes, iViewContent, contactMethods)
|
(did, name, publicKeyBase64, seesMe, registered, nextPubKeyHashB64, profileImageUrl, contactMethods)
|
||||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
|
||||||
[
|
[
|
||||||
safeContact.did,
|
safeContact.did,
|
||||||
safeContact.name,
|
safeContact.name,
|
||||||
@@ -1390,8 +1387,6 @@ export const PlatformServiceMixin = {
|
|||||||
safeContact.registered,
|
safeContact.registered,
|
||||||
safeContact.nextPubKeyHashB64,
|
safeContact.nextPubKeyHashB64,
|
||||||
safeContact.profileImageUrl,
|
safeContact.profileImageUrl,
|
||||||
safeContact.notes,
|
|
||||||
safeContact.iViewContent,
|
|
||||||
safeContact.contactMethods,
|
safeContact.contactMethods,
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { NotificationIface } from "@/constants/app";
|
import { NotificationIface } from "@/constants/app";
|
||||||
|
import router from "@/router";
|
||||||
|
|
||||||
const SEED_REMINDER_KEY = "seedPhraseReminderLastShown";
|
const SEED_REMINDER_KEY = "seedPhraseReminderLastShown";
|
||||||
const REMINDER_COOLDOWN_MS = 24 * 60 * 60 * 1000; // 24 hours in milliseconds
|
const REMINDER_COOLDOWN_MS = 24 * 60 * 60 * 1000; // 24 hours in milliseconds
|
||||||
@@ -53,8 +54,8 @@ export function createSeedReminderNotification(): NotificationIface {
|
|||||||
yesText: "Backup Identifier Seed",
|
yesText: "Backup Identifier Seed",
|
||||||
noText: "Remind me Later",
|
noText: "Remind me Later",
|
||||||
onYes: async () => {
|
onYes: async () => {
|
||||||
// Navigate to seed backup page
|
// Navigate to seed backup page using SPA routing
|
||||||
window.location.href = "/seed-backup";
|
await router.push({ path: "/seed-backup" });
|
||||||
},
|
},
|
||||||
onNo: async () => {
|
onNo: async () => {
|
||||||
// Mark as shown so it won't appear again for 24 hours
|
// Mark as shown so it won't appear again for 24 hours
|
||||||
|
|||||||
@@ -375,6 +375,45 @@
|
|||||||
Switch Identifier
|
Switch Identifier
|
||||||
</router-link>
|
</router-link>
|
||||||
|
|
||||||
|
<div id="sectionImportContactsSettings" class="mt-4">
|
||||||
|
<h2 class="text-slate-500 text-sm font-bold">Import Contacts</h2>
|
||||||
|
|
||||||
|
<div class="ml-4 mt-2">
|
||||||
|
<input type="file" class="ml-2" @change="uploadImportFile" />
|
||||||
|
<transition
|
||||||
|
enter-active-class="transform ease-out duration-300 transition"
|
||||||
|
enter-from-class="translate-y-2 opacity-0 sm:translate-y-4"
|
||||||
|
enter-to-class="translate-y-0 opacity-100 sm:translate-y-0"
|
||||||
|
leave-active-class="transition ease-in duration-500"
|
||||||
|
leave-from-class="opacity-100"
|
||||||
|
leave-to-class="opacity-0"
|
||||||
|
>
|
||||||
|
<div v-if="showContactImport()" class="mt-4">
|
||||||
|
<!-- Bulk import has an error
|
||||||
|
<div class="flex justify-center">
|
||||||
|
<button
|
||||||
|
class="block text-center text-md bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-6"
|
||||||
|
@click="confirmSubmitImportFile()"
|
||||||
|
>
|
||||||
|
Overwrite Settings & Contacts
|
||||||
|
<br />
|
||||||
|
(which doesn't include Identifier Data)
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
-->
|
||||||
|
<div class="flex justify-center">
|
||||||
|
<button
|
||||||
|
class="block text-center text-md bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mb-6"
|
||||||
|
@click="checkContactImports()"
|
||||||
|
>
|
||||||
|
Import Contacts
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</transition>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<label
|
<label
|
||||||
for="toggleShowAmounts"
|
for="toggleShowAmounts"
|
||||||
class="flex items-center justify-between cursor-pointer my-4"
|
class="flex items-center justify-between cursor-pointer my-4"
|
||||||
@@ -731,7 +770,9 @@ import "dexie-export-import";
|
|||||||
import { ImportProgress } from "dexie-export-import";
|
import { ImportProgress } from "dexie-export-import";
|
||||||
import { LeafletMouseEvent } from "leaflet";
|
import { LeafletMouseEvent } from "leaflet";
|
||||||
import * as L from "leaflet";
|
import * as L from "leaflet";
|
||||||
|
import * as R from "ramda";
|
||||||
import { IIdentifier } from "@veramo/core";
|
import { IIdentifier } from "@veramo/core";
|
||||||
|
import { ref } from "vue";
|
||||||
import { Component, Vue } from "vue-facing-decorator";
|
import { Component, Vue } from "vue-facing-decorator";
|
||||||
import { RouteLocationNormalizedLoaded, Router } from "vue-router";
|
import { RouteLocationNormalizedLoaded, Router } from "vue-router";
|
||||||
import { copyToClipboard } from "../services/ClipboardService";
|
import { copyToClipboard } from "../services/ClipboardService";
|
||||||
@@ -758,6 +799,7 @@ import {
|
|||||||
NotificationIface,
|
NotificationIface,
|
||||||
PASSKEYS_ENABLED,
|
PASSKEYS_ENABLED,
|
||||||
} from "../constants/app";
|
} from "../constants/app";
|
||||||
|
import { Contact } from "../db/tables/contacts";
|
||||||
import {
|
import {
|
||||||
DEFAULT_PASSKEY_EXPIRATION_MINUTES,
|
DEFAULT_PASSKEY_EXPIRATION_MINUTES,
|
||||||
BoundingBox,
|
BoundingBox,
|
||||||
@@ -781,7 +823,11 @@ import { PlatformServiceMixin } from "../utils/PlatformServiceMixin";
|
|||||||
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
import { createNotifyHelpers, TIMEOUTS } from "@/utils/notify";
|
||||||
import { ACCOUNT_VIEW_CONSTANTS } from "@/constants/accountView";
|
import { ACCOUNT_VIEW_CONSTANTS } from "@/constants/accountView";
|
||||||
import { showSeedPhraseReminder } from "@/utils/seedPhraseReminder";
|
import { showSeedPhraseReminder } from "@/utils/seedPhraseReminder";
|
||||||
import { AccountSettings, isApiError } from "@/interfaces/accountView";
|
import {
|
||||||
|
AccountSettings,
|
||||||
|
isApiError,
|
||||||
|
ImportContent,
|
||||||
|
} from "@/interfaces/accountView";
|
||||||
// Profile data interface (inlined from ProfileService)
|
// Profile data interface (inlined from ProfileService)
|
||||||
interface ProfileData {
|
interface ProfileData {
|
||||||
description: string;
|
description: string;
|
||||||
@@ -790,6 +836,8 @@ interface ProfileData {
|
|||||||
includeLocation: boolean;
|
includeLocation: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const inputImportFileNameRef = ref<Blob>();
|
||||||
|
|
||||||
interface UserNameDialogRef {
|
interface UserNameDialogRef {
|
||||||
open: (cb: (name?: string) => void) => void;
|
open: (cb: (name?: string) => void) => void;
|
||||||
}
|
}
|
||||||
@@ -1321,6 +1369,65 @@ export default class AccountViewView extends Vue {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async uploadImportFile(event: Event): Promise<void> {
|
||||||
|
inputImportFileNameRef.value = (
|
||||||
|
event.target as HTMLInputElement
|
||||||
|
).files?.[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
showContactImport(): boolean {
|
||||||
|
return !!inputImportFileNameRef.value;
|
||||||
|
}
|
||||||
|
|
||||||
|
confirmSubmitImportFile(): void {
|
||||||
|
if (inputImportFileNameRef.value != null) {
|
||||||
|
this.notify.confirm(
|
||||||
|
ACCOUNT_VIEW_CONSTANTS.WARNINGS.IMPORT_REPLACE_WARNING,
|
||||||
|
this.submitImportFile,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Asynchronously imports the database from a downloadable JSON file.
|
||||||
|
*
|
||||||
|
* @throws Will notify the user if there is an export error.
|
||||||
|
*/
|
||||||
|
async submitImportFile(): Promise<void> {
|
||||||
|
if (inputImportFileNameRef.value != null) {
|
||||||
|
// TODO: implement this for SQLite
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async checkContactImports(): Promise<void> {
|
||||||
|
const reader = new FileReader();
|
||||||
|
reader.onload = (event) => {
|
||||||
|
const fileContent: string = (event.target?.result as string) || "{}";
|
||||||
|
try {
|
||||||
|
const contents: ImportContent = JSON.parse(fileContent);
|
||||||
|
const contactTableRows: Array<Contact> = (
|
||||||
|
contents.data?.data as [{ tableName: string; rows: Array<Contact> }]
|
||||||
|
)?.find((table) => table.tableName === "contacts")
|
||||||
|
?.rows as Array<Contact>;
|
||||||
|
const contactRows = contactTableRows.map(
|
||||||
|
// @ts-expect-error for omitting this field that is found in the Dexie format
|
||||||
|
(contact) => R.omit(["$types"], contact) as Contact,
|
||||||
|
);
|
||||||
|
(this.$router as Router).push({
|
||||||
|
name: "contact-import",
|
||||||
|
query: { contacts: JSON.stringify(contactRows) },
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
logger.error("Error checking contact imports:", error);
|
||||||
|
this.notify.error(
|
||||||
|
ACCOUNT_VIEW_CONSTANTS.ERRORS.IMPORT_ERROR,
|
||||||
|
TIMEOUTS.STANDARD,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
reader.readAsText(inputImportFileNameRef.value as Blob);
|
||||||
|
}
|
||||||
|
|
||||||
private progressCallback(progress: ImportProgress): boolean {
|
private progressCallback(progress: ImportProgress): boolean {
|
||||||
logger.log(
|
logger.log(
|
||||||
`Import progress: ${progress.completedRows} of ${progress.totalRows} rows completed.`,
|
`Import progress: ${progress.completedRows} of ${progress.totalRows} rows completed.`,
|
||||||
|
|||||||
@@ -338,10 +338,9 @@ export default class ContactEditView extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Save to database via PlatformServiceMixin
|
// Save to database via PlatformServiceMixin
|
||||||
// Normalize empty strings to null to preserve database consistency
|
|
||||||
await this.$updateContact(this.contact?.did || "", {
|
await this.$updateContact(this.contact?.did || "", {
|
||||||
name: this.contactName?.trim() || null,
|
name: this.contactName,
|
||||||
notes: this.contactNotes?.trim() || null,
|
notes: this.contactNotes,
|
||||||
contactMethods: contactMethods,
|
contactMethods: contactMethods,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -20,12 +20,12 @@
|
|||||||
</button>
|
</button>
|
||||||
|
|
||||||
<!-- Help button -->
|
<!-- Help button -->
|
||||||
<router-link
|
<button
|
||||||
:to="{ name: 'help' }"
|
|
||||||
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
class="block ms-auto text-sm text-center text-white bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] p-1.5 rounded-full"
|
||||||
|
@click="goToHelp()"
|
||||||
>
|
>
|
||||||
<font-awesome icon="question" class="block text-center w-[1em]" />
|
<font-awesome icon="question" class="block text-center w-[1em]" />
|
||||||
</router-link>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Identity Details -->
|
<!-- Identity Details -->
|
||||||
|
|||||||
@@ -157,11 +157,27 @@ export default class DeepLinkRedirectView extends Vue {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
const capabilities = this.platformService.getCapabilities();
|
||||||
|
|
||||||
|
// If we're already in the native app, use router navigation instead
|
||||||
|
// of window.location.href (which doesn't work properly in Capacitor)
|
||||||
|
if (capabilities.isNativeApp) {
|
||||||
|
// Navigate directly using the router
|
||||||
|
const destinationPath = `/${this.destinationUrl}`;
|
||||||
|
this.$router.push(destinationPath).catch((error) => {
|
||||||
|
logger.error("Router navigation failed: " + errorStringForLog(error));
|
||||||
|
this.pageError =
|
||||||
|
"Unable to navigate to the destination. Please use a manual option below.";
|
||||||
|
});
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// For web contexts, use window.location.href to redirect to app
|
||||||
// For mobile, try the deep link URL; for desktop, use the web URL
|
// For mobile, try the deep link URL; for desktop, use the web URL
|
||||||
const redirectUrl = this.isMobile ? this.deepLinkUrl : this.webUrl;
|
const redirectUrl = this.isMobile ? this.deepLinkUrl : this.webUrl;
|
||||||
|
|
||||||
// Method 1: Try window.location.href (works on most browsers)
|
// Method 1: Try window.location.href (works on most browsers)
|
||||||
window.location.href = redirectUrl;
|
window.location.href = redirectUrl; // Do not use this on native apps! The channel to Capacitor gets messed up.
|
||||||
|
|
||||||
// Method 2: Fallback - create and click a link element
|
// Method 2: Fallback - create and click a link element
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
|
|||||||
@@ -898,13 +898,7 @@ export default class HomeView extends Vue {
|
|||||||
this.starredPlanHandleIds,
|
this.starredPlanHandleIds,
|
||||||
this.lastAckedStarredPlanChangesJwtId,
|
this.lastAckedStarredPlanChangesJwtId,
|
||||||
);
|
);
|
||||||
// filter out any data elements where there is no wrappedClaimBefore
|
this.numNewStarredProjectChanges = starredProjectChanges.data.length;
|
||||||
const filteredNewStarredProjectChanges =
|
|
||||||
starredProjectChanges.data.filter(
|
|
||||||
(change) => change.wrappedClaimBefore !== undefined,
|
|
||||||
);
|
|
||||||
this.numNewStarredProjectChanges =
|
|
||||||
filteredNewStarredProjectChanges.length;
|
|
||||||
this.newStarredProjectChangesHitLimit = starredProjectChanges.hitLimit;
|
this.newStarredProjectChangesHitLimit = starredProjectChanges.hitLimit;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
// Don't show errors for starred project changes as it's a secondary feature
|
// Don't show errors for starred project changes as it's a secondary feature
|
||||||
|
|||||||
@@ -284,10 +284,7 @@
|
|||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div v-else>
|
<div v-else>The changes did not affect essential project data.</div>
|
||||||
The changes are not important, like it was saved by accident or
|
|
||||||
you've seen it all before.
|
|
||||||
</div>
|
|
||||||
<!-- New line that appears on hover -->
|
<!-- New line that appears on hover -->
|
||||||
<div
|
<div
|
||||||
class="absolute left-0 w-full text-left text-gray-500 text-sm hidden group-hover:flex cursor-pointer items-center"
|
class="absolute left-0 w-full text-left text-gray-500 text-sm hidden group-hover:flex cursor-pointer items-center"
|
||||||
@@ -592,13 +589,13 @@ export default class NewActivityView extends Vue {
|
|||||||
|
|
||||||
for (const planChange of planChanges) {
|
for (const planChange of planChanges) {
|
||||||
const currentPlan: PlanSummaryRecord = planChange.plan;
|
const currentPlan: PlanSummaryRecord = planChange.plan;
|
||||||
const wrappedClaim: GenericCredWrapper<PlanActionClaim> | undefined =
|
const wrappedClaim: GenericCredWrapper<PlanActionClaim> =
|
||||||
planChange.wrappedClaimBefore;
|
planChange.wrappedClaimBefore;
|
||||||
|
|
||||||
// Extract the actual claim from the wrapped claim
|
// Extract the actual claim from the wrapped claim
|
||||||
let previousClaim: PlanActionClaim | undefined;
|
let previousClaim: PlanActionClaim;
|
||||||
|
|
||||||
const embeddedClaim: PlanActionClaim | undefined = wrappedClaim?.claim;
|
const embeddedClaim: PlanActionClaim = wrappedClaim.claim;
|
||||||
if (
|
if (
|
||||||
embeddedClaim &&
|
embeddedClaim &&
|
||||||
typeof embeddedClaim === "object" &&
|
typeof embeddedClaim === "object" &&
|
||||||
@@ -612,9 +609,7 @@ export default class NewActivityView extends Vue {
|
|||||||
previousClaim = embeddedClaim;
|
previousClaim = embeddedClaim;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!previousClaim) {
|
if (!previousClaim || !currentPlan.handleId) {
|
||||||
// Can happen when a project is starred after the stored last-seen-change-jwt ID
|
|
||||||
// so we'll just leave the message saying there are no important differences.
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -60,60 +60,12 @@
|
|||||||
</div>
|
</div>
|
||||||
<ImageMethodDialog ref="imageDialog" default-camera-mode="environment" />
|
<ImageMethodDialog ref="imageDialog" default-camera-mode="environment" />
|
||||||
|
|
||||||
<!-- Authorized Representative Selection -->
|
<input
|
||||||
<div class="w-full flex items-stretch my-4">
|
v-model="agentDid"
|
||||||
<div
|
type="text"
|
||||||
class="flex items-center gap-2 grow border border-slate-400 border-r-0 last:border-r px-3 py-2 rounded-l last:rounded overflow-hidden cursor-pointer hover:bg-slate-100"
|
placeholder="Other Authorized Representative"
|
||||||
@click="openRepresentativeDialog"
|
class="mt-4 block w-full rounded border border-slate-400 px-3 py-2"
|
||||||
>
|
|
||||||
<div>
|
|
||||||
<EntityIcon
|
|
||||||
v-if="selectedRepresentative"
|
|
||||||
:contact="selectedRepresentative"
|
|
||||||
class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
|
|
||||||
/>
|
|
||||||
<font-awesome v-else icon="user" class="text-slate-400" />
|
|
||||||
</div>
|
|
||||||
<div class="overflow-hidden">
|
|
||||||
<div
|
|
||||||
:class="{
|
|
||||||
'text-sm font-semibold': selectedRepresentative,
|
|
||||||
'text-slate-400': !selectedRepresentative,
|
|
||||||
}"
|
|
||||||
class="truncate"
|
|
||||||
>
|
|
||||||
{{
|
|
||||||
selectedRepresentative
|
|
||||||
? selectedRepresentative.name || AppString.NO_CONTACT_NAME
|
|
||||||
: "Assign Authorized Representative…"
|
|
||||||
}}
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
v-if="selectedRepresentative"
|
|
||||||
class="text-xs text-slate-500 truncate"
|
|
||||||
>
|
|
||||||
{{ agentDid }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
v-if="selectedRepresentative"
|
|
||||||
class="text-rose-600 px-3 py-2 border border-slate-400 border-l-0 rounded-r hover:bg-rose-600 hover:text-white hover:border-rose-600"
|
|
||||||
@click="unsetRepresentative"
|
|
||||||
>
|
|
||||||
<font-awesome icon="trash-can" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<ProjectRepresentativeDialog
|
|
||||||
ref="representativeDialog"
|
|
||||||
:all-contacts="allContacts"
|
|
||||||
:active-did="activeDid"
|
|
||||||
:all-my-dids="allMyDids"
|
|
||||||
:notify="$notify"
|
|
||||||
@assign="handleRepresentativeAssigned"
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<div class="mb-4">
|
<div class="mb-4">
|
||||||
<p v-if="shouldShowOwnershipWarning">
|
<p v-if="shouldShowOwnershipWarning">
|
||||||
<span class="text-red-500">Beware!</span>
|
<span class="text-red-500">Beware!</span>
|
||||||
@@ -280,12 +232,9 @@ import { LMap, LMarker, LTileLayer } from "@vue-leaflet/vue-leaflet";
|
|||||||
import { RouteLocationNormalizedLoaded, Router } from "vue-router";
|
import { RouteLocationNormalizedLoaded, Router } from "vue-router";
|
||||||
import { LeafletMouseEvent } from "leaflet";
|
import { LeafletMouseEvent } from "leaflet";
|
||||||
|
|
||||||
import EntityIcon from "../components/EntityIcon.vue";
|
|
||||||
import ImageMethodDialog from "../components/ImageMethodDialog.vue";
|
import ImageMethodDialog from "../components/ImageMethodDialog.vue";
|
||||||
import ProjectRepresentativeDialog from "../components/ProjectRepresentativeDialog.vue";
|
|
||||||
import QuickNav from "../components/QuickNav.vue";
|
import QuickNav from "../components/QuickNav.vue";
|
||||||
import {
|
import {
|
||||||
AppString,
|
|
||||||
DEFAULT_IMAGE_API_SERVER,
|
DEFAULT_IMAGE_API_SERVER,
|
||||||
DEFAULT_PARTNER_API_SERVER,
|
DEFAULT_PARTNER_API_SERVER,
|
||||||
NotificationIface,
|
NotificationIface,
|
||||||
@@ -319,7 +268,6 @@ import {
|
|||||||
retrieveAccountCount,
|
retrieveAccountCount,
|
||||||
retrieveFullyDecryptedAccount,
|
retrieveFullyDecryptedAccount,
|
||||||
} from "../libs/util";
|
} from "../libs/util";
|
||||||
import { Contact } from "../db/tables/contacts";
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
EventTemplate,
|
EventTemplate,
|
||||||
@@ -375,15 +323,7 @@ import { logger } from "../utils/logger";
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
components: {
|
components: { ImageMethodDialog, LMap, LMarker, LTileLayer, QuickNav },
|
||||||
EntityIcon,
|
|
||||||
ImageMethodDialog,
|
|
||||||
ProjectRepresentativeDialog,
|
|
||||||
LMap,
|
|
||||||
LMarker,
|
|
||||||
LTileLayer,
|
|
||||||
QuickNav,
|
|
||||||
},
|
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
})
|
})
|
||||||
export default class NewEditProjectView extends Vue {
|
export default class NewEditProjectView extends Vue {
|
||||||
@@ -394,9 +334,6 @@ export default class NewEditProjectView extends Vue {
|
|||||||
// Notification helpers
|
// Notification helpers
|
||||||
private notify!: ReturnType<typeof createNotifyHelpers>;
|
private notify!: ReturnType<typeof createNotifyHelpers>;
|
||||||
|
|
||||||
// Constants
|
|
||||||
AppString = AppString;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Display error notification to user
|
* Display error notification to user
|
||||||
* Provides consistent error messaging with 5-second timeout
|
* Provides consistent error messaging with 5-second timeout
|
||||||
@@ -409,8 +346,6 @@ export default class NewEditProjectView extends Vue {
|
|||||||
// Component state properties
|
// Component state properties
|
||||||
activeDid = "";
|
activeDid = "";
|
||||||
agentDid = "";
|
agentDid = "";
|
||||||
allContacts: Array<Contact> = [];
|
|
||||||
allMyDids: string[] = [];
|
|
||||||
apiServer = "";
|
apiServer = "";
|
||||||
endDateInput?: string;
|
endDateInput?: string;
|
||||||
endTimeInput?: string;
|
endTimeInput?: string;
|
||||||
@@ -457,24 +392,16 @@ export default class NewEditProjectView extends Vue {
|
|||||||
const activeIdentity = await (this as any).$getActiveIdentity();
|
const activeIdentity = await (this as any).$getActiveIdentity();
|
||||||
this.activeDid = activeIdentity.activeDid || "";
|
this.activeDid = activeIdentity.activeDid || "";
|
||||||
|
|
||||||
// Get all user's DIDs
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
this.allMyDids = await (this as any).$getAllAccountDids();
|
|
||||||
|
|
||||||
// Load contacts sorted by date added (newest first) for consistent "Recently Added" display
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
this.allContacts = await (this as any).$contactsByDateAdded();
|
|
||||||
|
|
||||||
this.apiServer = settings.apiServer || "";
|
this.apiServer = settings.apiServer || "";
|
||||||
this.showGeneralAdvanced = !!settings.showGeneralAdvanced;
|
this.showGeneralAdvanced = !!settings.showGeneralAdvanced;
|
||||||
|
|
||||||
this.projectId = (this.$route.query["projectId"] as string) || "";
|
this.projectId = (this.$route.query["projectId"] as string) || "";
|
||||||
|
|
||||||
if (this.isSavedProject()) {
|
if (this.projectId) {
|
||||||
if (this.numAccounts === 0) {
|
if (this.numAccounts === 0) {
|
||||||
this.notify.error(NOTIFY_PROJECT_ACCOUNT_LOADING_ERROR.message);
|
this.notify.error(NOTIFY_PROJECT_ACCOUNT_LOADING_ERROR.message);
|
||||||
} else {
|
} else {
|
||||||
this.loadProject(this.activeDid, this.projectId);
|
this.loadProject(this.activeDid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -484,9 +411,11 @@ export default class NewEditProjectView extends Vue {
|
|||||||
* Retrieves project information from the API and populates form fields
|
* Retrieves project information from the API and populates form fields
|
||||||
* @param userDid - User's decentralized identifier
|
* @param userDid - User's decentralized identifier
|
||||||
*/
|
*/
|
||||||
async loadProject(userDid: string, projectId: string) {
|
async loadProject(userDid: string) {
|
||||||
const url =
|
const url =
|
||||||
this.apiServer + "/api/claim/byHandle/" + encodeURIComponent(projectId);
|
this.apiServer +
|
||||||
|
"/api/claim/byHandle/" +
|
||||||
|
encodeURIComponent(this.projectId);
|
||||||
const headers = await getHeaders(userDid);
|
const headers = await getHeaders(userDid);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -503,12 +432,6 @@ export default class NewEditProjectView extends Vue {
|
|||||||
}
|
}
|
||||||
if (this.fullClaim?.agent?.identifier) {
|
if (this.fullClaim?.agent?.identifier) {
|
||||||
this.agentDid = this.fullClaim.agent.identifier;
|
this.agentDid = this.fullClaim.agent.identifier;
|
||||||
if (this.activeDid !== this.projectIssuerDid) {
|
|
||||||
this.agentDid = this.projectIssuerDid;
|
|
||||||
this.notify.warning(
|
|
||||||
"You were previously the agent, so the agent has been set to the previous owner. You can change it.",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if (this.fullClaim.startTime) {
|
if (this.fullClaim.startTime) {
|
||||||
const localDateTime = DateTime.fromISO(
|
const localDateTime = DateTime.fromISO(
|
||||||
@@ -613,7 +536,7 @@ export default class NewEditProjectView extends Vue {
|
|||||||
private async saveProject() {
|
private async saveProject() {
|
||||||
// Make a claim
|
// Make a claim
|
||||||
const vcClaim: PlanActionClaim = this.fullClaim;
|
const vcClaim: PlanActionClaim = this.fullClaim;
|
||||||
if (this.isSavedProject()) {
|
if (this.projectId) {
|
||||||
vcClaim.lastClaimId = this.lastClaimJwtId;
|
vcClaim.lastClaimId = this.lastClaimJwtId;
|
||||||
}
|
}
|
||||||
if (this.agentDid) {
|
if (this.agentDid) {
|
||||||
@@ -947,10 +870,6 @@ export default class NewEditProjectView extends Vue {
|
|||||||
this.longitude = event.latlng.lng;
|
this.longitude = event.latlng.lng;
|
||||||
}
|
}
|
||||||
|
|
||||||
private isSavedProject(): boolean {
|
|
||||||
return !!this.projectId;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computed property for character count display
|
* Computed property for character count display
|
||||||
* Shows current description length and maximum character limit
|
* Shows current description length and maximum character limit
|
||||||
@@ -966,7 +885,6 @@ export default class NewEditProjectView extends Vue {
|
|||||||
*/
|
*/
|
||||||
get shouldShowOwnershipWarning(): boolean {
|
get shouldShowOwnershipWarning(): boolean {
|
||||||
return (
|
return (
|
||||||
this.isSavedProject() &&
|
|
||||||
this.activeDid !== this.projectIssuerDid &&
|
this.activeDid !== this.projectIssuerDid &&
|
||||||
this.agentDid !== this.projectIssuerDid
|
this.agentDid !== this.projectIssuerDid
|
||||||
);
|
);
|
||||||
@@ -1043,37 +961,5 @@ export default class NewEditProjectView extends Vue {
|
|||||||
get shouldShowSpinner(): boolean {
|
get shouldShowSpinner(): boolean {
|
||||||
return !this.isHiddenSpinner;
|
return !this.isHiddenSpinner;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Computed property for selected representative contact
|
|
||||||
* Derives the contact from agentDid by finding it in allContacts
|
|
||||||
*/
|
|
||||||
get selectedRepresentative(): Contact | null {
|
|
||||||
if (!this.agentDid) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return this.allContacts.find((c) => c.did === this.agentDid) || null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open the representative selection dialog
|
|
||||||
*/
|
|
||||||
openRepresentativeDialog(): void {
|
|
||||||
(this.$refs.representativeDialog as ProjectRepresentativeDialog).open();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle representative assignment from dialog
|
|
||||||
*/
|
|
||||||
handleRepresentativeAssigned(contact: Contact): void {
|
|
||||||
this.agentDid = contact.did;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Unset the representative and revert to initial state
|
|
||||||
*/
|
|
||||||
unsetRepresentative(): void {
|
|
||||||
this.agentDid = "";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -186,59 +186,16 @@
|
|||||||
<div>
|
<div>
|
||||||
<label
|
<label
|
||||||
for="projectLink"
|
for="projectLink"
|
||||||
class="block text-sm font-medium text-gray-700 mb-1"
|
class="block text-sm font-medium text-gray-700"
|
||||||
>Project Link</label
|
>Project Link</label
|
||||||
>
|
>
|
||||||
<div class="w-full flex items-stretch">
|
<input
|
||||||
<div
|
id="projectLink"
|
||||||
class="flex items-center gap-2 grow border border-slate-400 border-r-0 last:border-r px-3 py-2 rounded-l last:rounded overflow-hidden cursor-pointer hover:bg-slate-100"
|
v-model="newOrUpdatedMeetingInputs.projectLink"
|
||||||
@click="openProjectLinkDialog"
|
type="text"
|
||||||
>
|
class="mt-1 block w-full rounded-md border border-gray-300 px-3 py-2 shadow-sm focus:border-blue-500 focus:outline-none"
|
||||||
<div>
|
placeholder="Project ID"
|
||||||
<ProjectIcon
|
/>
|
||||||
v-if="selectedProject"
|
|
||||||
:entity-id="selectedProject.handleId"
|
|
||||||
:icon-size="30"
|
|
||||||
:image-url="selectedProject.image"
|
|
||||||
class="!size-[2rem] shrink-0 border border-slate-300 bg-white overflow-hidden rounded-full"
|
|
||||||
/>
|
|
||||||
<font-awesome
|
|
||||||
v-else
|
|
||||||
icon="folder-open"
|
|
||||||
class="text-slate-400"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="overflow-hidden">
|
|
||||||
<div
|
|
||||||
:class="{
|
|
||||||
'text-sm font-semibold': selectedProject,
|
|
||||||
'text-slate-400': !selectedProject,
|
|
||||||
}"
|
|
||||||
class="truncate"
|
|
||||||
>
|
|
||||||
{{
|
|
||||||
selectedProject
|
|
||||||
? selectedProject.name || "Unnamed Project"
|
|
||||||
: "Select Project…"
|
|
||||||
}}
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
v-if="selectedProject"
|
|
||||||
class="text-xs text-slate-500 truncate"
|
|
||||||
>
|
|
||||||
<font-awesome icon="user" class="text-slate-400" />
|
|
||||||
{{ selectedProjectIssuerName }}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<button
|
|
||||||
v-if="selectedProject"
|
|
||||||
class="text-rose-600 px-3 py-2 border border-slate-400 border-l-0 rounded-r hover:bg-rose-600 hover:text-white hover:border-rose-600"
|
|
||||||
@click="unsetProjectLink"
|
|
||||||
>
|
|
||||||
<font-awesome icon="trash-can" />
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
@@ -267,17 +224,6 @@
|
|||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<MeetingProjectDialog
|
|
||||||
ref="meetingProjectDialog"
|
|
||||||
:active-did="activeDid"
|
|
||||||
:all-my-dids="allMyDids"
|
|
||||||
:all-contacts="allContacts"
|
|
||||||
:notify="$notify"
|
|
||||||
@assign="handleProjectLinkAssigned"
|
|
||||||
@open="handleDialogOpen"
|
|
||||||
@close="handleDialogClose"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<!-- Members Section -->
|
<!-- Members Section -->
|
||||||
<div
|
<div
|
||||||
v-if="!isLoading && currentMeeting != null && !!currentMeeting.password"
|
v-if="!isLoading && currentMeeting != null && !!currentMeeting.password"
|
||||||
@@ -308,7 +254,6 @@
|
|||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<MembersList
|
<MembersList
|
||||||
ref="membersList"
|
|
||||||
:password="currentMeeting.password || ''"
|
:password="currentMeeting.password || ''"
|
||||||
:show-organizer-tools="true"
|
:show-organizer-tools="true"
|
||||||
class="mt-4"
|
class="mt-4"
|
||||||
@@ -347,13 +292,10 @@ import { RouteLocationNormalizedLoaded, Router } from "vue-router";
|
|||||||
import QuickNav from "../components/QuickNav.vue";
|
import QuickNav from "../components/QuickNav.vue";
|
||||||
import TopMessage from "../components/TopMessage.vue";
|
import TopMessage from "../components/TopMessage.vue";
|
||||||
import MembersList from "../components/MembersList.vue";
|
import MembersList from "../components/MembersList.vue";
|
||||||
import MeetingProjectDialog from "../components/MeetingProjectDialog.vue";
|
|
||||||
import ProjectIcon from "../components/ProjectIcon.vue";
|
|
||||||
import {
|
import {
|
||||||
errorStringForLog,
|
errorStringForLog,
|
||||||
getHeaders,
|
getHeaders,
|
||||||
serverMessageForUser,
|
serverMessageForUser,
|
||||||
didInfo,
|
|
||||||
} from "../libs/endorserServer";
|
} from "../libs/endorserServer";
|
||||||
import { encryptMessage } from "../libs/crypto";
|
import { encryptMessage } from "../libs/crypto";
|
||||||
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
import { PlatformServiceMixin } from "@/utils/PlatformServiceMixin";
|
||||||
@@ -367,8 +309,6 @@ import {
|
|||||||
NOTIFY_MEETING_DELETED,
|
NOTIFY_MEETING_DELETED,
|
||||||
NOTIFY_MEETING_LINK_COPIED,
|
NOTIFY_MEETING_LINK_COPIED,
|
||||||
} from "@/constants/notifications";
|
} from "@/constants/notifications";
|
||||||
import { PlanData } from "../interfaces/records";
|
|
||||||
import { Contact } from "../db/tables/contacts";
|
|
||||||
interface ServerMeeting {
|
interface ServerMeeting {
|
||||||
groupId: number; // from the server
|
groupId: number; // from the server
|
||||||
name: string; // to & from the server
|
name: string; // to & from the server
|
||||||
@@ -391,8 +331,6 @@ interface MeetingSetupInputs {
|
|||||||
QuickNav,
|
QuickNav,
|
||||||
TopMessage,
|
TopMessage,
|
||||||
MembersList,
|
MembersList,
|
||||||
MeetingProjectDialog,
|
|
||||||
ProjectIcon,
|
|
||||||
},
|
},
|
||||||
mixins: [PlatformServiceMixin],
|
mixins: [PlatformServiceMixin],
|
||||||
})
|
})
|
||||||
@@ -416,9 +354,6 @@ export default class OnboardMeetingView extends Vue {
|
|||||||
isRegistered = false;
|
isRegistered = false;
|
||||||
showDeleteConfirm = false;
|
showDeleteConfirm = false;
|
||||||
fullName = "";
|
fullName = "";
|
||||||
allContacts: Contact[] = [];
|
|
||||||
allMyDids: string[] = [];
|
|
||||||
selectedProjectData: PlanData | null = null;
|
|
||||||
get minDateTime() {
|
get minDateTime() {
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
now.setMinutes(now.getMinutes() + 5); // Set minimum 5 minutes in the future
|
now.setMinutes(now.getMinutes() + 5); // Set minimum 5 minutes in the future
|
||||||
@@ -435,17 +370,7 @@ export default class OnboardMeetingView extends Vue {
|
|||||||
this.fullName = settings?.firstName || "";
|
this.fullName = settings?.firstName || "";
|
||||||
this.isRegistered = !!settings?.isRegistered;
|
this.isRegistered = !!settings?.isRegistered;
|
||||||
|
|
||||||
// Load contacts and DIDs for dialog
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
this.allContacts = await (this as any).$contactsByDateAdded();
|
|
||||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
||||||
this.allMyDids = await (this as any).$getAllAccountDids();
|
|
||||||
|
|
||||||
await this.fetchCurrentMeeting();
|
await this.fetchCurrentMeeting();
|
||||||
|
|
||||||
// Ensure selected project is loaded if projectLink exists
|
|
||||||
await this.ensureSelectedProjectLoaded();
|
|
||||||
|
|
||||||
this.isLoading = false;
|
this.isLoading = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -517,54 +442,6 @@ export default class OnboardMeetingView extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Ensure the selected project is loaded if projectLink exists
|
|
||||||
*/
|
|
||||||
async ensureSelectedProjectLoaded(): Promise<void> {
|
|
||||||
const projectLink =
|
|
||||||
this.currentMeeting?.projectLink ||
|
|
||||||
this.newOrUpdatedMeetingInputs?.projectLink;
|
|
||||||
|
|
||||||
if (!projectLink) {
|
|
||||||
this.selectedProjectData = null;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.fetchProjectByHandleId(projectLink);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fetch a single project by handleId
|
|
||||||
* @param handleId - The project handleId to fetch
|
|
||||||
*/
|
|
||||||
async fetchProjectByHandleId(handleId: string): Promise<void> {
|
|
||||||
try {
|
|
||||||
const headers = await getHeaders(this.activeDid);
|
|
||||||
const url = `${this.apiServer}/api/v2/report/plans?handleId=${encodeURIComponent(handleId)}`;
|
|
||||||
const resp = await this.axios.get(url, { headers });
|
|
||||||
|
|
||||||
if (resp.status === 200 && resp.data.data && resp.data.data.length > 0) {
|
|
||||||
const project = resp.data.data[0];
|
|
||||||
this.selectedProjectData = {
|
|
||||||
name: project.name,
|
|
||||||
description: project.description,
|
|
||||||
image: project.image,
|
|
||||||
handleId: project.handleId,
|
|
||||||
issuerDid: project.issuerDid,
|
|
||||||
rowId: project.rowId,
|
|
||||||
};
|
|
||||||
} else {
|
|
||||||
this.selectedProjectData = null;
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
this.$logAndConsole(
|
|
||||||
"Error fetching project by handleId: " + errorStringForLog(error),
|
|
||||||
true,
|
|
||||||
);
|
|
||||||
this.selectedProjectData = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async createMeeting() {
|
async createMeeting() {
|
||||||
this.isLoading = true;
|
this.isLoading = true;
|
||||||
|
|
||||||
@@ -699,7 +576,7 @@ export default class OnboardMeetingView extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async startEditing() {
|
startEditing() {
|
||||||
// Populate form with existing meeting data
|
// Populate form with existing meeting data
|
||||||
if (this.currentMeeting) {
|
if (this.currentMeeting) {
|
||||||
const localExpiresAt = new Date(this.currentMeeting.expiresAt);
|
const localExpiresAt = new Date(this.currentMeeting.expiresAt);
|
||||||
@@ -710,10 +587,6 @@ export default class OnboardMeetingView extends Vue {
|
|||||||
password: this.currentMeeting.password || "",
|
password: this.currentMeeting.password || "",
|
||||||
projectLink: this.currentMeeting.projectLink || "",
|
projectLink: this.currentMeeting.projectLink || "",
|
||||||
};
|
};
|
||||||
// Ensure selected project is loaded if projectLink exists
|
|
||||||
if (this.currentMeeting.projectLink) {
|
|
||||||
await this.ensureSelectedProjectLoaded();
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
this.$logError(
|
this.$logError(
|
||||||
"There is no current meeting to edit. We should never get here.",
|
"There is no current meeting to edit. We should never get here.",
|
||||||
@@ -721,15 +594,9 @@ export default class OnboardMeetingView extends Vue {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async cancelEditing() {
|
cancelEditing() {
|
||||||
// Reset form data
|
// Reset form data
|
||||||
this.newOrUpdatedMeetingInputs = null;
|
this.newOrUpdatedMeetingInputs = null;
|
||||||
// Restore selected project from currentMeeting if it exists
|
|
||||||
if (this.currentMeeting?.projectLink) {
|
|
||||||
await this.ensureSelectedProjectLoaded();
|
|
||||||
} else {
|
|
||||||
this.selectedProjectData = null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async updateMeeting() {
|
async updateMeeting() {
|
||||||
@@ -843,78 +710,5 @@ export default class OnboardMeetingView extends Vue {
|
|||||||
this.notify.error("Failed to copy meeting link to clipboard.");
|
this.notify.error("Failed to copy meeting link to clipboard.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Computed property for selected project
|
|
||||||
* Returns the separately stored selected project data
|
|
||||||
*/
|
|
||||||
get selectedProject(): PlanData | null {
|
|
||||||
return this.selectedProjectData;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Computed property for selected project issuer display name
|
|
||||||
* Uses didInfo to format the issuer name similar to ProjectCard
|
|
||||||
*/
|
|
||||||
get selectedProjectIssuerName(): string {
|
|
||||||
if (!this.selectedProject) {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
return didInfo(
|
|
||||||
this.selectedProject.issuerDid,
|
|
||||||
this.activeDid,
|
|
||||||
this.allMyDids,
|
|
||||||
this.allContacts,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open the project link selection dialog
|
|
||||||
*/
|
|
||||||
openProjectLinkDialog(): void {
|
|
||||||
(this.$refs.meetingProjectDialog as MeetingProjectDialog).open();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle project assignment from dialog
|
|
||||||
*/
|
|
||||||
handleProjectLinkAssigned(project: PlanData): void {
|
|
||||||
// Store the selected project directly
|
|
||||||
this.selectedProjectData = project;
|
|
||||||
|
|
||||||
if (this.newOrUpdatedMeetingInputs) {
|
|
||||||
this.newOrUpdatedMeetingInputs.projectLink = project.handleId;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Unset the project link and revert to initial state
|
|
||||||
*/
|
|
||||||
unsetProjectLink(): void {
|
|
||||||
this.selectedProjectData = null;
|
|
||||||
if (this.newOrUpdatedMeetingInputs) {
|
|
||||||
this.newOrUpdatedMeetingInputs.projectLink = "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle dialog open event - stop auto-refresh in MembersList
|
|
||||||
*/
|
|
||||||
handleDialogOpen(): void {
|
|
||||||
const membersList = this.$refs.membersList as MembersList;
|
|
||||||
if (membersList) {
|
|
||||||
membersList.stopAutoRefresh();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handle dialog close event - start auto-refresh in MembersList
|
|
||||||
*/
|
|
||||||
handleDialogClose(): void {
|
|
||||||
const membersList = this.$refs.membersList as MembersList;
|
|
||||||
if (membersList) {
|
|
||||||
membersList.startAutoRefresh();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -57,9 +57,6 @@
|
|||||||
<button :class="sqlLinkClasses" @click="setAccountsQuery">
|
<button :class="sqlLinkClasses" @click="setAccountsQuery">
|
||||||
Accounts
|
Accounts
|
||||||
</button>
|
</button>
|
||||||
<button :class="sqlLinkClasses" @click="setActiveIdentityQuery">
|
|
||||||
Active DID
|
|
||||||
</button>
|
|
||||||
<button :class="sqlLinkClasses" @click="setContactsQuery">
|
<button :class="sqlLinkClasses" @click="setContactsQuery">
|
||||||
Contacts
|
Contacts
|
||||||
</button>
|
</button>
|
||||||
@@ -528,11 +525,6 @@ export default class Help extends Vue {
|
|||||||
this.executeSql();
|
this.executeSql();
|
||||||
}
|
}
|
||||||
|
|
||||||
setActiveIdentityQuery() {
|
|
||||||
this.sqlQuery = "SELECT * FROM active_identity;";
|
|
||||||
this.executeSql();
|
|
||||||
}
|
|
||||||
|
|
||||||
setContactsQuery() {
|
setContactsQuery() {
|
||||||
this.sqlQuery = "SELECT * FROM contacts;";
|
this.sqlQuery = "SELECT * FROM contacts;";
|
||||||
this.executeSql();
|
this.executeSql();
|
||||||
|
|||||||
Reference in New Issue
Block a user