Lint-fix
This commit is contained in:
@@ -55,10 +55,7 @@
|
|||||||
aria-label="Delete profile image"
|
aria-label="Delete profile image"
|
||||||
@click="deleteImage"
|
@click="deleteImage"
|
||||||
>
|
>
|
||||||
<font-awesome
|
<font-awesome icon="trash-can" aria-hidden="true" />
|
||||||
icon="trash-can"
|
|
||||||
aria-hidden="true"
|
|
||||||
/>
|
|
||||||
</button>
|
</button>
|
||||||
</span>
|
</span>
|
||||||
<div v-else class="text-center">
|
<div v-else class="text-center">
|
||||||
|
|||||||
@@ -973,28 +973,28 @@ export async function importFromMnemonic(
|
|||||||
if (isTestUser0) {
|
if (isTestUser0) {
|
||||||
// Set up Test User #0 specific settings with enhanced error handling
|
// Set up Test User #0 specific settings with enhanced error handling
|
||||||
const platformService = await getPlatformService();
|
const platformService = await getPlatformService();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// First, ensure the DID-specific settings record exists
|
// First, ensure the DID-specific settings record exists
|
||||||
await platformService.insertDidSpecificSettings(newId.did);
|
await platformService.insertDidSpecificSettings(newId.did);
|
||||||
|
|
||||||
// Then update with Test User #0 specific settings
|
// Then update with Test User #0 specific settings
|
||||||
await platformService.updateDidSpecificSettings(newId.did, {
|
await platformService.updateDidSpecificSettings(newId.did, {
|
||||||
firstName: "User Zero",
|
firstName: "User Zero",
|
||||||
isRegistered: true,
|
isRegistered: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
// Verify the settings were saved correctly
|
// Verify the settings were saved correctly
|
||||||
const verificationResult = await platformService.dbQuery(
|
const verificationResult = await platformService.dbQuery(
|
||||||
"SELECT firstName, isRegistered FROM settings WHERE accountDid = ?",
|
"SELECT firstName, isRegistered FROM settings WHERE accountDid = ?",
|
||||||
[newId.did],
|
[newId.did],
|
||||||
);
|
);
|
||||||
|
|
||||||
if (verificationResult?.values?.length) {
|
if (verificationResult?.values?.length) {
|
||||||
const settings = verificationResult.values[0];
|
const settings = verificationResult.values[0];
|
||||||
const firstName = settings[0];
|
const firstName = settings[0];
|
||||||
const isRegistered = settings[1];
|
const isRegistered = settings[1];
|
||||||
|
|
||||||
logger.info("[importFromMnemonic] Test User #0 settings verification", {
|
logger.info("[importFromMnemonic] Test User #0 settings verification", {
|
||||||
did: newId.did,
|
did: newId.did,
|
||||||
firstName,
|
firstName,
|
||||||
@@ -1002,40 +1002,50 @@ export async function importFromMnemonic(
|
|||||||
expectedFirstName: "User Zero",
|
expectedFirstName: "User Zero",
|
||||||
expectedIsRegistered: true,
|
expectedIsRegistered: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
// If settings weren't saved correctly, try individual updates
|
// If settings weren't saved correctly, try individual updates
|
||||||
if (firstName !== "User Zero" || isRegistered !== 1) {
|
if (firstName !== "User Zero" || isRegistered !== 1) {
|
||||||
logger.warn("[importFromMnemonic] Test User #0 settings not saved correctly, retrying with individual updates");
|
logger.warn(
|
||||||
|
"[importFromMnemonic] Test User #0 settings not saved correctly, retrying with individual updates",
|
||||||
|
);
|
||||||
|
|
||||||
await platformService.dbExec(
|
await platformService.dbExec(
|
||||||
"UPDATE settings SET firstName = ? WHERE accountDid = ?",
|
"UPDATE settings SET firstName = ? WHERE accountDid = ?",
|
||||||
["User Zero", newId.did],
|
["User Zero", newId.did],
|
||||||
);
|
);
|
||||||
|
|
||||||
await platformService.dbExec(
|
await platformService.dbExec(
|
||||||
"UPDATE settings SET isRegistered = ? WHERE accountDid = ?",
|
"UPDATE settings SET isRegistered = ? WHERE accountDid = ?",
|
||||||
[1, newId.did],
|
[1, newId.did],
|
||||||
);
|
);
|
||||||
|
|
||||||
// Verify again
|
// Verify again
|
||||||
const retryResult = await platformService.dbQuery(
|
const retryResult = await platformService.dbQuery(
|
||||||
"SELECT firstName, isRegistered FROM settings WHERE accountDid = ?",
|
"SELECT firstName, isRegistered FROM settings WHERE accountDid = ?",
|
||||||
[newId.did],
|
[newId.did],
|
||||||
);
|
);
|
||||||
|
|
||||||
if (retryResult?.values?.length) {
|
if (retryResult?.values?.length) {
|
||||||
const retrySettings = retryResult.values[0];
|
const retrySettings = retryResult.values[0];
|
||||||
logger.info("[importFromMnemonic] Test User #0 settings after retry", {
|
logger.info(
|
||||||
firstName: retrySettings[0],
|
"[importFromMnemonic] Test User #0 settings after retry",
|
||||||
isRegistered: retrySettings[1],
|
{
|
||||||
});
|
firstName: retrySettings[0],
|
||||||
|
isRegistered: retrySettings[1],
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
logger.error("[importFromMnemonic] Failed to verify Test User #0 settings - no record found");
|
logger.error(
|
||||||
|
"[importFromMnemonic] Failed to verify Test User #0 settings - no record found",
|
||||||
|
);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error("[importFromMnemonic] Error setting up Test User #0 settings:", error);
|
logger.error(
|
||||||
|
"[importFromMnemonic] Error setting up Test User #0 settings:",
|
||||||
|
error,
|
||||||
|
);
|
||||||
// Don't throw - allow the import to continue even if settings fail
|
// Don't throw - allow the import to continue even if settings fail
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,16 +3,18 @@
|
|||||||
<h2>PlatformServiceMixin Test</h2>
|
<h2>PlatformServiceMixin Test</h2>
|
||||||
<button @click="testInsert">Test Insert</button>
|
<button @click="testInsert">Test Insert</button>
|
||||||
<button @click="testUpdate">Test Update</button>
|
<button @click="testUpdate">Test Update</button>
|
||||||
<button
|
<button :class="primaryButtonClasses" @click="testUserZeroSettings">
|
||||||
:class="primaryButtonClasses"
|
|
||||||
@click="testUserZeroSettings"
|
|
||||||
>
|
|
||||||
Test User #0 Settings
|
Test User #0 Settings
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<div v-if="userZeroTestResult" class="mt-4 p-4 border border-gray-300 rounded-md bg-gray-50">
|
<div
|
||||||
|
v-if="userZeroTestResult"
|
||||||
|
class="mt-4 p-4 border border-gray-300 rounded-md bg-gray-50"
|
||||||
|
>
|
||||||
<h4 class="font-semibold mb-2">User #0 Settings Test Result:</h4>
|
<h4 class="font-semibold mb-2">User #0 Settings Test Result:</h4>
|
||||||
<pre class="text-sm">{{ JSON.stringify(userZeroTestResult, null, 2) }}</pre>
|
<pre class="text-sm">{{
|
||||||
|
JSON.stringify(userZeroTestResult, null, 2)
|
||||||
|
}}</pre>
|
||||||
</div>
|
</div>
|
||||||
<pre>{{ result }}</pre>
|
<pre>{{ result }}</pre>
|
||||||
</div>
|
</div>
|
||||||
@@ -55,16 +57,16 @@ export default class PlatformServiceMixinTest extends Vue {
|
|||||||
try {
|
try {
|
||||||
// User #0's DID
|
// User #0's DID
|
||||||
const userZeroDid = "did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F";
|
const userZeroDid = "did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F";
|
||||||
|
|
||||||
this.result = "Testing User #0 settings...";
|
this.result = "Testing User #0 settings...";
|
||||||
|
|
||||||
// Test the debug methods
|
// Test the debug methods
|
||||||
await this.$debugMergedSettings(userZeroDid);
|
await this.$debugMergedSettings(userZeroDid);
|
||||||
|
|
||||||
// Get the actual settings
|
// Get the actual settings
|
||||||
const didSettings = await this.$debugDidSettings(userZeroDid);
|
const didSettings = await this.$debugDidSettings(userZeroDid);
|
||||||
const accountSettings = await this.$accountSettings(userZeroDid);
|
const accountSettings = await this.$accountSettings(userZeroDid);
|
||||||
|
|
||||||
this.userZeroTestResult = {
|
this.userZeroTestResult = {
|
||||||
didSettings,
|
didSettings,
|
||||||
accountSettings,
|
accountSettings,
|
||||||
@@ -72,7 +74,7 @@ export default class PlatformServiceMixinTest extends Vue {
|
|||||||
firstName: accountSettings.firstName,
|
firstName: accountSettings.firstName,
|
||||||
timestamp: new Date().toISOString(),
|
timestamp: new Date().toISOString(),
|
||||||
};
|
};
|
||||||
|
|
||||||
this.result = `User #0 settings test completed. isRegistered: ${accountSettings.isRegistered}`;
|
this.result = `User #0 settings test completed. isRegistered: ${accountSettings.isRegistered}`;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.result = `Error testing User #0 settings: ${error}`;
|
this.result = `Error testing User #0 settings: ${error}`;
|
||||||
|
|||||||
@@ -220,13 +220,20 @@ export const PlatformServiceMixin = {
|
|||||||
const obj: Record<string, unknown> = {};
|
const obj: Record<string, unknown> = {};
|
||||||
columns.forEach((column, index) => {
|
columns.forEach((column, index) => {
|
||||||
let value = row[index];
|
let value = row[index];
|
||||||
|
|
||||||
// Convert SQLite integer booleans to JavaScript booleans
|
// Convert SQLite integer booleans to JavaScript booleans
|
||||||
if (column === 'isRegistered' || column === 'finishedOnboarding' ||
|
if (
|
||||||
column === 'filterFeedByVisible' || column === 'filterFeedByNearby' ||
|
column === "isRegistered" ||
|
||||||
column === 'hideRegisterPromptOnNewContact' || column === 'showContactGivesInline' ||
|
column === "finishedOnboarding" ||
|
||||||
column === 'showGeneralAdvanced' || column === 'showShortcutBvc' ||
|
column === "filterFeedByVisible" ||
|
||||||
column === 'warnIfProdServer' || column === 'warnIfTestServer') {
|
column === "filterFeedByNearby" ||
|
||||||
|
column === "hideRegisterPromptOnNewContact" ||
|
||||||
|
column === "showContactGivesInline" ||
|
||||||
|
column === "showGeneralAdvanced" ||
|
||||||
|
column === "showShortcutBvc" ||
|
||||||
|
column === "warnIfProdServer" ||
|
||||||
|
column === "warnIfTestServer"
|
||||||
|
) {
|
||||||
if (value === 1) {
|
if (value === 1) {
|
||||||
value = true;
|
value = true;
|
||||||
} else if (value === 0) {
|
} else if (value === 0) {
|
||||||
@@ -234,7 +241,7 @@ export const PlatformServiceMixin = {
|
|||||||
}
|
}
|
||||||
// Keep null values as null
|
// Keep null values as null
|
||||||
}
|
}
|
||||||
|
|
||||||
obj[column] = value;
|
obj[column] = value;
|
||||||
});
|
});
|
||||||
return obj;
|
return obj;
|
||||||
@@ -1401,7 +1408,9 @@ export const PlatformServiceMixin = {
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (!result?.values?.length) {
|
if (!result?.values?.length) {
|
||||||
logger.warn(`[PlatformServiceMixin] No settings found for DID: ${did}`);
|
logger.warn(
|
||||||
|
`[PlatformServiceMixin] No settings found for DID: ${did}`,
|
||||||
|
);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1411,7 +1420,9 @@ export const PlatformServiceMixin = {
|
|||||||
);
|
);
|
||||||
|
|
||||||
if (!mappedResults.length) {
|
if (!mappedResults.length) {
|
||||||
logger.warn(`[PlatformServiceMixin] Failed to map settings for DID: ${did}`);
|
logger.warn(
|
||||||
|
`[PlatformServiceMixin] Failed to map settings for DID: ${did}`,
|
||||||
|
);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1426,7 +1437,10 @@ export const PlatformServiceMixin = {
|
|||||||
|
|
||||||
return settings;
|
return settings;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error(`[PlatformServiceMixin] Error debugging settings for DID ${did}:`, error);
|
logger.error(
|
||||||
|
`[PlatformServiceMixin] Error debugging settings for DID ${did}:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1440,14 +1454,24 @@ export const PlatformServiceMixin = {
|
|||||||
async $debugMergedSettings(did: string): Promise<void> {
|
async $debugMergedSettings(did: string): Promise<void> {
|
||||||
try {
|
try {
|
||||||
// Get default settings
|
// Get default settings
|
||||||
const defaultSettings = await this.$getSettings(MASTER_SETTINGS_KEY, {});
|
const defaultSettings = await this.$getSettings(
|
||||||
logger.info(`[PlatformServiceMixin] Default settings:`, defaultSettings);
|
MASTER_SETTINGS_KEY,
|
||||||
|
{},
|
||||||
|
);
|
||||||
|
logger.info(
|
||||||
|
`[PlatformServiceMixin] Default settings:`,
|
||||||
|
defaultSettings,
|
||||||
|
);
|
||||||
|
|
||||||
// Get DID-specific settings
|
// Get DID-specific settings
|
||||||
const didSettings = await this.$debugDidSettings(did);
|
const didSettings = await this.$debugDidSettings(did);
|
||||||
|
|
||||||
// Get merged settings
|
// Get merged settings
|
||||||
const mergedSettings = await this.$getMergedSettings(MASTER_SETTINGS_KEY, did, defaultSettings || {});
|
const mergedSettings = await this.$getMergedSettings(
|
||||||
|
MASTER_SETTINGS_KEY,
|
||||||
|
did,
|
||||||
|
defaultSettings || {},
|
||||||
|
);
|
||||||
|
|
||||||
logger.info(`[PlatformServiceMixin] Merged settings for ${did}:`, {
|
logger.info(`[PlatformServiceMixin] Merged settings for ${did}:`, {
|
||||||
defaultSettings,
|
defaultSettings,
|
||||||
@@ -1456,7 +1480,10 @@ export const PlatformServiceMixin = {
|
|||||||
isRegistered: mergedSettings.isRegistered,
|
isRegistered: mergedSettings.isRegistered,
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.error(`[PlatformServiceMixin] Error debugging merged settings for DID ${did}:`, error);
|
logger.error(
|
||||||
|
`[PlatformServiceMixin] Error debugging merged settings for DID ${did}:`,
|
||||||
|
error,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1423,7 +1423,8 @@ export default class AccountViewView extends Vue {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.limitsMessage = ACCOUNT_VIEW_CONSTANTS.LIMITS.ERROR_RETRIEVING_LIMITS;
|
this.limitsMessage =
|
||||||
|
ACCOUNT_VIEW_CONSTANTS.LIMITS.ERROR_RETRIEVING_LIMITS;
|
||||||
console.log("error: ", error);
|
console.log("error: ", error);
|
||||||
// this.notify.error(this.limitsMessage, TIMEOUTS.STANDARD);
|
// this.notify.error(this.limitsMessage, TIMEOUTS.STANDARD);
|
||||||
} finally {
|
} finally {
|
||||||
@@ -1483,7 +1484,7 @@ export default class AccountViewView extends Vue {
|
|||||||
async deleteImage(): Promise<void> {
|
async deleteImage(): Promise<void> {
|
||||||
try {
|
try {
|
||||||
// Extract the image ID from the full URL
|
// Extract the image ID from the full URL
|
||||||
const imageId = this.profileImageUrl?.split('/').pop();
|
const imageId = this.profileImageUrl?.split("/").pop();
|
||||||
if (!imageId) {
|
if (!imageId) {
|
||||||
this.notify.error("Invalid image URL");
|
this.notify.error("Invalid image URL");
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user