forked from trent_larson/crowd-funder-for-time-pwa
fix: remaining starred-project issues, plus better Error logging and user verbiage
This commit is contained in:
@@ -18,7 +18,7 @@ messages * - Conditional UI based on platform capabilities * * @component *
|
||||
>
|
||||
<!-- Notification dot - show while the user has not yet backed up their seed phrase -->
|
||||
<font-awesome
|
||||
v-if="!hasBackedUpSeed"
|
||||
v-if="showRedNotificationDot"
|
||||
icon="circle"
|
||||
class="absolute -right-[8px] -top-[8px] text-rose-500 text-[14px] border border-white rounded-full"
|
||||
></font-awesome>
|
||||
@@ -108,7 +108,7 @@ export default class DataExportSection extends Vue {
|
||||
* Flag indicating if the user has backed up their seed phrase
|
||||
* Used to control the visibility of the notification dot
|
||||
*/
|
||||
hasBackedUpSeed = false;
|
||||
showRedNotificationDot = false;
|
||||
|
||||
/**
|
||||
* Notification helper for consistent notification patterns
|
||||
@@ -240,11 +240,12 @@ export default class DataExportSection extends Vue {
|
||||
private async loadSeedBackupStatus(): Promise<void> {
|
||||
try {
|
||||
const settings = await this.$accountSettings();
|
||||
this.hasBackedUpSeed = !!settings.hasBackedUpSeed;
|
||||
this.showRedNotificationDot =
|
||||
!!settings.isRegistered && !settings.hasBackedUpSeed;
|
||||
} catch (err: unknown) {
|
||||
logger.error("Failed to load seed backup status:", err);
|
||||
// Default to false (show notification dot) if we can't load the setting
|
||||
this.hasBackedUpSeed = false;
|
||||
this.showRedNotificationDot = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ import { logger } from "../utils/logger";
|
||||
})
|
||||
export default class TopMessage extends Vue {
|
||||
// Enhanced PlatformServiceMixin v4.0 provides:
|
||||
// - Cached database operations: this.$contacts(), this.$settings(), this.$accountSettings()
|
||||
// - Cached database operations: this.$contacts(), this.$accountSettings()
|
||||
// - Settings shortcuts: this.$saveSettings()
|
||||
// - Cache management: this.$refreshSettings(), this.$clearAllCaches()
|
||||
// - Ultra-concise database methods: this.$db(), this.$exec(), this.$query()
|
||||
|
||||
@@ -86,7 +86,7 @@ export const ACCOUNT_VIEW_CONSTANTS = {
|
||||
CANNOT_UPLOAD_IMAGES: "You cannot upload images.",
|
||||
BAD_SERVER_RESPONSE: "Bad server response.",
|
||||
ERROR_RETRIEVING_LIMITS:
|
||||
"No limits were found, so no actions are allowed. You will need to get registered.",
|
||||
"No limits were found, so no actions are allowed. You need to get registered.",
|
||||
},
|
||||
|
||||
// Project assignment errors
|
||||
|
||||
@@ -9,34 +9,6 @@ import { logger } from "@/utils/logger";
|
||||
import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
|
||||
import { QueryExecResult } from "@/interfaces/database";
|
||||
|
||||
export async function updateDefaultSettings(
|
||||
settingsChanges: Settings,
|
||||
): Promise<boolean> {
|
||||
delete settingsChanges.accountDid; // just in case
|
||||
// ensure there is no "id" that would override the key
|
||||
delete settingsChanges.id;
|
||||
try {
|
||||
const platformService = PlatformServiceFactory.getInstance();
|
||||
const { sql, params } = generateUpdateStatement(
|
||||
settingsChanges,
|
||||
"settings",
|
||||
"id = ?",
|
||||
[MASTER_SETTINGS_KEY],
|
||||
);
|
||||
const result = await platformService.dbExec(sql, params);
|
||||
return result.changes === 1;
|
||||
} catch (error) {
|
||||
logger.error("Error updating default settings:", error);
|
||||
if (error instanceof Error) {
|
||||
throw error; // Re-throw if it's already an Error with a message
|
||||
} else {
|
||||
throw new Error(
|
||||
`Failed to update settings. We recommend you try again or restart the app.`,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export async function insertDidSpecificSettings(
|
||||
did: string,
|
||||
settings: Partial<Settings> = {},
|
||||
@@ -91,6 +63,7 @@ export async function updateDidSpecificSettings(
|
||||
? mapColumnsToValues(postUpdateResult.columns, postUpdateResult.values)[0]
|
||||
: null;
|
||||
|
||||
// Note that we want to eliminate this check (and fix the above if it doesn't work).
|
||||
// Check if any of the target fields were actually changed
|
||||
let actuallyUpdated = false;
|
||||
if (currentRecord && updatedRecord) {
|
||||
|
||||
@@ -809,6 +809,8 @@ export async function getStarredProjectsWithChanges(
|
||||
}
|
||||
|
||||
if (!afterId) {
|
||||
// This doesn't make sense: there should always be some previous one they've seen.
|
||||
// We'll just return blank.
|
||||
return { data: [], hitLimit: false };
|
||||
}
|
||||
|
||||
@@ -1756,49 +1758,19 @@ export async function fetchEndorserRateLimits(
|
||||
timestamp: new Date().toISOString(),
|
||||
});
|
||||
|
||||
try {
|
||||
const response = await axios.get(url, { headers } as AxiosRequestConfig);
|
||||
// not wrapped in a 'try' because the error returned is self-explanatory
|
||||
const response = await axios.get(url, { headers } as AxiosRequestConfig);
|
||||
|
||||
// Log successful registration check
|
||||
logger.debug("[User Registration] User registration check successful:", {
|
||||
did: issuerDid,
|
||||
server: apiServer,
|
||||
status: response.status,
|
||||
isRegistered: true,
|
||||
timestamp: new Date().toISOString(),
|
||||
});
|
||||
// Log successful registration check
|
||||
logger.debug("[User Registration] User registration check successful:", {
|
||||
did: issuerDid,
|
||||
server: apiServer,
|
||||
status: response.status,
|
||||
isRegistered: true,
|
||||
timestamp: new Date().toISOString(),
|
||||
});
|
||||
|
||||
return response;
|
||||
} catch (error) {
|
||||
// Enhanced error logging with user registration context
|
||||
const axiosError = error as {
|
||||
response?: {
|
||||
data?: { error?: { code?: string; message?: string } };
|
||||
status?: number;
|
||||
};
|
||||
};
|
||||
const errorCode = axiosError.response?.data?.error?.code;
|
||||
const errorMessage = axiosError.response?.data?.error?.message;
|
||||
const httpStatus = axiosError.response?.status;
|
||||
|
||||
logger.warn("[User Registration] User not registered on server:", {
|
||||
did: issuerDid,
|
||||
server: apiServer,
|
||||
errorCode: errorCode,
|
||||
errorMessage: errorMessage,
|
||||
httpStatus: httpStatus,
|
||||
needsRegistration: true,
|
||||
timestamp: new Date().toISOString(),
|
||||
});
|
||||
|
||||
// Log the original error for debugging
|
||||
logger.error(
|
||||
`[fetchEndorserRateLimits] Error for DID ${issuerDid}:`,
|
||||
errorStringForLog(error),
|
||||
);
|
||||
|
||||
throw error;
|
||||
}
|
||||
return response;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1847,14 +1819,17 @@ export async function fetchImageRateLimits(
|
||||
};
|
||||
};
|
||||
|
||||
logger.error("[Image Server] Image rate limits check failed:", {
|
||||
did: issuerDid,
|
||||
server: server,
|
||||
errorCode: axiosError.response?.data?.error?.code,
|
||||
errorMessage: axiosError.response?.data?.error?.message,
|
||||
httpStatus: axiosError.response?.status,
|
||||
timestamp: new Date().toISOString(),
|
||||
});
|
||||
logger.warn(
|
||||
"[Image Server] Image rate limits check failed, which is expected for users not registered on test server (eg. when only registered on local server).",
|
||||
{
|
||||
did: issuerDid,
|
||||
server: server,
|
||||
errorCode: axiosError.response?.data?.error?.code,
|
||||
errorMessage: axiosError.response?.data?.error?.message,
|
||||
httpStatus: axiosError.response?.status,
|
||||
timestamp: new Date().toISOString(),
|
||||
},
|
||||
);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,7 +19,6 @@ import { logger, safeStringify } from "../utils/logger";
|
||||
* @remarks
|
||||
* Special handling includes:
|
||||
* - Enhanced logging for Capacitor platform
|
||||
* - Rate limit detection and handling
|
||||
* - Detailed error information logging including:
|
||||
* - Error message
|
||||
* - HTTP status
|
||||
@@ -50,11 +49,5 @@ export const handleApiError = (error: AxiosError, endpoint: string) => {
|
||||
});
|
||||
}
|
||||
|
||||
// Specific handling for rate limits
|
||||
if (error.response?.status === 400) {
|
||||
logger.warn(`[Rate Limit] ${endpoint}`);
|
||||
return null;
|
||||
}
|
||||
|
||||
throw error;
|
||||
};
|
||||
|
||||
@@ -353,6 +353,14 @@ export const PlatformServiceMixin = {
|
||||
? JSON.stringify(settings.searchBoxes)
|
||||
: String(settings.searchBoxes);
|
||||
}
|
||||
if (settings.starredPlanHandleIds !== undefined) {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
(converted as any).starredPlanHandleIds = Array.isArray(
|
||||
settings.starredPlanHandleIds,
|
||||
)
|
||||
? JSON.stringify(settings.starredPlanHandleIds)
|
||||
: String(settings.starredPlanHandleIds);
|
||||
}
|
||||
|
||||
return converted;
|
||||
},
|
||||
@@ -555,6 +563,12 @@ export const PlatformServiceMixin = {
|
||||
if (settings.searchBoxes) {
|
||||
settings.searchBoxes = this._parseJsonField(settings.searchBoxes, []);
|
||||
}
|
||||
if (settings.starredPlanHandleIds) {
|
||||
settings.starredPlanHandleIds = this._parseJsonField(
|
||||
settings.starredPlanHandleIds,
|
||||
[],
|
||||
);
|
||||
}
|
||||
|
||||
return settings;
|
||||
} catch (error) {
|
||||
@@ -621,6 +635,12 @@ export const PlatformServiceMixin = {
|
||||
[],
|
||||
);
|
||||
}
|
||||
if (mergedSettings.starredPlanHandleIds) {
|
||||
mergedSettings.starredPlanHandleIds = this._parseJsonField(
|
||||
mergedSettings.starredPlanHandleIds,
|
||||
[],
|
||||
);
|
||||
}
|
||||
|
||||
return mergedSettings;
|
||||
} catch (error) {
|
||||
|
||||
@@ -24,10 +24,28 @@ export function getMemoryLogs(): string[] {
|
||||
return [..._memoryLogs];
|
||||
}
|
||||
|
||||
/**
|
||||
* Stringify an object with proper handling of circular references and functions
|
||||
*
|
||||
* Don't use for arrays; map with this over the array.
|
||||
*
|
||||
* @param obj - The object to stringify
|
||||
* @returns The stringified object, plus 'message' and 'stack' for Error objects
|
||||
*/
|
||||
export function safeStringify(obj: unknown) {
|
||||
const seen = new WeakSet();
|
||||
|
||||
return JSON.stringify(obj, (_key, value) => {
|
||||
// since 'message' & 'stack' are not enumerable for errors, let's add those
|
||||
let objToStringify = obj;
|
||||
if (obj instanceof Error) {
|
||||
objToStringify = {
|
||||
...obj,
|
||||
message: obj.message,
|
||||
stack: obj.stack,
|
||||
};
|
||||
}
|
||||
|
||||
return JSON.stringify(objToStringify, (_key, value) => {
|
||||
if (typeof value === "object" && value !== null) {
|
||||
if (seen.has(value)) {
|
||||
return "[Circular]";
|
||||
@@ -178,7 +196,8 @@ export const logger = {
|
||||
}
|
||||
|
||||
// Database logging
|
||||
const argsString = args.length > 0 ? " - " + safeStringify(args) : "";
|
||||
const argsString =
|
||||
args.length > 0 ? " - " + args.map(safeStringify).join(", ") : "";
|
||||
logToDatabase(message + argsString, "info");
|
||||
},
|
||||
|
||||
@@ -189,7 +208,8 @@ export const logger = {
|
||||
}
|
||||
|
||||
// Database logging
|
||||
const argsString = args.length > 0 ? " - " + safeStringify(args) : "";
|
||||
const argsString =
|
||||
args.length > 0 ? " - " + args.map(safeStringify).join(", ") : "";
|
||||
logToDatabase(message + argsString, "info");
|
||||
},
|
||||
|
||||
@@ -200,7 +220,8 @@ export const logger = {
|
||||
}
|
||||
|
||||
// Database logging
|
||||
const argsString = args.length > 0 ? " - " + safeStringify(args) : "";
|
||||
const argsString =
|
||||
args.length > 0 ? " - " + args.map(safeStringify).join(", ") : "";
|
||||
logToDatabase(message + argsString, "warn");
|
||||
},
|
||||
|
||||
@@ -211,9 +232,9 @@ export const logger = {
|
||||
}
|
||||
|
||||
// Database logging
|
||||
const messageString = safeStringify(message);
|
||||
const argsString = args.length > 0 ? safeStringify(args) : "";
|
||||
logToDatabase(messageString + argsString, "error");
|
||||
const argsString =
|
||||
args.length > 0 ? " - " + args.map(safeStringify).join(", ") : "";
|
||||
logToDatabase(message + argsString, "error");
|
||||
},
|
||||
|
||||
// New database-focused methods (self-contained)
|
||||
|
||||
@@ -1453,9 +1453,6 @@ export default class AccountViewView extends Vue {
|
||||
|
||||
if (imageResp && imageResp.status === 200) {
|
||||
this.imageLimits = imageResp.data;
|
||||
} else {
|
||||
this.limitsMessage = ACCOUNT_VIEW_CONSTANTS.LIMITS.NO_IMAGE_ACCESS;
|
||||
this.notify.warning(ACCOUNT_VIEW_CONSTANTS.LIMITS.CANNOT_UPLOAD_IMAGES);
|
||||
}
|
||||
|
||||
const endorserResp = await fetchEndorserRateLimits(
|
||||
@@ -1466,9 +1463,6 @@ export default class AccountViewView extends Vue {
|
||||
|
||||
if (endorserResp.status === 200) {
|
||||
this.endorserLimits = endorserResp.data;
|
||||
} else {
|
||||
this.limitsMessage = ACCOUNT_VIEW_CONSTANTS.LIMITS.NO_LIMITS_FOUND;
|
||||
this.notify.warning(ACCOUNT_VIEW_CONSTANTS.LIMITS.BAD_SERVER_RESPONSE);
|
||||
}
|
||||
} catch (error) {
|
||||
this.limitsMessage =
|
||||
|
||||
@@ -223,7 +223,7 @@ export default class ContactAmountssView extends Vue {
|
||||
const contact = await this.$getContact(contactDid);
|
||||
this.contact = contact;
|
||||
|
||||
const settings = await this.$settings();
|
||||
const settings = await this.$accountSettings();
|
||||
|
||||
// Get activeDid from active_identity table (single source of truth)
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
|
||||
@@ -421,6 +421,18 @@ export default class HomeView extends Vue {
|
||||
numNewOffersToUser: number = 0; // number of new offers-to-user
|
||||
numNewOffersToUserProjects: number = 0; // number of new offers-to-user's-projects
|
||||
|
||||
numNewStarredProjectChanges: number = 0; // number of new starred project changes
|
||||
starredPlanHandleIds: Array<string> = []; // list of starred project IDs
|
||||
searchBoxes: Array<{
|
||||
name: string;
|
||||
bbox: BoundingBox;
|
||||
}> = [];
|
||||
showShortcutBvc = false;
|
||||
userAgentInfo = new UAParser(); // see https://docs.uaparser.js.org/v2/api/ua-parser-js/get-os.html
|
||||
selectedImage = "";
|
||||
isImageViewerOpen = false;
|
||||
showProjectsDialog = false;
|
||||
|
||||
/**
|
||||
* CRITICAL VUE REACTIVITY BUG WORKAROUND
|
||||
*
|
||||
@@ -458,18 +470,6 @@ export default class HomeView extends Vue {
|
||||
// return shouldShow;
|
||||
// }
|
||||
|
||||
numNewStarredProjectChanges: number = 0; // number of new starred project changes
|
||||
starredPlanHandleIds: Array<string> = []; // list of starred project IDs
|
||||
searchBoxes: Array<{
|
||||
name: string;
|
||||
bbox: BoundingBox;
|
||||
}> = [];
|
||||
showShortcutBvc = false;
|
||||
userAgentInfo = new UAParser(); // see https://docs.uaparser.js.org/v2/api/ua-parser-js/get-os.html
|
||||
selectedImage = "";
|
||||
isImageViewerOpen = false;
|
||||
showProjectsDialog = false;
|
||||
|
||||
/**
|
||||
* Initializes notification helpers
|
||||
*/
|
||||
@@ -734,7 +734,7 @@ export default class HomeView extends Vue {
|
||||
* Used for displaying contact info in feed and actions
|
||||
*
|
||||
* @internal
|
||||
* Called by mounted() and initializeIdentity()
|
||||
* Called by initializeIdentity()
|
||||
*/
|
||||
private async loadContacts() {
|
||||
this.allContacts = await this.$contacts();
|
||||
@@ -748,7 +748,6 @@ export default class HomeView extends Vue {
|
||||
* Triggers updateAllFeed() to populate activity feed
|
||||
*
|
||||
* @internal
|
||||
* Called by mounted()
|
||||
*/
|
||||
private async loadFeedData() {
|
||||
await this.updateAllFeed();
|
||||
@@ -762,7 +761,6 @@ export default class HomeView extends Vue {
|
||||
* - Rate limit status for both
|
||||
*
|
||||
* @internal
|
||||
* Called by mounted() and initializeIdentity()
|
||||
* @requires Active DID
|
||||
*/
|
||||
private async loadNewOffers() {
|
||||
@@ -873,7 +871,6 @@ export default class HomeView extends Vue {
|
||||
* - Rate limit status for starred project changes
|
||||
*
|
||||
* @internal
|
||||
* Called by mounted() and initializeIdentity()
|
||||
* @requires Active DID
|
||||
*/
|
||||
private async loadNewStarredProjectChanges() {
|
||||
|
||||
@@ -170,7 +170,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<a class="cursor-pointer" @click="onClickLoadClaim(projectId)">
|
||||
<a class="cursor-pointer" @click="onClickLoadClaim(jwtId)">
|
||||
<font-awesome icon="file-lines" class="pl-2 pt-1 text-blue-500" />
|
||||
</a>
|
||||
</div>
|
||||
@@ -303,10 +303,7 @@
|
||||
{{ offer.objectDescription }}
|
||||
</div>
|
||||
<div class="flex justify-between">
|
||||
<a
|
||||
class="cursor-pointer"
|
||||
@click="onClickLoadClaim(offer.jwtId as string)"
|
||||
>
|
||||
<a class="cursor-pointer" @click="onClickLoadClaim(offer.jwtId)">
|
||||
<font-awesome
|
||||
icon="file-lines"
|
||||
class="pl-2 pt-1 text-blue-500"
|
||||
@@ -606,7 +603,6 @@ import { AxiosError } from "axios";
|
||||
import { Component, Vue } from "vue-facing-decorator";
|
||||
import VueMarkdown from "vue-markdown-render";
|
||||
import { Router } from "vue-router";
|
||||
import { useClipboard } from "@vueuse/core";
|
||||
|
||||
import {
|
||||
GenericVerifiableCredential,
|
||||
@@ -746,6 +742,8 @@ export default class ProjectViewView extends Vue {
|
||||
} | null = null;
|
||||
/** DIDs that can see issuer information */
|
||||
issuerVisibleToDids: Array<string> = [];
|
||||
/** Project JWT ID */
|
||||
jwtId = "";
|
||||
/** Project location data */
|
||||
latitude = 0;
|
||||
loadingTotals = false;
|
||||
@@ -910,6 +908,7 @@ export default class ProjectViewView extends Vue {
|
||||
this.allContacts,
|
||||
);
|
||||
this.issuerVisibleToDids = resp.data.issuerVisibleToDids || [];
|
||||
this.jwtId = resp.data.id;
|
||||
this.name = resp.data.claim?.name || "(no name)";
|
||||
this.description = resp.data.claim?.description || "";
|
||||
this.truncatedDesc = this.description.slice(0, this.truncateLength);
|
||||
@@ -1509,11 +1508,10 @@ export default class ProjectViewView extends Vue {
|
||||
if (!this.projectId) return;
|
||||
|
||||
try {
|
||||
const settings = await this.$accountSettings();
|
||||
const starredIds = settings.starredPlanHandleIds || [];
|
||||
if (!this.isStarred) {
|
||||
// Add to starred projects
|
||||
const settings = await databaseUtil.retrieveSettingsForActiveAccount();
|
||||
const starredIds = settings.starredPlanHandleIds || [];
|
||||
|
||||
if (!starredIds.includes(this.projectId)) {
|
||||
const newStarredIds = [...starredIds, this.projectId];
|
||||
const newIdsParam = JSON.stringify(newStarredIds);
|
||||
@@ -1526,20 +1524,16 @@ export default class ProjectViewView extends Vue {
|
||||
this.isStarred = true;
|
||||
} else {
|
||||
// eslint-disable-next-line no-console
|
||||
console.log(
|
||||
"Still getting a bad result from SQL update to star a project.",
|
||||
);
|
||||
logger.error("Got a bad result from SQL update to star a project.");
|
||||
}
|
||||
}
|
||||
if (!settings.lastAckedStarredPlanChangesJwtId) {
|
||||
await databaseUtil.updateDidSpecificSettings(this.activeDid, {
|
||||
lastAckedStarredPlanChangesJwtId: settings.lastViewedClaimId,
|
||||
lastAckedStarredPlanChangesJwtId: this.jwtId,
|
||||
});
|
||||
}
|
||||
} else {
|
||||
// Remove from starred projects
|
||||
const settings = await databaseUtil.retrieveSettingsForActiveAccount();
|
||||
const starredIds = settings.starredPlanHandleIds || [];
|
||||
|
||||
const updatedIds = starredIds.filter((id) => id !== this.projectId);
|
||||
const newIdsParam = JSON.stringify(updatedIds);
|
||||
|
||||
Reference in New Issue
Block a user