Merge pull request #1524 from appwrite/fix-unnecessary-fetches-and-build-warnings

fix: unnecessary fetches and build warnings
This commit is contained in:
Torsten Dittmann
2024-11-19 14:59:02 +01:00
committed by GitHub
15 changed files with 43 additions and 84 deletions
+2 -36
View File
@@ -1,6 +1,6 @@
<script lang="ts">
import { sdk } from '$lib/stores/sdk';
import { type Payload, Query } from '@appwrite.io/console';
import { type Payload } from '@appwrite.io/console';
import { onMount } from 'svelte';
import { isCloud, isSelfHosted } from '$lib/system';
import { organization } from '$lib/stores/organization';
@@ -52,39 +52,6 @@
}
}
async function fetchBackupRestores() {
try {
const query = [
Query.equal('status', 'pending'),
Query.equal('status', 'uploading'),
Query.equal('status', 'processing')
];
const [archivesResponse, restorationsResponse] = await Promise.all([
sdk.forProject.backups.listArchives([
...query,
// only manual backups
Query.isNull('policyId')
]),
sdk.forProject.backups.listRestorations(query)
]);
// this is a one time op.
backupRestoreItems.archives = new Map(
archivesResponse.archives.map((item) => [item.$id, item])
);
backupRestoreItems.restorations = new Map(
restorationsResponse.restorations.map((item) => [item.$id, item])
);
} catch (e) {
// ignore?
}
}
// fresh fetch.
fetchBackupRestores();
function updateOrAddItem(payload: Payload) {
const { $id, status, $collection, policyId } = payload;
if ($collection === 'archives' && policyId !== null) {
@@ -155,8 +122,7 @@
// fast path: don't subscribe if org is on a free plan or is self-hosted.
if (isSelfHosted || (isCloud && $organization.billingPlan === BillingPlan.FREE)) return;
sdk.forConsole.client.subscribe('console', (response) => {
// nice!
return sdk.forConsole.client.subscribe('console', (response) => {
if (!response.channels.includes(`projects.${getProjectId()}`)) return;
if (
+2 -2
View File
@@ -122,7 +122,7 @@
</Modal>
<style lang="scss">
@import '@appwrite.io/pink/src/abstract/variables/_devices.scss';
@use '@appwrite.io/pink/src/abstract/variables/devices';
.card {
position: fixed;
@@ -133,7 +133,7 @@
max-width: 600px;
}
@media #{$break1} {
@media #{devices.$break1} {
.card {
bottom: 0.5rem;
left: 0.5rem;
+6 -12
View File
@@ -1,7 +1,6 @@
<script lang="ts" context="module">
import { last } from '$lib/helpers/array';
import { debounce } from '$lib/helpers/debounce';
import { parseIfString } from '$lib/helpers/object';
import { getProjectId } from '$lib/helpers/project';
import { sdk } from '$lib/stores/sdk';
import type { Models } from '@appwrite.io/console';
import { onMount } from 'svelte';
@@ -49,17 +48,12 @@
return Number.isNaN(res) ? 0 : res;
})();
const fetchMigrations = debounce(async () => {
const { migrations } = await sdk.forProject.migrations.list();
migration = last(migrations);
}, 1000);
fetchMigrations();
onMount(async () => {
sdk.forConsole.client.subscribe(['project', 'console'], async (response) => {
onMount(() => {
return sdk.forConsole.client.subscribe<Models.Migration>(['console'], async (response) => {
if (!response.channels.includes(`projects.${getProjectId()}`)) return;
if (response.events.includes('migrations.*')) {
fetchMigrations();
if (response.payload.source === 'Backup') return;
migration = response.payload;
}
});
});
+2 -2
View File
@@ -51,7 +51,7 @@
</ModalWrapper>
<style lang="scss">
@import '@appwrite.io/pink/src/abstract/mixins/_scroll.scss';
@use '@appwrite.io/pink/src/abstract/mixins/scroll';
.mk-grid {
overflow: hidden;
@@ -60,7 +60,7 @@
}
&-item-2 {
overflow: auto;
@include scroll;
@include scroll.scroll;
}
}
+2 -2
View File
@@ -84,13 +84,13 @@
</dialog>
<style lang="scss">
@import '@appwrite.io/pink/src/abstract/variables/_devices.scss';
@use '@appwrite.io/pink/src/abstract/variables/devices';
.modal.is-huge {
block-size: 100%;
min-block-size: 80vh;
@media #{$break1}, #{$break2} {
@media #{devices.$break1}, #{devices.$break2} {
min-inline-size: 100%;
min-block-size: 100%;
border-radius: 0;
+2 -2
View File
@@ -86,7 +86,7 @@
</FormItem>
<style lang="scss">
@import '@appwrite.io/pink/src/abstract/variables/_devices.scss';
@use '@appwrite.io/pink/src/abstract/variables/devices';
/* Default (including mobile) */
ol {
@@ -99,7 +99,7 @@
}
/* for smaller screens */
@media #{$break2open} {
@media #{devices.$break2open} {
ol {
gap: 1rem;
+9 -10
View File
@@ -222,8 +222,7 @@
</main>
<style lang="scss">
@import '@appwrite.io/pink/src/abstract/variables/_devices.scss';
@import '@appwrite.io/pink/src/abstract/variables/_common.scss';
@use '@appwrite.io/pink/src/abstract/variables/devices';
.side-bg {
position: relative;
@@ -251,7 +250,7 @@
block-size: 32%;
background: radial-gradient(49.55% 43.54% at 47% 50.69%, #e7f8f7 0%, #85dbd8 100%);
filter: blur(150px);
@media #{$break1} {
@media #{devices.$break1} {
filter: blur(100px);
}
}
@@ -270,7 +269,7 @@
);
filter: blur(200px);
@media #{$break1} {
@media #{devices.$break1} {
filter: blur(100px);
}
}
@@ -278,10 +277,10 @@
&-img {
padding-inline: 6.25rem;
max-width: 40rem;
@media #{$break2} {
@media #{devices.$break2} {
max-width: 28rem;
}
@media #{$break1} {
@media #{devices.$break1} {
margin-block-start: 3rem;
max-inline-size: 23rem;
padding-inline: 4rem;
@@ -326,7 +325,7 @@
}
/* for smaller screens */
@media #{$break2open} {
@media #{devices.$break2open} {
.side-default {
background: var(--url);
background-repeat: no-repeat;
@@ -344,7 +343,7 @@
}
/* for larger screens */
@media #{$break3open} {
@media #{devices.$break3open} {
.side-default {
div {
padding-inline-start: 5.625rem;
@@ -379,7 +378,7 @@
.logo-variation {
padding-block-start: 2rem;
@media #{$break1} {
@media #{devices.$break1} {
padding-block-start: 0rem;
& img {
scale: 0.7;
@@ -389,7 +388,7 @@
.review-footer-container {
padding-block-start: 10rem;
@media #{$break1} {
@media #{devices.$break1} {
padding-block-start: 5rem;
}
}
+3 -2
View File
@@ -70,7 +70,8 @@
</Unauthenticated>
<style lang="scss">
@import '@appwrite.io/pink/src/abstract/variables/_devices.scss';
@use '@appwrite.io/pink/src/abstract/variables/devices';
.top {
inset-block-start: 5.85rem;
inline-size: 100%;
@@ -89,7 +90,7 @@
}
/* for smaller screens */
@media #{$break2open} {
@media #{devices.$break2open} {
.top {
inset-block-start: 5.85rem;
padding-inline: 0;
@@ -318,7 +318,7 @@
factors={$factors} />
<style lang="scss">
@import '@appwrite.io/pink/src/abstract/variables/_devices.scss';
@use '@appwrite.io/pink/src/abstract/variables/devices';
/* Default (including mobile) */
.method {
@@ -329,7 +329,7 @@
}
/* for smaller screens */
@media #{$break2open} {
@media #{devices.$break2open} {
.method {
align-items: center;
}
@@ -106,7 +106,6 @@
<div class="layout-level-progress-bars">
<UploadBox />
<MigrationBox />
<BackupRestoreBox />
</div>
@@ -106,14 +106,14 @@
</CardGrid>
<style lang="scss">
@import '@appwrite.io/pink/src/abstract/variables/_devices.scss';
@use '@appwrite.io/pink/src/abstract/variables/devices';
.stats-grid-box {
display: grid;
grid-template-columns: repeat(2, 1fr);
}
@media #{$break3open} {
@media #{devices.$break3open} {
.stats-grid-box {
grid-template-columns: repeat(4, 1fr);
}
@@ -187,7 +187,7 @@
alt="statistics" />
<style lang="scss">
@import '@appwrite.io/pink/src/abstract/variables/_devices.scss';
@use '@appwrite.io/pink/src/abstract/variables/devices';
.card {
:global(.theme-dark) & {
@@ -215,7 +215,7 @@
margin-inline: 4rem;
}
@media #{$break2open} {
@media #{devices.$break2open} {
.card-header {
background-image: var(--url);
background-repeat: no-repeat;
@@ -234,11 +234,11 @@
z-index: 1;
position: absolute;
@media #{$break1} {
@media #{devices.$break1} {
margin-block-start: 15%;
}
@media #{$break2open} {
@media #{devices.$break2open} {
margin-block-start: 2rem;
}
}
@@ -42,9 +42,9 @@
{/await}
<style lang="scss">
@import '@appwrite.io/pink/src/abstract/variables/_devices.scss';
@use '@appwrite.io/pink/src/abstract/variables/devices';
// override padding for screens bigger than mobile
@media #{$break2open} {
@media #{devices.$break2open} {
article.card {
padding: 2rem !important;
}
@@ -42,9 +42,9 @@
{/await}
<style lang="scss">
@import '@appwrite.io/pink/src/abstract/variables/_devices.scss';
@use '@appwrite.io/pink/src/abstract/variables/devices';
// override padding for screens bigger than mobile
@media #{$break2open} {
@media #{devices.$break2open} {
article.card {
padding: 2rem !important;
}
+3 -3
View File
@@ -103,9 +103,9 @@
<Progress />
<!-- svelte-ignore css-unused-selector -->
<style lang="scss" global>
@import '@appwrite.io/pink/src/abstract/variables/_devices.scss';
@use '@appwrite.io/pink/src/abstract/variables/devices';
.tippy-box {
--p-tooltip-text-color: var(--color-neutral-10);
--p-tooltip--bg-color: var(--color-neutral-80);
@@ -186,7 +186,7 @@
.is-cloud {
--heading-font: 'Aeonik Pro', arial, sans-serif;
.heading-level {
@media #{$break3open} {
@media #{devices.$break3open} {
&-1,
&-2,
&-3,