Merge branch 'main' of https://github.com/appwrite/console into 1.6.x

Author: TorstenDittmann

src/lib/helpers/sizeConvertion.ts

@@ -3,25 +3,24 @@ import prettyBytes from 'pretty-bytes';
 const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'] as const;
 export type Size = (typeof sizes)[number];
 
-export function calculateSize(bytes: number, decimals = 1) {
+export function calculateSize(bytes: number, decimals = 1, base: 1000 | 1024 = 1000) {
     if (bytes === 0) return '0 Bytes';
 
-    const k = 1024;
     const dm = decimals < 0 ? 0 : decimals;
 
-    const i = Math.floor(Math.log(bytes) / Math.log(k));
+    const i = Math.floor(Math.log(bytes) / Math.log(base));
 
-    return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
+    return parseFloat((bytes / Math.pow(base, i)).toFixed(dm)) + ' ' + sizes[i];
 }
 
-export function sizeToBytes(value: number, unit: Size, base = 1024) {
+export function sizeToBytes(value: number, unit: Size, base = 1000) {
     const index = sizes.indexOf(unit);
     return value * Math.pow(base, index);
 }
 
-export function bytesToSize(value: number, unit: Size) {
+export function bytesToSize(value: number, unit: Size, base = 1000) {
     const index = sizes.indexOf(unit);
-    return value / Math.pow(1024, index);
+    return value / Math.pow(base, index);
 }
 
 export function humanFileSize(

src/lib/helpers/unit.ts

@@ -73,7 +73,7 @@ export function createTimeUnitPair(initialValue = 0) {
     return { ...createValueUnitPair(initialValue, units), units };
 }
 
-export function createByteUnitPair(initialValue = 0, base = 1024) {
+export function createByteUnitPair(initialValue = 0, base: 1000 | 1024 = 1000) {
     const units: Unit[] = [
         { name: 'Bytes', value: 1 },
         { name: 'Kilobytes', value: base },

tests/e2e/steps/pro-project.ts

@@ -7,13 +7,22 @@ type Metadata = {
 };
 
 export async function enterCreditCard(page: Page) {
+    const dialog = page.locator('.modal').filter({
+        hasText: 'add payment method'
+    });
+    await dialog.waitFor({
+        state: 'visible'
+    });
     await page.getByPlaceholder('cardholder').fill('Test User');
     const stripe = page.frameLocator('[title="Secure payment input frame"]');
     await stripe.locator('id=Field-numberInput').fill('4242424242424242');
     await stripe.locator('id=Field-expiryInput').fill('1250');
     await stripe.locator('id=Field-cvcInput').fill('123');
     await stripe.locator('id=Field-countryInput').selectOption('DE');
     await page.getByRole('button', { name: 'Add', exact: true }).click();
+    await dialog.waitFor({
+        state: 'hidden'
+    });
 }
 
 export async function createProProject(page: Page): Promise<Metadata> {
@@ -24,7 +33,6 @@ export async function createProProject(page: Page): Promise<Metadata> {
         await page.locator('id=plan').selectOption('tier-1');
         await page.getByRole('button', { name: 'get started' }).click();
         await page.waitForURL('./create-organization**');
-        await new Promise((r) => setTimeout(r, 1000));
         await page.getByRole('button', { name: 'add' }).first().click();
         await enterCreditCard(page);
         // skip members