Skip to content

PostgreSQL backup tool with Point-In-Time-Recovery and restore verification

FEATURE (cloud): Allow to disable cloud notice in self-hosted version via env variable IS_DISABLE_CLOUD_NOTICE

Rostislav Dugin9334895a6bb2
diff --git a/.env.example b/.env.example
index fb3717cd..ab6459ce 100644
--- a/.env.example
+++ b/.env.example
@@ -105,6 +105,7 @@ VITE_GOOGLE_CLIENT_ID=
VITE_IS_EMAIL_CONFIGURED=false
VITE_CLOUDFLARE_TURNSTILE_SITE_KEY=
VITE_IS_CLOUD=false
+VITE_IS_DISABLE_CLOUD_NOTICE=false
VITE_CLOUD_PRICE_PER_GB=
VITE_CLOUD_PADDLE_CLIENT_TOKEN=
VITE_CLOUD_IS_PADDLE_SANDBOX=true
diff --git a/Dockerfile b/Dockerfile
index 629043de..fd29d6bd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -270,6 +270,7 @@ cat > /app/ui/build/runtime-config.js <<JSEOF
// This file is generated dynamically and should not be edited manually
window.__RUNTIME_CONFIG__ = {
IS_CLOUD: '\${IS_CLOUD:-false}',
+ IS_DISABLE_CLOUD_NOTICE: '\${IS_DISABLE_CLOUD_NOTICE:-false}',
GITHUB_CLIENT_ID: '\${GITHUB_CLIENT_ID:-}',
GOOGLE_CLIENT_ID: '\${GOOGLE_CLIENT_ID:-}',
IS_EMAIL_CONFIGURED: '\$IS_EMAIL_CONFIGURED',
diff --git a/frontend/src/constants.ts b/frontend/src/constants.ts
index 3cb80aba..eaf6e87f 100644
--- a/frontend/src/constants.ts
+++ b/frontend/src/constants.ts
@@ -1,5 +1,6 @@
interface RuntimeConfig {
IS_CLOUD?: string;
+ IS_DISABLE_CLOUD_NOTICE?: string;
GITHUB_CLIENT_ID?: string;
GOOGLE_CLIENT_ID?: string;
IS_EMAIL_CONFIGURED?: string;
@@ -34,6 +35,10 @@ export const APP_VERSION = (import.meta.env.VITE_APP_VERSION as string) || 'dev'
export const IS_CLOUD =
window.__RUNTIME_CONFIG__?.IS_CLOUD === 'true' || import.meta.env.VITE_IS_CLOUD === 'true';
+export const IS_DISABLE_CLOUD_NOTICE =
+ window.__RUNTIME_CONFIG__?.IS_DISABLE_CLOUD_NOTICE === 'true' ||
+ import.meta.env.VITE_IS_DISABLE_CLOUD_NOTICE === 'true';
+
export const CLOUD_PRICE_PER_GB_CENTS = Number(
window.__RUNTIME_CONFIG__?.CLOUD_PRICE_PER_GB || import.meta.env.VITE_CLOUD_PRICE_PER_GB || '0',
);
diff --git a/frontend/src/features/backups/model/restoreVerificationStatus.ts b/frontend/src/features/backups/model/restoreVerificationStatus.ts
index e68237b7..b06190d0 100644
--- a/frontend/src/features/backups/model/restoreVerificationStatus.ts
+++ b/frontend/src/features/backups/model/restoreVerificationStatus.ts
@@ -1,12 +1,25 @@
import { RestoreVerificationStatus } from '../../../entity/backups';
+interface RestoreVerificationBadgeStyle {
+ pillClasses: string;
+ dotClasses: string;
+}
+
// NOT_VERIFIED is intentionally absent: a lookup miss is how the UI decides to
// render no tag at all for backups that were never restore-verified.
-export const RESTORE_VERIFICATION_STATUS_COLORS: Partial<
- Record<RestoreVerificationStatus, string>
+export const RESTORE_VERIFICATION_STATUS_BADGE_STYLES: Partial<
+ Record<RestoreVerificationStatus, RestoreVerificationBadgeStyle>
> = {
- [RestoreVerificationStatus.VERIFIED_SUCCESSFUL]: 'green',
- [RestoreVerificationStatus.VERIFICATION_FAILED]: 'red',
+ [RestoreVerificationStatus.VERIFIED_SUCCESSFUL]: {
+ pillClasses:
+ 'bg-green-500/10 text-green-700 ring-green-500/30 dark:bg-green-500/15 dark:text-green-300 dark:ring-green-400/30',
+ dotClasses: 'bg-green-500 dark:bg-green-400',
+ },
+ [RestoreVerificationStatus.VERIFICATION_FAILED]: {
+ pillClasses:
+ 'bg-rose-500/10 text-rose-700 ring-rose-500/30 dark:bg-rose-500/15 dark:text-rose-300 dark:ring-rose-400/30',
+ dotClasses: 'bg-rose-500 dark:bg-rose-400',
+ },
};
export const RESTORE_VERIFICATION_STATUS_LABELS: Partial<
diff --git a/frontend/src/features/backups/ui/BackupsComponent.tsx b/frontend/src/features/backups/ui/BackupsComponent.tsx
index 3268e1cf..8704ec57 100644
--- a/frontend/src/features/backups/ui/BackupsComponent.tsx
+++ b/frontend/src/features/backups/ui/BackupsComponent.tsx
@@ -12,7 +12,7 @@ import {
SafetyOutlined,
SyncOutlined,
} from '@ant-design/icons';
-import { App, Button, Modal, Spin, Table, Tag, Tooltip } from 'antd';
+import { App, Button, Modal, Spin, Table, Tooltip } from 'antd';
import type { ColumnsType } from 'antd/es/table';
import dayjs from 'dayjs';
import { type JSX, useEffect, useRef, useState } from 'react';
@@ -35,7 +35,7 @@ import { getUserTimeFormat } from '../../../shared/time';
import { ConfirmationComponent } from '../../../shared/ui';
import { RestoresComponent } from '../../restores';
import {
- RESTORE_VERIFICATION_STATUS_COLORS,
+ RESTORE_VERIFICATION_STATUS_BADGE_STYLES,
RESTORE_VERIFICATION_STATUS_LABELS,
} from '../model/restoreVerificationStatus';
import { AgentRestoreComponent } from './AgentRestoreComponent';
@@ -60,16 +60,19 @@ const renderRestoreVerificationTag = (
return null;
}
- const color = RESTORE_VERIFICATION_STATUS_COLORS[status];
+ const badgeStyle = RESTORE_VERIFICATION_STATUS_BADGE_STYLES[status];
const label = RESTORE_VERIFICATION_STATUS_LABELS[status];
- if (!color || !label) {
+ if (!badgeStyle || !label) {
return null;
}
return (
- <Tag color={color} className="ml-2">
+ <span
+ className={`ml-3 inline-flex items-center gap-1.5 rounded-full px-2 py-0.5 text-xs font-medium whitespace-nowrap ring-1 ring-inset ${badgeStyle.pillClasses}`}
+ >
+ <span className={`h-1.5 w-1.5 rounded-full ${badgeStyle.dotClasses}`} />
{label}
- </Tag>
+ </span>
);
};
diff --git a/frontend/src/features/storages/ui/StoragesComponent.tsx b/frontend/src/features/storages/ui/StoragesComponent.tsx
index 534cb8d9..3f96ee4f 100644
--- a/frontend/src/features/storages/ui/StoragesComponent.tsx
+++ b/frontend/src/features/storages/ui/StoragesComponent.tsx
@@ -2,7 +2,7 @@ import { ExclamationCircleOutlined } from '@ant-design/icons';
import { Button, Modal, Spin } from 'antd';
import { useEffect, useState } from 'react';
-import { IS_CLOUD } from '../../../constants';
+import { IS_CLOUD, IS_DISABLE_CLOUD_NOTICE } from '../../../constants';
import { storageApi } from '../../../entity/storages';
import type { Storage } from '../../../entity/storages';
import type { UserProfile } from '../../../entity/users';
@@ -102,7 +102,7 @@ export const StoragesComponent = ({
>
{storages.length >= 5 && isCanManageStorages && addStorageButton}
- {!IS_CLOUD && (
+ {!IS_CLOUD && !IS_DISABLE_CLOUD_NOTICE && (
<div className="mb-3 rounded bg-yellow-50 p-3 shadow dark:bg-yellow-900/30">
<div className="mb-1 flex items-center gap-1.5 text-sm font-bold text-yellow-700 dark:text-yellow-400">
<ExclamationCircleOutlined />
diff --git a/frontend/src/features/storages/ui/edit/EditStorageComponent.tsx b/frontend/src/features/storages/ui/edit/EditStorageComponent.tsx
index c9727eeb..c554db75 100644
--- a/frontend/src/features/storages/ui/edit/EditStorageComponent.tsx
+++ b/frontend/src/features/storages/ui/edit/EditStorageComponent.tsx
@@ -2,7 +2,7 @@ import { ExclamationCircleOutlined, InfoCircleOutlined } from '@ant-design/icons
import { Button, Input, Select, Switch, Tooltip } from 'antd';
import { useEffect, useState } from 'react';
-import { IS_CLOUD } from '../../../../constants';
+import { IS_CLOUD, IS_DISABLE_CLOUD_NOTICE } from '../../../../constants';
import {
type Storage,
StorageType,
@@ -492,7 +492,7 @@ export function EditStorageComponent({
</div>
<div>
- {!IS_CLOUD && (
+ {!IS_CLOUD && !IS_DISABLE_CLOUD_NOTICE && (
<div className="mb-3 rounded bg-yellow-50 p-3 shadow dark:bg-yellow-900/30">
<div className="mb-1 flex items-center gap-1.5 text-sm font-bold text-yellow-700 dark:text-yellow-400">
<ExclamationCircleOutlined />
diff --git a/frontend/src/features/users/ui/AuthNavbarComponent.tsx b/frontend/src/features/users/ui/AuthNavbarComponent.tsx
index e95aff9b..86deb311 100644
--- a/frontend/src/features/users/ui/AuthNavbarComponent.tsx
+++ b/frontend/src/features/users/ui/AuthNavbarComponent.tsx
@@ -1,6 +1,6 @@
import { Tooltip } from 'antd';
-import { IS_CLOUD } from '../../../constants';
+import { IS_CLOUD, IS_DISABLE_CLOUD_NOTICE } from '../../../constants';
import { StarButtonComponent } from '../../../shared/ui/StarButtonComponent';
import { ThemeToggleComponent } from '../../../shared/ui/ThemeToggleComponent';
@@ -25,7 +25,7 @@ export function AuthNavbarComponent() {
</div>
<div className="mr-3 ml-auto hidden items-center gap-5 sm:flex">
- {!IS_CLOUD && (
+ {!IS_CLOUD && !IS_DISABLE_CLOUD_NOTICE && (
<Tooltip title="99.9% uptime, 2x backup copies">
<a
className="flex items-center gap-2 !text-black hover:opacity-80 dark:!text-gray-200"
@@ -42,7 +42,7 @@ export function AuthNavbarComponent() {
</Tooltip>
)}
- {!IS_CLOUD && (
+ {!IS_CLOUD && !IS_DISABLE_CLOUD_NOTICE && (
<a
className="!text-black hover:opacity-80 dark:!text-gray-200"
href="https://databasus.com/labs"
diff --git a/frontend/src/features/verification/agents/ui/VerificationAgentsComponent.tsx b/frontend/src/features/verification/agents/ui/VerificationAgentsComponent.tsx
index 323845c5..988e1ab4 100644
--- a/frontend/src/features/verification/agents/ui/VerificationAgentsComponent.tsx
+++ b/frontend/src/features/verification/agents/ui/VerificationAgentsComponent.tsx
@@ -11,7 +11,7 @@ import type { ColumnsType } from 'antd/es/table';
import dayjs from 'dayjs';
import { useCallback, useEffect, useRef, useState } from 'react';
-import { IS_CLOUD } from '../../../../constants';
+import { IS_CLOUD, IS_DISABLE_CLOUD_NOTICE } from '../../../../constants';
import {
type VerificationAgent,
verificationAgentApi,
@@ -378,7 +378,7 @@ export const VerificationAgentsComponent = () => {
</div>
<div className="flex items-center gap-2">
- {!IS_CLOUD && (
+ {!IS_CLOUD && !IS_DISABLE_CLOUD_NOTICE && (
<Button
size="small"
href="https://databasus.com/cloud"
diff --git a/frontend/src/widgets/main/MainScreenComponent.tsx b/frontend/src/widgets/main/MainScreenComponent.tsx
index 55f70a10..5cc80418 100644
--- a/frontend/src/widgets/main/MainScreenComponent.tsx
+++ b/frontend/src/widgets/main/MainScreenComponent.tsx
@@ -2,7 +2,7 @@ import { LoadingOutlined, MenuOutlined } from '@ant-design/icons';
import { App, Button, Spin, Tooltip } from 'antd';
import { useEffect, useState } from 'react';
-import { APP_VERSION, CONTAINER_ARCH, IS_CLOUD } from '../../constants';
+import { APP_VERSION, CONTAINER_ARCH, IS_CLOUD, IS_DISABLE_CLOUD_NOTICE } from '../../constants';
import { type DiskUsage, diskApi } from '../../entity/disk';
import {
type UserProfile,
@@ -212,7 +212,7 @@ export const MainScreenComponent = () => {
</div>
<div className="ml-auto hidden items-center gap-5 md:flex">
- {!IS_CLOUD && (
+ {!IS_CLOUD && !IS_DISABLE_CLOUD_NOTICE && (
<Tooltip title="99.9% uptime, 2x backup copies">
<a
className="flex items-center gap-2 !text-black hover:opacity-80 dark:!text-gray-200"
@@ -229,7 +229,7 @@ export const MainScreenComponent = () => {
</Tooltip>
)}
- {!IS_CLOUD && (
+ {!IS_CLOUD && !IS_DISABLE_CLOUD_NOTICE && (
<a
className="!text-black hover:opacity-80 dark:!text-gray-200"
href="https://databasus.com/labs"
diff --git a/frontend/src/widgets/main/SidebarComponent.tsx b/frontend/src/widgets/main/SidebarComponent.tsx
index 8f5f3e9f..a26253fe 100644
--- a/frontend/src/widgets/main/SidebarComponent.tsx
+++ b/frontend/src/widgets/main/SidebarComponent.tsx
@@ -2,7 +2,7 @@ import { CloseOutlined } from '@ant-design/icons';
import { Drawer, Tooltip } from 'antd';
import { useEffect } from 'react';
-import { IS_CLOUD } from '../../constants';
+import { IS_CLOUD, IS_DISABLE_CLOUD_NOTICE } from '../../constants';
import { type DiskUsage } from '../../entity/disk';
import { type UserProfile, UserRole } from '../../entity/users';
import { useIsMobile } from '../../shared/hooks';
@@ -204,7 +204,7 @@ export const SidebarComponent = ({
Community
</a>
- {!IS_CLOUD && (
+ {!IS_CLOUD && !IS_DISABLE_CLOUD_NOTICE && (
<a
className="block rounded text-sm font-medium !text-gray-700 hover:bg-gray-100 hover:!text-blue-600 dark:!text-gray-300 dark:hover:bg-gray-700"
href="https://databasus.com/cloud"