mirror of
https://github.com/appwrite/console.git
synced 2026-11-18 20:47:21 +00:00
Merge pull request #2425 from appwrite/fix-horizontal-scroll
This commit is contained in:
5 files changed
+36
-18
No files matched your search
@@ -41,6 +41,7 @@ jobs:
|
||||
"PUBLIC_CONSOLE_MODE=cloud"
|
||||
"PUBLIC_CONSOLE_FEATURE_FLAGS="
|
||||
"PUBLIC_APPWRITE_MULTI_REGION=true"
|
||||
"PUBLIC_CONSOLE_EMAIL_VERIFICATION=true"
|
||||
"PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS=false"
|
||||
"PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}"
|
||||
"PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY }}"
|
||||
@@ -82,6 +83,7 @@ jobs:
|
||||
"PUBLIC_CONSOLE_MODE=cloud"
|
||||
"PUBLIC_CONSOLE_FEATURE_FLAGS="
|
||||
"PUBLIC_APPWRITE_MULTI_REGION=true"
|
||||
"PUBLIC_CONSOLE_EMAIL_VERIFICATION=false"
|
||||
"PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS=false"
|
||||
"PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}"
|
||||
"PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY_STAGE }}"
|
||||
@@ -120,7 +122,8 @@ jobs:
|
||||
build-args: |
|
||||
"PUBLIC_CONSOLE_MODE=self-hosted"
|
||||
"PUBLIC_APPWRITE_MULTI_REGION=false"
|
||||
"PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS=false"
|
||||
"PUBLIC_CONSOLE_EMAIL_VERIFICATION=false"
|
||||
"PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS=true"
|
||||
"PUBLIC_CONSOLE_FEATURE_FLAGS="
|
||||
"PUBLIC_GROWTH_ENDPOINT=${{ secrets.PUBLIC_GROWTH_ENDPOINT }}"
|
||||
|
||||
@@ -159,6 +162,7 @@ jobs:
|
||||
build-args: |
|
||||
"PUBLIC_CONSOLE_MODE=cloud"
|
||||
"PUBLIC_APPWRITE_MULTI_REGION=false"
|
||||
"PUBLIC_CONSOLE_EMAIL_VERIFICATION=true"
|
||||
"PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS=false"
|
||||
"PUBLIC_CONSOLE_FEATURE_FLAGS="
|
||||
"PUBLIC_STRIPE_KEY=${{ secrets.PUBLIC_STRIPE_KEY_STAGE }}"
|
||||
|
||||
@@ -23,6 +23,7 @@ ADD ./static /app/static
|
||||
ARG PUBLIC_CONSOLE_MODE
|
||||
ARG PUBLIC_CONSOLE_FEATURE_FLAGS
|
||||
ARG PUBLIC_APPWRITE_MULTI_REGION
|
||||
ARG PUBLIC_CONSOLE_EMAIL_VERIFICATION
|
||||
ARG PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS
|
||||
ARG PUBLIC_APPWRITE_ENDPOINT
|
||||
ARG PUBLIC_GROWTH_ENDPOINT
|
||||
@@ -35,6 +36,7 @@ ENV PUBLIC_GROWTH_ENDPOINT=$PUBLIC_GROWTH_ENDPOINT
|
||||
ENV PUBLIC_CONSOLE_MODE=$PUBLIC_CONSOLE_MODE
|
||||
ENV PUBLIC_CONSOLE_FEATURE_FLAGS=$PUBLIC_CONSOLE_FEATURE_FLAGS
|
||||
ENV PUBLIC_APPWRITE_MULTI_REGION=$PUBLIC_APPWRITE_MULTI_REGION
|
||||
ENV PUBLIC_CONSOLE_EMAIL_VERIFICATION=$PUBLIC_CONSOLE_EMAIL_VERIFICATION
|
||||
ENV PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS=$PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS
|
||||
ENV PUBLIC_STRIPE_KEY=$PUBLIC_STRIPE_KEY
|
||||
ENV SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN
|
||||
|
||||
@@ -28,6 +28,8 @@ async function main() {
|
||||
logEnv('MULTI REGION', env?.PUBLIC_APPWRITE_MULTI_REGION);
|
||||
logEnv('APPWRITE ENDPOINT', env?.PUBLIC_APPWRITE_ENDPOINT, 'relative');
|
||||
logEnv('GROWTH ENDPOINT', env?.PUBLIC_GROWTH_ENDPOINT);
|
||||
logEnv('CONSOLE EMAIL VERIFICATION', env?.PUBLIC_CONSOLE_EMAIL_VERIFICATION);
|
||||
logEnv('CONSOLE MOCK AI SUGGESTIONS', env?.PUBLIC_CONSOLE_MOCK_AI_SUGGESTIONS);
|
||||
log();
|
||||
logDelimiter();
|
||||
await build();
|
||||
|
||||
@@ -6,15 +6,14 @@
|
||||
import SendVerificationEmailModal from '../account/sendVerificationEmailModal.svelte';
|
||||
import { page } from '$app/state';
|
||||
import { wizard, isNewWizardStatusOpen } from '$lib/stores/wizard';
|
||||
import { isCloud, isProductionCloud, VARS } from '$lib/system';
|
||||
import { isCloud, VARS } from '$lib/system';
|
||||
|
||||
const hasUser = $derived(!!$user);
|
||||
const needsEmailVerification = $derived(hasUser && !$user.emailVerification);
|
||||
const notOnOnboarding = $derived(!page.route.id.includes('/onboarding'));
|
||||
const notOnWizard = $derived(!$wizard.show && !$isNewWizardStatusOpen);
|
||||
const isEnabledViaEnvConfig = $derived(VARS.EMAIL_VERIFICATION);
|
||||
const shouldShowEmailBanner = $derived(
|
||||
isEnabledViaEnvConfig &&
|
||||
VARS.EMAIL_VERIFICATION &&
|
||||
isCloud &&
|
||||
hasUser &&
|
||||
needsEmailVerification &&
|
||||
@@ -23,10 +22,9 @@
|
||||
);
|
||||
|
||||
let showSendVerification = $state(false);
|
||||
let isProduction = $derived(isProductionCloud(page.url));
|
||||
</script>
|
||||
|
||||
{#if shouldShowEmailBanner && isProduction}
|
||||
{#if shouldShowEmailBanner}
|
||||
<HeaderAlert type="warning" title="Your email address needs to be verified">
|
||||
<svelte:fragment>
|
||||
To avoid losing access to your projects, make sure <Typography.Text
|
||||
|
||||
+24
-12
@@ -451,16 +451,28 @@
|
||||
|
||||
const mappedColumns = mapSuggestedColumns(suggestedColumns.columns);
|
||||
|
||||
mappedColumns.forEach((column, index) => {
|
||||
if (index < customColumns.length) {
|
||||
setTimeout(() => {
|
||||
customColumns[index] = { ...column, isPlaceholder: false };
|
||||
// replace with actual columns and trim excess
|
||||
if (mappedColumns.length < customColumns.length) {
|
||||
customColumns = customColumns.slice(0, mappedColumns.length);
|
||||
}
|
||||
|
||||
// recalculate overlay bounds
|
||||
// after each column is populated!
|
||||
requestAnimationFrame(() => updateOverlayBounds());
|
||||
}, index * 150);
|
||||
}
|
||||
// replace existing placeholders and
|
||||
// add any additional columns if needed
|
||||
mappedColumns.forEach((column, index) => {
|
||||
setTimeout(() => {
|
||||
if (index < customColumns.length) {
|
||||
// replace existing placeholder
|
||||
customColumns[index] = { ...column, isPlaceholder: false };
|
||||
} else {
|
||||
// new column directly if we have more than expected
|
||||
// just added in case the max ever changes on backend!
|
||||
customColumns.push({ ...column, isPlaceholder: false });
|
||||
}
|
||||
|
||||
// recalculate overlay bounds
|
||||
// after each column is populated!
|
||||
requestAnimationFrame(() => updateOverlayBounds());
|
||||
}, index * 150);
|
||||
});
|
||||
|
||||
if (mappedColumns.length > 0) {
|
||||
@@ -1047,7 +1059,7 @@
|
||||
.spreadsheet-container-outer {
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
overflow: hidden;
|
||||
overflow: visible;
|
||||
scrollbar-width: none;
|
||||
|
||||
&.custom-columns {
|
||||
@@ -1174,8 +1186,8 @@
|
||||
}
|
||||
|
||||
& :global(.spreadsheet-container) {
|
||||
overflow-x: hidden;
|
||||
overflow-y: hidden;
|
||||
overflow-x: auto;
|
||||
overflow-y: auto;
|
||||
scrollbar-width: none;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user