Updated cloud mode checks.

This commit is contained in:
Mike Cao 2025-09-22 13:09:07 -07:00
parent d8075764e2
commit 9897c725de
16 changed files with 23 additions and 81 deletions

View file

@ -18,7 +18,7 @@ export function UpdateNotice({ user, config }) {
!config?.updatesDisabled &&
!config?.privateMode &&
!pathname.includes('/share/') &&
!process.env.cloudUrl &&
!process.env.cloudMode &&
!dismissed;
const updateCheck = useCallback(() => {

View file

@ -11,7 +11,7 @@ export function AdminLayout({ children }: { children: ReactNode }) {
const { formatMessage, labels } = useMessages();
const { pathname } = useNavigation();
if (!user.isAdmin || process.env.cloudUrl) {
if (!user.isAdmin || process.env.cloudMode) {
return null;
}

View file

@ -2,7 +2,7 @@ import { Metadata } from 'next';
import { AdminLayout } from './AdminLayout';
export default function ({ children }) {
if (process.env.cloudUrl) {
if (process.env.cloudMode) {
return null;
}

View file

@ -139,7 +139,9 @@ export function LinkEditForm({
{formatMessage(labels.cancel)}
</Button>
)}
<FormSubmitButton isDisabled={false}>{formatMessage(labels.save)}</FormSubmitButton>
<FormSubmitButton isDisabled={false} isLoading={isPending}>
{formatMessage(labels.save)}
</FormSubmitButton>
</Row>
</>
);

View file

@ -2,7 +2,7 @@ import { Metadata } from 'next';
import { SettingsLayout } from './SettingsLayout';
export default function ({ children }) {
if (process.env.cloudUrl) {
if (process.env.cloudMode) {
return null;
}

View file

@ -114,10 +114,7 @@ export function CohortEditForm({
<Column>
<Label>{formatMessage(labels.filters)}</Label>
<FormField
name="parameters.filters"
rules={{ required: formatMessage(labels.required) }}
>
<FormField name="parameters.filters">
<FieldFilters websiteId={websiteId} exclude={['path', 'event']} />
</FormField>
</Column>

View file

@ -9,8 +9,7 @@ export async function GET(request: Request) {
}
return json({
cloudMode: !!process.env.CLOUD_URL,
cloudUrl: process.env.CLOUD_URL,
cloudMode: !!process.env.CLOUD_MODE,
faviconUrl: process.env.FAVICON_URL,
linksUrl: process.env.LINKS_URL,
pixelsUrl: process.env.PIXELS_URL,

View file

@ -2,7 +2,7 @@ import { Metadata } from 'next';
import { LoginPage } from './LoginPage';
export default async function () {
if (process.env.DISABLE_LOGIN) {
if (process.env.DISABLE_LOGIN || process.env.CLOUD_MODE) {
return null;
}

View file

@ -1,8 +1,8 @@
import { LogoutPage } from './LogoutPage';
import { Metadata } from 'next';
import { LogoutPage } from './LogoutPage';
export default function () {
if (process.env.DISABLE_LOGIN) {
if (process.env.DISABLE_LOGIN || process.env.CLOUD_MODE) {
return null;
}