Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/doc/openapi.json

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion view/app/dashboard/hooks/use-smtp-banner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ export default function useSmtpBanner() {
};

const handleConfigure = () => {
router.push('/settings/notifications');
// TODO: Re-enable when notifications feature is working
// router.push('/settings/notifications');
// Temporarily disabled - redirect to general settings instead
router.push('/settings/general');
};

return {
Expand Down
18 changes: 11 additions & 7 deletions view/app/dashboard/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ import NetworkWidget from './components/system/network';
// TODO: Add weather widget back in with configuration for api key
// import WeatherWidget from './components/system/weather';
import { useTranslation } from '@/hooks/use-translation';
import { SMTPBanner } from './components/smtp-banner';
// TODO: Re-enable SMTP banner when notifications feature is working
// import { SMTPBanner } from './components/smtp-banner';
import DisabledFeature from '@/components/features/disabled-feature';
import { Button } from '@/components/ui/button';
import { useRouter } from 'next/navigation';
Expand All @@ -34,7 +35,8 @@ function DashboardPage() {
isDashboardEnabled,
containersData,
systemStats,
smtpConfig,
// TODO: Re-enable when SMTP banner is working
// smtpConfig,
showDragHint,
mounted,
layoutResetKey,
Expand Down Expand Up @@ -108,7 +110,8 @@ function DashboardPage() {
availableWidgets={availableWidgets}
/>
<DragHintBanner mounted={mounted} showDragHint={showDragHint} onDismiss={dismissHint} />
<SMTPBannerConditional hasSMTPConfig={!!smtpConfig} />
{/* TODO: Re-enable SMTP banner when notifications feature is working */}
{/* <SMTPBannerConditional hasSMTPConfig={!!smtpConfig} /> */}
<MonitoringSection
systemStats={systemStats}
containersData={containersData}
Expand Down Expand Up @@ -189,10 +192,11 @@ const DragHintBanner = ({
);
};

const SMTPBannerConditional = ({ hasSMTPConfig }: { hasSMTPConfig: boolean }) => {
if (hasSMTPConfig) return null;
return <SMTPBanner />;
};
// TODO: Re-enable SMTP banner when notifications feature is working
// const SMTPBannerConditional = ({ hasSMTPConfig }: { hasSMTPConfig: boolean }) => {
// if (hasSMTPConfig) return null;
// return <SMTPBanner />;
// };

const MonitoringSection = ({
systemStats,
Expand Down
10 changes: 10 additions & 0 deletions view/app/settings/domains/page.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// TODO: Re-enable domains page when feature is required
/*
'use client';
import DashboardPageHeader from '@/components/layout/dashboard-page-header';
import { Button } from '@/components/ui/button';
Expand Down Expand Up @@ -122,3 +124,11 @@ const NoDomainsFound = ({ onPressAddDomain }: NoDomainsFoundProps) => {
</div>
);
};
*/

// Temporary placeholder component
const Page = () => {
return null;
};

export default Page;
39 changes: 28 additions & 11 deletions view/app/settings/notifications/page.tsx
Original file line number Diff line number Diff line change
@@ -1,24 +1,40 @@
'use client';
import React from 'react';
import DashboardPageHeader from '@/components/layout/dashboard-page-header';
import NotificationPreferencesTab from './components/preferenceTab';
import NotificationChannelsTab from './components/channelTab';
import useNotificationSettings from '../hooks/use-notification-settings';
import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
import { useTranslation } from '@/hooks/use-translation';
import { SMTPFormData } from '@/redux/types/notification';
import { useFeatureFlags } from '@/hooks/features_provider';
import Skeleton from '@/app/file-manager/components/skeleton/Skeleton';
import DisabledFeature from '@/components/features/disabled-feature';
import { FeatureNames } from '@/types/feature-flags';
import { ResourceGuard } from '@/components/rbac/PermissionGuard';
import PageLayout from '@/components/layout/page-layout';
// TODO: Re-enable notifications when feature is working
// import NotificationPreferencesTab from './components/preferenceTab';
// import NotificationChannelsTab from './components/channelTab';
// import useNotificationSettings from '../hooks/use-notification-settings';
// import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
// import { useTranslation } from '@/hooks/use-translation';
// import { SMTPFormData } from '@/redux/types/notification';
// import { useFeatureFlags } from '@/hooks/features_provider';
// import Skeleton from '@/app/file-manager/components/skeleton/Skeleton';
// import DisabledFeature from '@/components/features/disabled-feature';
// import { FeatureNames } from '@/types/feature-flags';
// import { ResourceGuard } from '@/components/rbac/PermissionGuard';

export type NotificationChannelConfig = {
[key: string]: string;
};

const Page: React.FC = () => {
// TODO: Re-enable notifications when feature is working
// Temporarily disabled - notifications feature is not working
return (
<PageLayout maxWidth="6xl" padding="md" spacing="lg">
<DashboardPageHeader
label="Notifications"
description="Notifications feature is temporarily disabled"
/>
<div className="text-center py-8 text-muted-foreground">
Notifications feature is currently disabled. This will be re-enabled in a future update.
</div>
</PageLayout>
);

/* COMMENTED OUT - Re-enable when notifications feature is working
const { t } = useTranslation();
const {
smtpConfigs,
Expand Down Expand Up @@ -128,6 +144,7 @@ const Page: React.FC = () => {
</PageLayout>
</ResourceGuard>
);
*/
};

export default Page;
22 changes: 12 additions & 10 deletions view/hooks/use-app-sidebar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,23 @@ const data = {
url: '/settings/general',
resource: 'settings'
},
{
title: 'navigation.notifications',
url: '/settings/notifications',
resource: 'notification'
},
// TODO: Re-enable notifications when feature is working
// {
// title: 'navigation.notifications',
// url: '/settings/notifications',
// resource: 'notification'
// },
{
title: 'navigation.team',
url: '/settings/teams',
resource: 'organization'
},
{
title: 'navigation.domains',
url: '/settings/domains',
resource: 'domain'
}
// TODO: Re-enable domains when feature is required
// {
// title: 'navigation.domains',
// url: '/settings/domains',
// resource: 'domain'
// }
]
}
]
Expand Down
Loading