Compare commits

..

77 Commits

Author SHA1 Message Date
Hassan Ben Jobrane
ac3f12c878 Merge pull request #2211 from nhost/changeset-release/main
chore: update versions
2023-08-31 12:29:34 +01:00
github-actions[bot]
65cabb089f chore: update versions 2023-08-31 11:01:17 +00:00
Hassan Ben Jobrane
2905beb0a1 Merge pull request #2212 from nhost/fix/hasura-storage-js-edge-runtime
fix(hasura-storage-js): swap fetch when running on edge runtime
2023-08-31 11:58:43 +01:00
Hassan Ben Jobrane
83fee54460 chore: add changeset 2023-08-31 11:11:44 +01:00
Hassan Ben Jobrane
82898b6dae fix(hasura-storage-js): swap fetch when running on edge runtime 2023-08-31 11:09:37 +01:00
Hassan Ben Jobrane
500f76a38d Merge pull request #2208 from nhost/fix/user-auth-locales
fix: remove hardcoded locales
2023-08-30 10:31:43 +01:00
Hassan Ben Jobrane
5e1e80aa8b chore: add changeset 2023-08-29 20:05:29 +01:00
Hassan Ben Jobrane
6d0a126907 fix: remove hardcoded locales 2023-08-29 13:32:12 +01:00
Hassan Ben Jobrane
1b7dcf2121 Merge pull request #2207 from nhost/changeset-release/main
chore: update versions
2023-08-28 16:40:51 +01:00
github-actions[bot]
2b9205b6cf chore: update versions 2023-08-28 15:16:01 +00:00
Hassan Ben Jobrane
bdc4d4a88c Merge pull request #2206 from nhost/fix/stripe-graphql-js
fix(stripe-graphql-js): fix stripe GraphQL extension export issue in serverless functions
2023-08-28 16:12:13 +01:00
Hassan Ben Jobrane
45759c4d4c chore: add changeset 2023-08-28 15:49:17 +01:00
Hassan Ben Jobrane
5f9886577a fix: import 2023-08-28 15:47:49 +01:00
Hassan Ben Jobrane
fa65496327 fix(stripe-extension): return yoga instance instead of node http server 2023-08-28 15:24:56 +01:00
Hassan Ben Jobrane
03777680c1 chore: add STRIPE_SECRET_KEY 2023-08-26 16:51:31 +01:00
Hassan Ben Jobrane
72c81207ff Merge pull request #2201 from nhost/chore/add-missing-changeset
chore: add missing changeset
2023-08-24 16:47:41 +01:00
Hassan Ben Jobrane
5ca2a394e8 chore: sync version in package.json 2023-08-24 16:30:18 +01:00
Hassan Ben Jobrane
e63b8da58a chore: add missing changeset 2023-08-24 16:27:38 +01:00
Hassan Ben Jobrane
bf8543cd34 Merge pull request #2195 from nhost/changeset-release/main
chore: update versions
2023-08-24 13:57:34 +01:00
github-actions[bot]
8a557bbd02 chore: update versions 2023-08-24 12:21:34 +00:00
Hassan Ben Jobrane
327e30b859 Merge pull request #2200 from nhost/chore/ignore-version-update-sveltekit-example
chore: sveltekit-example: changeset ignore dep version update
2023-08-24 13:18:25 +01:00
Hassan Ben Jobrane
bbfaf9732b chore: sveltekit-example: ignore changeset dep version update 2023-08-24 12:44:16 +01:00
Hassan Ben Jobrane
c064a53256 Merge pull request #2199 from nhost/chore/fix-dep-version
chore: fix dep version for sveltekit example
2023-08-24 12:03:57 +01:00
Hassan Ben Jobrane
ebda86f1f0 chore: sync lockfile 2023-08-24 11:53:41 +01:00
Hassan Ben Jobrane
8948be9d3d chore: fix dep version for sveltekit example 2023-08-24 11:50:47 +01:00
Hassan Ben Jobrane
54e9b141f1 Merge pull request #2191 from nhost/dbarroso/react-example
chore: react-apollo-example: add profile to allowedUrls
2023-08-24 10:56:45 +01:00
Hassan Ben Jobrane
dba71483df chore: add changeset 2023-08-24 10:41:58 +01:00
Hassan Ben Jobrane
77ef68232a Merge pull request #2197 from nhost/fix/webauthn-error-handling
fix(hasura-auth-js): make sure CodifiedError works on non v8 browsers
2023-08-24 10:26:46 +01:00
Hassan Ben Jobrane
8fbc7f9f95 Merge pull request #2198 from nhost/chore/remove-facebook-login
chore(react-apollo-example): remove facebook login
2023-08-24 10:26:31 +01:00
Hassan Ben Jobrane
ca9f0f6ae9 chore: show error toast when adding a security key fails 2023-08-23 23:48:45 +01:00
Hassan Ben Jobrane
e819903f1b chore: add changeset 2023-08-23 17:00:30 +01:00
Hassan Ben Jobrane
f780b17581 chore: remove facebook login from react apollo example 2023-08-23 16:59:44 +01:00
Hassan Ben Jobrane
032c0bd217 chore: add changeset 2023-08-23 16:51:14 +01:00
Hassan Ben Jobrane
5d278709cb fix(hasura-auth-js): make sure CodifiedError works on non v8 browsers 2023-08-23 16:25:57 +01:00
Hassan Ben Jobrane
3a012e089a Merge pull request #2182 from nhost/feat/add-sveltekit-example
feat: add sveltekit example
2023-08-23 12:14:38 +01:00
Hassan Ben Jobrane
7aed620e12 chore: fix tests 2023-08-23 11:39:29 +01:00
Hassan Ben Jobrane
d9fd1a54a5 Merge pull request #2192 from nhost/changeset-release/main
chore: update versions
2023-08-23 11:19:48 +01:00
github-actions[bot]
a19b85c8ac chore: update versions 2023-08-23 09:45:31 +00:00
Hassan Ben Jobrane
4e1aaca0ee Merge pull request #2194 from nhost/feat/toggle-av
feat: toggle av
2023-08-23 10:42:20 +01:00
Hassan Ben Jobrane
34ef37cdce Merge pull request #2190 from dddenis/fix/storage-upload-status-error
fix(hasura-storage-js): fix upload response status code check
2023-08-23 10:40:29 +01:00
Hassan Ben Jobrane
5d6b655cb1 fix: make sure AV turns off correctly 2023-08-23 01:40:01 +01:00
Hassan Ben Jobrane
074a0fa111 chore: add changeset 2023-08-22 18:32:34 +01:00
Hassan Ben Jobrane
403d839fca chore: cleanup 2023-08-22 18:30:26 +01:00
Hassan Ben Jobrane
4e3098240b feat(settings): add toggle av settings 2023-08-22 18:28:27 +01:00
Hassan Ben Jobrane
dd0a5cf3c1 chore: fix lock file 2023-08-22 16:55:28 +01:00
Hassan Ben Jobrane
5187fd3a4b chore: dashboard tests 2023-08-22 16:49:26 +01:00
Hassan Ben Jobrane
d8dfd6bf80 Revert "chore: add missing dep for vitest"
This reverts commit 6ea6ad61db.
2023-08-22 16:16:20 +01:00
Hassan Ben Jobrane
6ea6ad61db chore: add missing dep for vitest 2023-08-22 16:04:24 +01:00
Hassan Ben Jobrane
fd0b904ed4 chore: fix dashboard e2e tests 2023-08-22 15:41:36 +01:00
Hassan Ben Jobrane
8989e314a6 fix: ignore conflict with linting and sveltekit build 2023-08-22 14:40:18 +01:00
Hassan Ben Jobrane
5b5a1219c5 fix: make sure linting runs correctly 2023-08-22 14:31:45 +01:00
Hassan Ben Jobrane
07fda9bbb3 Merge pull request #2193 from nhost/fix/distinguish-not-uploaded-files
fix: grey out not uploaded files
2023-08-22 13:11:52 +01:00
Hassan Ben Jobrane
2fa828fef1 chore: cleanup .gitignore file 2023-08-22 13:10:59 +01:00
Hassan Ben Jobrane
d5ec69ac37 chore(examples-sveltekit): add a basic test 2023-08-22 13:07:06 +01:00
Hassan Ben Jobrane
4a7ede11e9 chore: add changeset 2023-08-22 11:33:42 +01:00
Hassan Ben Jobrane
482ae4c4f1 fix: grey not uploaded files 2023-08-22 11:25:23 +01:00
Denis Goncharenko
08fe4cd65f fix(hasura-storage-js): update upload response error details 2023-08-22 11:34:41 +02:00
Hassan Ben Jobrane
5781721bca Merge pull request #2188 from nhost/feat/one-click-run-service
feat: add support for template run services
2023-08-22 10:18:54 +01:00
Denis Goncharenko
39de0063bf chore: add changeset 2023-08-21 20:49:56 +02:00
Hassan Ben Jobrane
202b647234 chore: add changeset 2023-08-21 15:45:43 +01:00
Hassan Ben Jobrane
51c163a268 fix: copy complete link to config 2023-08-21 15:43:46 +01:00
Hassan Ben Jobrane
6e802c9938 fix: handle the case where the config is not set in the URL 2023-08-21 13:38:38 +01:00
Hassan Ben Jobrane
9a46104e37 feat: replace project selector with a searchable list 2023-08-21 13:26:27 +01:00
Hassan Ben Jobrane
655b317c39 fix: keep image field when copying config to clipboard 2023-08-21 13:25:57 +01:00
Hassan Ben Jobrane
d3ad7c9d4a fix: handle error when navigating back when service form is still open 2023-08-21 13:25:01 +01:00
David Barroso
09fc852c3a asd 2023-08-21 13:13:41 +02:00
Hassan Ben Jobrane
ece08d3efd feat: add ability to copy current service config from the editor 2023-08-21 10:47:54 +01:00
Hassan Ben Jobrane
3493442c2d fix: fix command import when value is null 2023-08-21 10:47:26 +01:00
Denis Goncharenko
632a79b9e4 fix(hasura-storage-js): fix upload response status code check 2023-08-20 14:15:24 +02:00
Hassan Ben Jobrane
4a4d85757a fix: use serviceId to determine whether to create or update service 2023-08-19 19:33:45 +01:00
Hassan Ben Jobrane
88a01004b7 feat: parse base64 encoded config from query param 2023-08-19 18:50:46 +01:00
David Barroso
73230eb35a chore: fix and deploy react example (#2183) 2023-08-19 07:57:42 +02:00
Hassan Ben Jobrane
27e1c90624 fix: change env to dynamic 2023-08-18 18:26:09 +01:00
Hassan Ben Jobrane
1cc53d550a chore: add changeset 2023-08-18 18:04:12 +01:00
Hassan Ben Jobrane
22d3f71e02 fix: make sure to include lib folder in sveltekit example 2023-08-18 17:58:29 +01:00
Hassan Ben Jobrane
010b816866 chore: fix README 2023-08-18 17:36:10 +01:00
Hassan Ben Jobrane
4a6e62e673 feat: add sveltekit example 2023-08-18 17:16:13 +01:00
87 changed files with 3303 additions and 150 deletions

View File

@@ -6,5 +6,5 @@
"access": "restricted",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": []
}
"ignore": ["@nhost-examples/sveltekit"]
}

3
.gitignore vendored
View File

@@ -19,10 +19,8 @@ logs/
coverage/
dist/
umd/
lib/
node_modules/
tmp/
.docz/
.pnpm-store
.turbo
.env
@@ -32,7 +30,6 @@ out/
# Custom
*.min.js
*.map
todo.md
# Config files that are not part of the repository root anymore. Should be removed in the future.
/.eslintignore

View File

@@ -1,5 +1,30 @@
# @nhost/dashboard
## 0.20.9
### Patch Changes
- 5e1e80aa8: fix(dashboard): show correct locales in user details
- @nhost/react-apollo@5.0.35
- @nhost/nextjs@1.13.37
## 0.20.8
### Patch Changes
- @nhost/react-apollo@5.0.34
- @nhost/nextjs@1.13.36
## 0.20.7
### Patch Changes
- 4a7ede11e: fix: distinguish files that were not uploaded
- 202b64723: feat(nhost-run): add support for one-click-install run services
- 074a0fa11: feat(dashboard): add settings toggle to enable/disable antivirus
- @nhost/react-apollo@5.0.33
- @nhost/nextjs@1.13.35
## 0.20.6
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/dashboard",
"version": "0.20.6",
"version": "0.20.9",
"private": true,
"scripts": {
"preinstall": "npx only-allow pnpm",
@@ -106,6 +106,7 @@
"@testing-library/user-event": "^14.4.3",
"@types/ace": "^0.0.48",
"@types/bcryptjs": "^2.4.2",
"@types/jest": "^29.5.3",
"@types/lodash.debounce": "^4.0.7",
"@types/node": "^16.11.7",
"@types/pluralize": "^0.0.30",

View File

@@ -2,7 +2,6 @@ import { Button } from '@/components/ui/v2/Button';
import { ArrowRightIcon } from '@/components/ui/v2/icons/ArrowRightIcon';
import { XIcon } from '@/components/ui/v2/icons/XIcon';
import { Text } from '@/components/ui/v2/Text';
import Link from 'next/link';
import { forwardRef, type ForwardedRef } from 'react';
import { twMerge } from 'tailwind-merge';
import AnnouncementContainer, {
@@ -28,7 +27,7 @@ function Announcement(
<AnnouncementContainer
{...props}
ref={ref}
className="grid justify-between grid-flow-col gap-4"
className="grid grid-flow-col justify-between gap-4"
slotProps={{
root: {
...(slotProps?.root || {}),
@@ -39,12 +38,12 @@ function Announcement(
<span />
<div className="flex items-center self-center truncate">
<Link href={href}>
<Text className="truncate cursor-pointer hover:underline">
<a href={href}>
<Text className="cursor-pointer truncate hover:underline">
{children}
</Text>
</Link>
<ArrowRightIcon className="w-4 h-4 ml-1 text-white" />
</a>
<ArrowRightIcon className="ml-1 h-4 w-4 text-white" />
</div>
<Button
@@ -52,9 +51,9 @@ function Announcement(
onClick={onClose}
aria-label="Close announcement"
size="small"
className="p-1 rounded-sm"
className="rounded-sm p-1"
>
<XIcon className="w-4 h-4 opacity-65" />
<XIcon className="opacity-65 h-4 w-4" />
</Button>
</AnnouncementContainer>
);

View File

@@ -178,6 +178,22 @@ export default function DataGridBody<T extends object>({
}
}
const getBackgroundCellColor = (
row: Row<T>,
column: DataBrowserGridColumn<T>,
) => {
// Grey out files not uploaded
if (!row.values.isUploaded) {
return 'grey.200';
}
if (column.isDisabled) {
return 'grey.100';
}
return 'background.paper';
};
return (
<div {...getTableBodyProps()} ref={bodyRef} {...props}>
{rows.length === 0 && !loading && (
@@ -260,9 +276,7 @@ export default function DataGridBody<T extends object>({
})}
cell={cell}
sx={{
backgroundColor: column.isDisabled
? 'grey.100'
: 'background.paper',
backgroundColor: getBackgroundCellColor(row, column),
color: isCellDisabled ? 'text.secondary' : 'text.primary',
}}
className={twMerge(

View File

@@ -38,6 +38,10 @@ query GetAuthenticationSettings($appId: uuid!) {
default
rating
}
locale {
allowed
default
}
}
version
}

View File

@@ -24,6 +24,7 @@ import { copy } from '@/utils/copy';
import { getServerError } from '@/utils/getServerError';
import {
RemoteAppGetUsersDocument,
useGetProjectLocalesQuery,
useGetRolesPermissionsQuery,
useUpdateRemoteAppUserMutation,
} from '@/utils/__generated__/graphql';
@@ -146,6 +147,14 @@ export default function EditUserForm({
dataRoles?.config?.auth?.user?.roles?.allowed,
);
const { data } = useGetProjectLocalesQuery({
variables: {
appId: currentProject?.id,
},
});
const allowedLocales = data?.config?.auth?.user?.locale?.allowed || [];
/**
* This will change the `disabled` field in the user to its opposite.
* If the user is disabled, it will be enabled and vice versa.
@@ -374,12 +383,11 @@ export default function EditUserForm({
error={!!errors.locale}
helperText={errors?.locale?.message}
>
<Option key="en" value="en">
en
</Option>
<Option key="fr" value="fr">
fr
</Option>
{allowedLocales.map((locale) => (
<Option key={locale} value={locale}>
{locale}
</Option>
))}
</ControlledSelect>
</Box>
<Box

View File

@@ -2,8 +2,9 @@ import permissionVariablesQuery from '@/tests/msw/mocks/graphql/permissionVariab
import hasuraMetadataQuery from '@/tests/msw/mocks/rest/hasuraMetadataQuery';
import tableQuery from '@/tests/msw/mocks/rest/tableQuery';
import { render, screen } from '@/tests/testUtils';
import '@testing-library/jest-dom';
import { setupServer } from 'msw/node';
import { test, vi } from 'vitest';
import { afterAll, afterEach, beforeAll, test, vi } from 'vitest';
import ColumnAutocomplete from './ColumnAutocomplete';
const server = setupServer(

View File

@@ -0,0 +1 @@
export { default as useHostName } from './useHostName';

View File

@@ -0,0 +1,12 @@
import { useEffect, useState } from 'react';
export default function useHostName() {
const [hostName, setHostName] = useState('');
useEffect(() => {
const { port, hostname, protocol } = window.location;
setHostName(`${protocol}//${hostname}:${port}`);
}, []);
return hostName;
}

View File

@@ -1,4 +1,5 @@
import type { PermissionVariable } from '@/types/application';
import { expect, test } from 'vitest';
import getAllPermissionVariables from './getAllPermissionVariables';
test('should convert permission variable object to array', () => {

View File

@@ -1,4 +1,4 @@
import { test } from 'vitest';
import { expect, test } from 'vitest';
import getAllocatedResources from './getAllocatedResources';
test('should return the total number of allocated resources', () => {

View File

@@ -3,11 +3,14 @@ import { Form } from '@/components/form/Form';
import { Alert } from '@/components/ui/v2/Alert';
import { Box } from '@/components/ui/v2/Box';
import { Button } from '@/components/ui/v2/Button';
import { CopyIcon } from '@/components/ui/v2/icons/CopyIcon';
import { InfoIcon } from '@/components/ui/v2/icons/InfoIcon';
import { PlusIcon } from '@/components/ui/v2/icons/PlusIcon';
import { Input } from '@/components/ui/v2/Input';
import { Text } from '@/components/ui/v2/Text';
import { Tooltip } from '@/components/ui/v2/Tooltip';
import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
import { useHostName } from '@/features/projects/common/hooks/useHostName';
import { InfoCard } from '@/features/projects/overview/components/InfoCard';
import {
COST_PER_VCPU,
@@ -25,6 +28,7 @@ import { StorageFormSection } from '@/features/services/components/ServiceForm/c
import type { DialogFormProps } from '@/types/common';
import { RESOURCE_VCPU_MULTIPLIER } from '@/utils/constants/common';
import { getToastStyleProps } from '@/utils/constants/settings';
import { copy } from '@/utils/copy';
import {
useInsertRunServiceConfigMutation,
useInsertRunServiceMutation,
@@ -109,6 +113,7 @@ export default function ServiceForm({
onCancel,
location,
}: ServiceFormProps) {
const hostName = useHostName();
const { onDirtyStateChange, openDialog, closeDialog } = useDialog();
const [insertRunService] = useInsertRunServiceMutation();
const { currentProject } = useCurrentWorkspaceAndProject();
@@ -146,7 +151,7 @@ export default function ServiceForm({
onDirtyStateChange(isDirty, location);
}, [isDirty, location, onDirtyStateChange]);
const createOrUpdateService = async (values: ServiceFormValues) => {
const getFormattedConfig = (values: ServiceFormValues) => {
const config: ConfigRunServiceConfigInsertInput = {
name: values.name,
image: {
@@ -176,7 +181,13 @@ export default function ServiceForm({
})),
};
if (initialData) {
return config;
};
const createOrUpdateService = async (values: ServiceFormValues) => {
const config = getFormattedConfig(values);
if (serviceID) {
// Update service config
await replaceRunServiceConfig({
variables: {
@@ -278,6 +289,16 @@ export default function ServiceForm({
return `Approximate cost for ${details}`;
};
const copyConfig = () => {
const config = getFormattedConfig(formValues);
const base64Config = btoa(JSON.stringify(config));
const link = `${hostName}/run-one-click-install?config=${base64Config}`;
copy(link, 'Service Config');
};
return (
<FormProvider {...form}>
<Form
@@ -427,9 +448,24 @@ export default function ServiceForm({
</Alert>
)}
<div className="grid grid-flow-row gap-2">
<Button type="submit" disabled={isSubmitting}>
{initialData ? 'Update' : 'Create'}
</Button>
<div className="grid grid-cols-2 gap-2">
<Button
type="submit"
disabled={isSubmitting}
startIcon={<PlusIcon />}
>
{serviceID ? 'Update' : 'Create'}
</Button>
<Button
color="secondary"
variant="outlined"
disabled={isSubmitting}
onClick={copyConfig}
startIcon={<CopyIcon />}
>
Copy one-click install link
</Button>
</div>
<Button variant="outlined" color="secondary" onClick={onCancel}>
Cancel

View File

@@ -45,7 +45,7 @@ export default function PortsFormSection() {
const port = Number(_port) > 0 ? Number(_port) : '[port]';
const name = _name && _name.length > 0 ? _name : '[name]';
return `https://${currentProject.subdomain}-${name}-${port}.svc.${currentProject.region.awsName}.${currentProject.region.domain}`;
return `https://${currentProject?.subdomain}-${name}-${port}.svc.${currentProject?.region.awsName}.${currentProject?.region.domain}`;
};
return (

View File

@@ -0,0 +1,121 @@
import { useUI } from '@/components/common/UIProvider';
import { Form } from '@/components/form/Form';
import { SettingsContainer } from '@/components/layout/SettingsContainer';
import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
import {
GetHasuraSettingsDocument,
useGetStorageSettingsQuery,
useUpdateConfigMutation,
} from '@/generated/graphql';
import { getToastStyleProps } from '@/utils/constants/settings';
import { getServerError } from '@/utils/getServerError';
import { yupResolver } from '@hookform/resolvers/yup';
import { FormProvider, useForm } from 'react-hook-form';
import { toast } from 'react-hot-toast';
import * as Yup from 'yup';
const validationSchema = Yup.object({
enabled: Yup.boolean(),
});
export type HasuraStorageAVFormValues = Yup.InferType<typeof validationSchema>;
export default function HasuraStorageAVSettings() {
const { maintenanceActive } = useUI();
const { currentProject, refetch: refetchWorkspaceAndProject } =
useCurrentWorkspaceAndProject();
const [updateConfig] = useUpdateConfigMutation({
refetchQueries: [GetHasuraSettingsDocument],
});
const { data, loading, error } = useGetStorageSettingsQuery({
variables: { appId: currentProject?.id },
fetchPolicy: 'cache-first',
});
const { server } = data?.config?.storage?.antivirus || {};
const form = useForm<HasuraStorageAVFormValues>({
reValidateMode: 'onSubmit',
defaultValues: {
enabled: !!server,
},
resolver: yupResolver(validationSchema),
});
if (loading) {
return (
<ActivityIndicator
delay={1000}
label="Loading AV settings..."
className="justify-center"
/>
);
}
if (error) {
throw error;
}
async function handleSubmit(formValues: HasuraStorageAVFormValues) {
let antivirus = null;
if (formValues.enabled) {
antivirus = {
server: 'tcp://run-clamav:3310',
};
}
const updateConfigPromise = updateConfig({
variables: {
appId: currentProject.id,
config: {
storage: {
antivirus,
},
},
},
});
try {
await toast.promise(
updateConfigPromise,
{
loading: `Antivirus settings are being updated...`,
success: `Antivirus settings have been updated successfully.`,
error: getServerError(
`An error occurred while trying to update Antivirus settings.`,
),
},
getToastStyleProps(),
);
form.reset(formValues);
await refetchWorkspaceAndProject();
} catch {
// Note: The toast will handle the error.
}
}
return (
<FormProvider {...form}>
<Form onSubmit={handleSubmit}>
<SettingsContainer
title="Antivirus"
description="Enable or disable Antivirus."
slotProps={{
submitButton: {
disabled: !form.formState.isDirty || maintenanceActive,
loading: form.formState.isSubmitting,
},
}}
switchId="enabled"
docsTitle="enabling or disabling Antivirus"
showSwitch
className="hidden"
/>
</Form>
</FormProvider>
);
}

View File

@@ -0,0 +1,2 @@
export * from './HasuraStorageAVSettings';
export { default as HasuraStorageAVSettings } from './HasuraStorageAVSettings';

View File

@@ -4,6 +4,9 @@ query GetStorageSettings($appId: uuid!) {
__typename
storage {
version
antivirus {
server
}
}
}
}

View File

@@ -0,0 +1,12 @@
query getProjectLocales($appId: uuid!) {
config(appID: $appId, resolve: true) {
auth {
user {
locale {
allowed
default
}
}
}
}
}

View File

@@ -13,20 +13,35 @@ import type { GetRunServicesQuery } from '@/utils/__generated__/graphql';
import { useGetRunServicesQuery } from '@/utils/__generated__/graphql';
import { UpgradeNotification } from '@/features/projects/common/components/UpgradeNotification';
import { ServiceForm } from '@/features/services/components/ServiceForm';
import {
ServiceForm,
type PortTypes,
} from '@/features/services/components/ServiceForm';
import ServicesList from '@/features/services/components/ServicesList/ServicesList';
import { useRouter } from 'next/router';
import { useEffect, useMemo, useRef, useState, type ReactElement } from 'react';
import {
useCallback,
useEffect,
useMemo,
useRef,
useState,
type ReactElement,
} from 'react';
export type RunService = Omit<
GetRunServicesQuery['app']['runServices'][0],
'__typename'
>;
export type RunServiceConfig = Omit<
GetRunServicesQuery['app']['runServices'][0]['config'],
'__typename'
>;
export default function ServicesPage() {
const limit = useRef(25);
const router = useRouter();
const { openDrawer } = useDialog();
const { openDrawer, openAlertDialog } = useDialog();
const { currentProject } = useCurrentWorkspaceAndProject();
const isPlanFree = currentProject.plan.isFree;
@@ -66,6 +81,63 @@ export default function ServicesPage() {
[data],
);
const checkConfigFromQuery = useCallback(
(base64Config: string) => {
if (router.query?.config) {
try {
const decodedConfig = atob(base64Config);
const parsedConfig: RunServiceConfig = JSON.parse(decodedConfig);
openDrawer({
title: (
<Box className="flex flex-row items-center space-x-2">
<CubeIcon className="h-5 w-5" />
<Text>Create a new run service</Text>
</Box>
),
component: (
<ServiceForm
initialData={{
...parsedConfig,
compute: parsedConfig?.resources?.compute ?? {
cpu: 62,
memory: 128,
},
image: parsedConfig?.image?.image,
command: parsedConfig?.command?.join(' '),
ports: parsedConfig?.ports.map((item) => ({
port: item.port,
type: item.type as PortTypes,
publish: item.publish,
})),
replicas: parsedConfig?.resources?.replicas,
storage: parsedConfig?.resources?.storage,
}}
onSubmit={refetchServices}
/>
),
});
} catch (error) {
openAlertDialog({
title: 'Configuration not set properly',
payload: 'The service configuration was not properly encoded',
props: {
primaryButtonText: 'Ok',
hideSecondaryAction: true,
},
});
}
}
},
[router.query.config, openDrawer, refetchServices, openAlertDialog],
);
useEffect(() => {
if (router.query?.config) {
checkConfigFromQuery(router.query?.config as string);
}
}, [checkConfigFromQuery, router.query]);
const openCreateServiceDialog = () => {
openDrawer({
title: (

View File

@@ -3,6 +3,7 @@ import { SettingsLayout } from '@/components/layout/SettingsLayout';
import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
import { useCurrentWorkspaceAndProject } from '@/features/projects/common/hooks/useCurrentWorkspaceAndProject';
import { StorageServiceVersionSettings } from '@/features/storage/settings/components/HasuraServiceVersionSettings';
import { HasuraStorageAVSettings } from '@/features/storage/settings/components/HasuraStorageAVSettings';
import { useGetStorageSettingsQuery } from '@/utils/__generated__/graphql';
import type { ReactElement } from 'react';
@@ -34,6 +35,7 @@ export default function StorageSettingsPage() {
rootClassName="bg-transparent"
>
<StorageServiceVersionSettings />
<HasuraStorageAVSettings />
</Container>
);
}

View File

@@ -0,0 +1,218 @@
import { useDialog } from '@/components/common/DialogProvider';
import { AuthenticatedLayout } from '@/components/layout/AuthenticatedLayout';
import { Container } from '@/components/layout/Container';
import { RetryableErrorBoundary } from '@/components/presentational/RetryableErrorBoundary';
import { ActivityIndicator } from '@/components/ui/v2/ActivityIndicator';
import { Box } from '@/components/ui/v2/Box';
import { Button } from '@/components/ui/v2/Button';
import { Input } from '@/components/ui/v2/Input';
import { List } from '@/components/ui/v2/List';
import { ListItem } from '@/components/ui/v2/ListItem';
import { Text } from '@/components/ui/v2/Text';
import { InfoCard } from '@/features/projects/overview/components/InfoCard';
import {
useGetAllWorkspacesAndProjectsQuery,
type GetAllWorkspacesAndProjectsQuery,
} from '@/utils/__generated__/graphql';
import { Divider } from '@mui/material';
import { useUserData } from '@nhost/nextjs';
import debounce from 'lodash.debounce';
import Image from 'next/image';
import { useRouter } from 'next/router';
import type { ChangeEvent, ReactElement } from 'react';
import { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
type Workspace = Omit<
GetAllWorkspacesAndProjectsQuery['workspaces'][0],
'__typename'
>;
export default function SelectWorkspaceAndProject() {
const user = useUserData();
const router = useRouter();
const { openAlertDialog } = useDialog();
const { data, loading } = useGetAllWorkspacesAndProjectsQuery({
skip: !user,
});
const workspaces: Workspace[] = data?.workspaces || [];
const projects = workspaces.flatMap((workspace) =>
workspace.projects.map((project) => ({
workspaceName: workspace.name,
projectName: project.name,
value: `${workspace.slug}/${project.slug}`,
isFree: project.plan.isFree,
})),
);
const [filter, setFilter] = useState('');
const handleFilterChange = useMemo(
() =>
debounce((event: ChangeEvent<HTMLInputElement>) => {
setFilter(event.target.value);
}, 200),
[],
);
useEffect(() => () => handleFilterChange.cancel(), [handleFilterChange]);
const checkConfigFromQuery = useCallback(
(base64Config: string) => {
try {
JSON.parse(atob(base64Config));
} catch (error) {
openAlertDialog({
title: 'Configuration not set properly',
payload:
'Either the link is wrong or the configuration is not properly encoded',
props: {
primaryButtonText: 'Ok',
hideSecondaryAction: true,
onPrimaryAction: async () => {
await router.push('/');
},
},
});
}
},
[openAlertDialog, router],
);
useEffect(() => {
checkConfigFromQuery(router.query?.config as string);
}, [checkConfigFromQuery, router.query]);
const goToServices = async (project: {
workspaceName: string;
projectName: string;
value: string;
isFree: boolean;
}) => {
if (!project) {
openAlertDialog({
title: 'Please select a workspace and a project',
payload:
'You must select a workspace and a project before proceeding to create the run service',
props: {
primaryButtonText: 'Ok',
hideSecondaryAction: true,
},
});
return;
}
if (project.isFree) {
openAlertDialog({
title: 'The project must have a pro plan',
payload: 'Creating run services is only availabel for pro projects',
props: {
primaryButtonText: 'Ok',
hideSecondaryAction: true,
},
});
return;
}
await router.push({
pathname: `/${project.value}/services`,
// Keep the same query params that got us here
query: router.query,
});
};
const projectsToDisplay = filter
? projects.filter((project) =>
project.projectName.toLowerCase().includes(filter.toLowerCase()),
)
: projects;
if (loading) {
return (
<ActivityIndicator
delay={500}
label="Loading workspaces and projects..."
/>
);
}
return (
<Container>
<div className="mx-auto grid max-w-[760px] grid-flow-row gap-4 py-6 sm:py-14">
<Text variant="h2" component="h1" className="">
New Run Service
</Text>
<InfoCard
title="Please select the workspace and the project where you want to create the service"
disableCopy
value=""
/>
<div>
<div className="mb-2 flex w-full">
<Input
placeholder="Search..."
onChange={handleFilterChange}
fullWidth
autoFocus
/>
</div>
<RetryableErrorBoundary>
{projectsToDisplay.length === 0 ? (
<Box className="h-import py-2">
<Text variant="subtitle2">No results found.</Text>
</Box>
) : (
<List className="h-import overflow-y-auto">
{projectsToDisplay.map((project, index) => (
<Fragment key={project.value}>
<ListItem.Root
className="grid grid-flow-col justify-start gap-2 py-2.5"
secondaryAction={
<Button
variant="borderless"
color="primary"
onClick={() => goToServices(project)}
>
Proceed
</Button>
}
>
<ListItem.Avatar>
<span className="inline-block h-6 w-6 overflow-hidden rounded-md">
<Image
src="/logos/new.svg"
alt="Nhost Logo"
width={24}
height={24}
/>
</span>
</ListItem.Avatar>
<ListItem.Text
primary={project.projectName}
secondary={`${project.workspaceName} / ${project.projectName}`}
/>
</ListItem.Root>
{index < projects.length - 1 && <Divider component="li" />}
</Fragment>
))}
</List>
)}
</RetryableErrorBoundary>
</div>
</div>
</Container>
);
}
SelectWorkspaceAndProject.getLayout = function getLayout(page: ReactElement) {
return (
<AuthenticatedLayout title="New Run Service">{page}</AuthenticatedLayout>
);
};

View File

@@ -1805,6 +1805,7 @@ export type ConfigStandardOauthProviderWithScopeUpdateInput = {
/** Configuration for storage service */
export type ConfigStorage = {
__typename?: 'ConfigStorage';
antivirus?: Maybe<ConfigStorageAntivirus>;
/** Resources for the service */
resources?: Maybe<ConfigResources>;
/**
@@ -1818,20 +1819,43 @@ export type ConfigStorage = {
version?: Maybe<Scalars['String']>;
};
export type ConfigStorageAntivirus = {
__typename?: 'ConfigStorageAntivirus';
server?: Maybe<Scalars['String']>;
};
export type ConfigStorageAntivirusComparisonExp = {
_and?: InputMaybe<Array<ConfigStorageAntivirusComparisonExp>>;
_not?: InputMaybe<ConfigStorageAntivirusComparisonExp>;
_or?: InputMaybe<Array<ConfigStorageAntivirusComparisonExp>>;
server?: InputMaybe<ConfigStringComparisonExp>;
};
export type ConfigStorageAntivirusInsertInput = {
server?: InputMaybe<Scalars['String']>;
};
export type ConfigStorageAntivirusUpdateInput = {
server?: InputMaybe<Scalars['String']>;
};
export type ConfigStorageComparisonExp = {
_and?: InputMaybe<Array<ConfigStorageComparisonExp>>;
_not?: InputMaybe<ConfigStorageComparisonExp>;
_or?: InputMaybe<Array<ConfigStorageComparisonExp>>;
antivirus?: InputMaybe<ConfigStorageAntivirusComparisonExp>;
resources?: InputMaybe<ConfigResourcesComparisonExp>;
version?: InputMaybe<ConfigStringComparisonExp>;
};
export type ConfigStorageInsertInput = {
antivirus?: InputMaybe<ConfigStorageAntivirusInsertInput>;
resources?: InputMaybe<ConfigResourcesInsertInput>;
version?: InputMaybe<Scalars['String']>;
};
export type ConfigStorageUpdateInput = {
antivirus?: InputMaybe<ConfigStorageAntivirusUpdateInput>;
resources?: InputMaybe<ConfigResourcesUpdateInput>;
version?: InputMaybe<Scalars['String']>;
};
@@ -2028,6 +2052,12 @@ export type Int_Comparison_Exp = {
_nin?: InputMaybe<Array<Scalars['Int']>>;
};
export type InvoiceSummary = {
__typename?: 'InvoiceSummary';
AmountDue: Scalars['float64'];
PeriodEnd: Scalars['Timestamp'];
};
export type Log = {
__typename?: 'Log';
log: Scalars['String'];
@@ -10451,6 +10481,10 @@ export type Mutation_Root = {
deleteUser?: Maybe<Users>;
/** delete data from the table: "auth.users" */
deleteUsers?: Maybe<Users_Mutation_Response>;
/** delete single row from the table: "users_usage" */
deleteUsersUsage?: Maybe<Users_Usage>;
/** delete data from the table: "users_usage" */
deleteUsersUsages?: Maybe<Users_Usage_Mutation_Response>;
/** delete single row from the table: "workspaces" */
deleteWorkspace?: Maybe<Workspaces>;
/** delete single row from the table: "workspace_members" */
@@ -10590,6 +10624,10 @@ export type Mutation_Root = {
insertUser?: Maybe<Users>;
/** insert data into the table: "auth.users" */
insertUsers?: Maybe<Users_Mutation_Response>;
/** insert a single row into the table: "users_usage" */
insertUsersUsage?: Maybe<Users_Usage>;
/** insert data into the table: "users_usage" */
insertUsersUsages?: Maybe<Users_Usage_Mutation_Response>;
/** insert a single row into the table: "workspaces" */
insertWorkspace?: Maybe<Workspaces>;
/** insert a single row into the table: "workspace_members" */
@@ -10736,6 +10774,10 @@ export type Mutation_Root = {
updateUser?: Maybe<Users>;
/** update data of the table: "auth.users" */
updateUsers?: Maybe<Users_Mutation_Response>;
/** update single row of the table: "users_usage" */
updateUsersUsage?: Maybe<Users_Usage>;
/** update data of the table: "users_usage" */
updateUsersUsages?: Maybe<Users_Usage_Mutation_Response>;
/** update single row of the table: "workspaces" */
updateWorkspace?: Maybe<Workspaces>;
/** update single row of the table: "workspace_members" */
@@ -10830,6 +10872,8 @@ export type Mutation_Root = {
update_run_service_many?: Maybe<Array<Maybe<Run_Service_Mutation_Response>>>;
/** update multiples rows of table: "auth.users" */
update_users_many?: Maybe<Array<Maybe<Users_Mutation_Response>>>;
/** update multiples rows of table: "users_usage" */
update_users_usage_many?: Maybe<Array<Maybe<Users_Usage_Mutation_Response>>>;
/** update multiples rows of table: "workspace_member_invites" */
update_workspaceMemberInvites_many?: Maybe<Array<Maybe<WorkspaceMemberInvites_Mutation_Response>>>;
/** update multiples rows of table: "workspace_members" */
@@ -11260,6 +11304,18 @@ export type Mutation_RootDeleteUsersArgs = {
};
/** mutation root */
export type Mutation_RootDeleteUsersUsageArgs = {
id: Scalars['uuid'];
};
/** mutation root */
export type Mutation_RootDeleteUsersUsagesArgs = {
where: Users_Usage_Bool_Exp;
};
/** mutation root */
export type Mutation_RootDeleteWorkspaceArgs = {
id: Scalars['uuid'];
@@ -11744,6 +11800,20 @@ export type Mutation_RootInsertUsersArgs = {
};
/** mutation root */
export type Mutation_RootInsertUsersUsageArgs = {
object: Users_Usage_Insert_Input;
on_conflict?: InputMaybe<Users_Usage_On_Conflict>;
};
/** mutation root */
export type Mutation_RootInsertUsersUsagesArgs = {
objects: Array<Users_Usage_Insert_Input>;
on_conflict?: InputMaybe<Users_Usage_On_Conflict>;
};
/** mutation root */
export type Mutation_RootInsertWorkspaceArgs = {
object: Workspaces_Insert_Input;
@@ -12359,6 +12429,20 @@ export type Mutation_RootUpdateUsersArgs = {
};
/** mutation root */
export type Mutation_RootUpdateUsersUsageArgs = {
_set?: InputMaybe<Users_Usage_Set_Input>;
pk_columns: Users_Usage_Pk_Columns_Input;
};
/** mutation root */
export type Mutation_RootUpdateUsersUsagesArgs = {
_set?: InputMaybe<Users_Usage_Set_Input>;
where: Users_Usage_Bool_Exp;
};
/** mutation root */
export type Mutation_RootUpdateWorkspaceArgs = {
_set?: InputMaybe<Workspaces_Set_Input>;
@@ -12661,6 +12745,12 @@ export type Mutation_RootUpdate_Users_ManyArgs = {
};
/** mutation root */
export type Mutation_RootUpdate_Users_Usage_ManyArgs = {
updates: Array<Users_Usage_Updates>;
};
/** mutation root */
export type Mutation_RootUpdate_WorkspaceMemberInvites_ManyArgs = {
updates: Array<WorkspaceMemberInvites_Updates>;
@@ -13881,7 +13971,7 @@ export type Query_Root = {
billingDedicatedComputeReportsAggregate: Billing_Dedicated_Compute_Reports_Aggregate;
/** fetch data from the table: "billing.dedicated_compute" */
billingDedicatedComputes: Array<Billing_Dedicated_Compute>;
billingDummy: Scalars['Boolean'];
billingGetNextInvoice?: Maybe<InvoiceSummary>;
/** fetch data from the table: "billing.subscriptions" using primary key columns */
billingSubscription?: Maybe<Billing_Subscriptions>;
/** fetch data from the table: "billing.subscriptions" */
@@ -14024,6 +14114,12 @@ export type Query_Root = {
users: Array<Users>;
/** fetch aggregated fields from the table: "auth.users" */
usersAggregate: Users_Aggregate;
/** fetch data from the table: "users_usage" using primary key columns */
usersUsage?: Maybe<Users_Usage>;
/** fetch data from the table: "users_usage" */
usersUsages: Array<Users_Usage>;
/** fetch aggregated fields from the table: "users_usage" */
usersUsagesAggregate: Users_Usage_Aggregate;
/** fetch data from the table: "workspaces" using primary key columns */
workspace?: Maybe<Workspaces>;
/** fetch data from the table: "workspace_members" using primary key columns */
@@ -14395,6 +14491,11 @@ export type Query_RootBillingDedicatedComputesArgs = {
};
export type Query_RootBillingGetNextInvoiceArgs = {
appID: Scalars['uuid'];
};
export type Query_RootBillingSubscriptionArgs = {
id: Scalars['uuid'];
};
@@ -14949,6 +15050,29 @@ export type Query_RootUsersAggregateArgs = {
};
export type Query_RootUsersUsageArgs = {
id: Scalars['uuid'];
};
export type Query_RootUsersUsagesArgs = {
distinct_on?: InputMaybe<Array<Users_Usage_Select_Column>>;
limit?: InputMaybe<Scalars['Int']>;
offset?: InputMaybe<Scalars['Int']>;
order_by?: InputMaybe<Array<Users_Usage_Order_By>>;
where?: InputMaybe<Users_Usage_Bool_Exp>;
};
export type Query_RootUsersUsagesAggregateArgs = {
distinct_on?: InputMaybe<Array<Users_Usage_Select_Column>>;
limit?: InputMaybe<Scalars['Int']>;
offset?: InputMaybe<Scalars['Int']>;
order_by?: InputMaybe<Array<Users_Usage_Order_By>>;
where?: InputMaybe<Users_Usage_Bool_Exp>;
};
export type Query_RootWorkspaceArgs = {
id: Scalars['uuid'];
};
@@ -16377,8 +16501,16 @@ export type Subscription_Root = {
users: Array<Users>;
/** fetch aggregated fields from the table: "auth.users" */
usersAggregate: Users_Aggregate;
/** fetch data from the table: "users_usage" using primary key columns */
usersUsage?: Maybe<Users_Usage>;
/** fetch data from the table: "users_usage" */
usersUsages: Array<Users_Usage>;
/** fetch aggregated fields from the table: "users_usage" */
usersUsagesAggregate: Users_Usage_Aggregate;
/** fetch data from the table in a streaming manner: "auth.users" */
users_stream: Array<Users>;
/** fetch data from the table in a streaming manner: "users_usage" */
users_usage_stream: Array<Users_Usage>;
/** fetch data from the table: "workspaces" using primary key columns */
workspace?: Maybe<Workspaces>;
/** fetch data from the table: "workspace_members" using primary key columns */
@@ -17426,6 +17558,29 @@ export type Subscription_RootUsersAggregateArgs = {
};
export type Subscription_RootUsersUsageArgs = {
id: Scalars['uuid'];
};
export type Subscription_RootUsersUsagesArgs = {
distinct_on?: InputMaybe<Array<Users_Usage_Select_Column>>;
limit?: InputMaybe<Scalars['Int']>;
offset?: InputMaybe<Scalars['Int']>;
order_by?: InputMaybe<Array<Users_Usage_Order_By>>;
where?: InputMaybe<Users_Usage_Bool_Exp>;
};
export type Subscription_RootUsersUsagesAggregateArgs = {
distinct_on?: InputMaybe<Array<Users_Usage_Select_Column>>;
limit?: InputMaybe<Scalars['Int']>;
offset?: InputMaybe<Scalars['Int']>;
order_by?: InputMaybe<Array<Users_Usage_Order_By>>;
where?: InputMaybe<Users_Usage_Bool_Exp>;
};
export type Subscription_RootUsers_StreamArgs = {
batch_size: Scalars['Int'];
cursor: Array<InputMaybe<Users_Stream_Cursor_Input>>;
@@ -17433,6 +17588,13 @@ export type Subscription_RootUsers_StreamArgs = {
};
export type Subscription_RootUsers_Usage_StreamArgs = {
batch_size: Scalars['Int'];
cursor: Array<InputMaybe<Users_Usage_Stream_Cursor_Input>>;
where?: InputMaybe<Users_Usage_Bool_Exp>;
};
export type Subscription_RootWorkspaceArgs = {
id: Scalars['uuid'];
};
@@ -18515,6 +18677,176 @@ export type Users_Updates = {
where: Users_Bool_Exp;
};
/** columns and relationships of "users_usage" */
export type Users_Usage = {
__typename?: 'users_usage';
created_at: Scalars['timestamptz'];
free_allowance_exceeded: Scalars['Boolean'];
id: Scalars['uuid'];
updated_at: Scalars['timestamptz'];
user_id: Scalars['uuid'];
};
/** aggregated selection of "users_usage" */
export type Users_Usage_Aggregate = {
__typename?: 'users_usage_aggregate';
aggregate?: Maybe<Users_Usage_Aggregate_Fields>;
nodes: Array<Users_Usage>;
};
/** aggregate fields of "users_usage" */
export type Users_Usage_Aggregate_Fields = {
__typename?: 'users_usage_aggregate_fields';
count: Scalars['Int'];
max?: Maybe<Users_Usage_Max_Fields>;
min?: Maybe<Users_Usage_Min_Fields>;
};
/** aggregate fields of "users_usage" */
export type Users_Usage_Aggregate_FieldsCountArgs = {
columns?: InputMaybe<Array<Users_Usage_Select_Column>>;
distinct?: InputMaybe<Scalars['Boolean']>;
};
/** Boolean expression to filter rows from the table "users_usage". All fields are combined with a logical 'AND'. */
export type Users_Usage_Bool_Exp = {
_and?: InputMaybe<Array<Users_Usage_Bool_Exp>>;
_not?: InputMaybe<Users_Usage_Bool_Exp>;
_or?: InputMaybe<Array<Users_Usage_Bool_Exp>>;
created_at?: InputMaybe<Timestamptz_Comparison_Exp>;
free_allowance_exceeded?: InputMaybe<Boolean_Comparison_Exp>;
id?: InputMaybe<Uuid_Comparison_Exp>;
updated_at?: InputMaybe<Timestamptz_Comparison_Exp>;
user_id?: InputMaybe<Uuid_Comparison_Exp>;
};
/** unique or primary key constraints on table "users_usage" */
export enum Users_Usage_Constraint {
/** unique or primary key constraint on columns "id" */
UsersUsagePkey = 'users_usage_pkey',
/** unique or primary key constraint on columns "user_id" */
UsersUsageUserIdKey = 'users_usage_user_id_key'
}
/** input type for inserting data into table "users_usage" */
export type Users_Usage_Insert_Input = {
created_at?: InputMaybe<Scalars['timestamptz']>;
free_allowance_exceeded?: InputMaybe<Scalars['Boolean']>;
id?: InputMaybe<Scalars['uuid']>;
updated_at?: InputMaybe<Scalars['timestamptz']>;
user_id?: InputMaybe<Scalars['uuid']>;
};
/** aggregate max on columns */
export type Users_Usage_Max_Fields = {
__typename?: 'users_usage_max_fields';
created_at?: Maybe<Scalars['timestamptz']>;
id?: Maybe<Scalars['uuid']>;
updated_at?: Maybe<Scalars['timestamptz']>;
user_id?: Maybe<Scalars['uuid']>;
};
/** aggregate min on columns */
export type Users_Usage_Min_Fields = {
__typename?: 'users_usage_min_fields';
created_at?: Maybe<Scalars['timestamptz']>;
id?: Maybe<Scalars['uuid']>;
updated_at?: Maybe<Scalars['timestamptz']>;
user_id?: Maybe<Scalars['uuid']>;
};
/** response of any mutation on the table "users_usage" */
export type Users_Usage_Mutation_Response = {
__typename?: 'users_usage_mutation_response';
/** number of rows affected by the mutation */
affected_rows: Scalars['Int'];
/** data from the rows affected by the mutation */
returning: Array<Users_Usage>;
};
/** on_conflict condition type for table "users_usage" */
export type Users_Usage_On_Conflict = {
constraint: Users_Usage_Constraint;
update_columns?: Array<Users_Usage_Update_Column>;
where?: InputMaybe<Users_Usage_Bool_Exp>;
};
/** Ordering options when selecting data from "users_usage". */
export type Users_Usage_Order_By = {
created_at?: InputMaybe<Order_By>;
free_allowance_exceeded?: InputMaybe<Order_By>;
id?: InputMaybe<Order_By>;
updated_at?: InputMaybe<Order_By>;
user_id?: InputMaybe<Order_By>;
};
/** primary key columns input for table: users_usage */
export type Users_Usage_Pk_Columns_Input = {
id: Scalars['uuid'];
};
/** select columns of table "users_usage" */
export enum Users_Usage_Select_Column {
/** column name */
CreatedAt = 'created_at',
/** column name */
FreeAllowanceExceeded = 'free_allowance_exceeded',
/** column name */
Id = 'id',
/** column name */
UpdatedAt = 'updated_at',
/** column name */
UserId = 'user_id'
}
/** input type for updating data in table "users_usage" */
export type Users_Usage_Set_Input = {
created_at?: InputMaybe<Scalars['timestamptz']>;
free_allowance_exceeded?: InputMaybe<Scalars['Boolean']>;
id?: InputMaybe<Scalars['uuid']>;
updated_at?: InputMaybe<Scalars['timestamptz']>;
user_id?: InputMaybe<Scalars['uuid']>;
};
/** Streaming cursor of the table "users_usage" */
export type Users_Usage_Stream_Cursor_Input = {
/** Stream column input with initial value */
initial_value: Users_Usage_Stream_Cursor_Value_Input;
/** cursor ordering */
ordering?: InputMaybe<Cursor_Ordering>;
};
/** Initial value of the column from where the streaming should start */
export type Users_Usage_Stream_Cursor_Value_Input = {
created_at?: InputMaybe<Scalars['timestamptz']>;
free_allowance_exceeded?: InputMaybe<Scalars['Boolean']>;
id?: InputMaybe<Scalars['uuid']>;
updated_at?: InputMaybe<Scalars['timestamptz']>;
user_id?: InputMaybe<Scalars['uuid']>;
};
/** update columns of table "users_usage" */
export enum Users_Usage_Update_Column {
/** column name */
CreatedAt = 'created_at',
/** column name */
FreeAllowanceExceeded = 'free_allowance_exceeded',
/** column name */
Id = 'id',
/** column name */
UpdatedAt = 'updated_at',
/** column name */
UserId = 'user_id'
}
export type Users_Usage_Updates = {
/** sets the columns of the filtered rows to the given values */
_set?: InputMaybe<Users_Usage_Set_Input>;
/** filter the rows which have to be updated */
where: Users_Usage_Bool_Exp;
};
/** Boolean expression to compare columns of type "uuid". All fields are combined with logical 'AND'. */
export type Uuid_Comparison_Exp = {
_eq?: InputMaybe<Scalars['uuid']>;
@@ -19694,7 +20026,7 @@ export type GetAuthenticationSettingsQueryVariables = Exact<{
}>;
export type GetAuthenticationSettingsQuery = { __typename?: 'query_root', config?: { __typename: 'ConfigConfig', id: 'ConfigConfig', auth?: { __typename: 'ConfigAuth', version?: string | null, id: 'ConfigAuth', redirections?: { __typename?: 'ConfigAuthRedirections', clientUrl?: any | null, allowedUrls?: Array<string> | null } | null, totp?: { __typename?: 'ConfigAuthTotp', enabled?: boolean | null, issuer?: string | null } | null, signUp?: { __typename?: 'ConfigAuthSignUp', enabled?: boolean | null } | null, session?: { __typename?: 'ConfigAuthSession', accessToken?: { __typename?: 'ConfigAuthSessionAccessToken', expiresIn?: any | null } | null, refreshToken?: { __typename?: 'ConfigAuthSessionRefreshToken', expiresIn?: any | null } | null } | null, user?: { __typename?: 'ConfigAuthUser', email?: { __typename?: 'ConfigAuthUserEmail', allowed?: Array<any> | null, blocked?: Array<any> | null } | null, emailDomains?: { __typename?: 'ConfigAuthUserEmailDomains', allowed?: Array<string> | null, blocked?: Array<string> | null } | null, gravatar?: { __typename?: 'ConfigAuthUserGravatar', enabled?: boolean | null, default?: string | null, rating?: string | null } | null } | null } | null } | null };
export type GetAuthenticationSettingsQuery = { __typename?: 'query_root', config?: { __typename: 'ConfigConfig', id: 'ConfigConfig', auth?: { __typename: 'ConfigAuth', version?: string | null, id: 'ConfigAuth', redirections?: { __typename?: 'ConfigAuthRedirections', clientUrl?: any | null, allowedUrls?: Array<string> | null } | null, totp?: { __typename?: 'ConfigAuthTotp', enabled?: boolean | null, issuer?: string | null } | null, signUp?: { __typename?: 'ConfigAuthSignUp', enabled?: boolean | null } | null, session?: { __typename?: 'ConfigAuthSession', accessToken?: { __typename?: 'ConfigAuthSessionAccessToken', expiresIn?: any | null } | null, refreshToken?: { __typename?: 'ConfigAuthSessionRefreshToken', expiresIn?: any | null } | null } | null, user?: { __typename?: 'ConfigAuthUser', email?: { __typename?: 'ConfigAuthUserEmail', allowed?: Array<any> | null, blocked?: Array<any> | null } | null, emailDomains?: { __typename?: 'ConfigAuthUserEmailDomains', allowed?: Array<string> | null, blocked?: Array<string> | null } | null, gravatar?: { __typename?: 'ConfigAuthUserGravatar', enabled?: boolean | null, default?: string | null, rating?: string | null } | null, locale?: { __typename?: 'ConfigAuthUserLocale', allowed?: Array<any> | null, default?: any | null } | null } | null } | null } | null };
export type GetPostgresSettingsQueryVariables = Exact<{
appId: Scalars['uuid'];
@@ -19750,7 +20082,7 @@ export type GetStorageSettingsQueryVariables = Exact<{
}>;
export type GetStorageSettingsQuery = { __typename?: 'query_root', config?: { __typename: 'ConfigConfig', id: 'ConfigConfig', storage?: { __typename?: 'ConfigStorage', version?: string | null } | null } | null };
export type GetStorageSettingsQuery = { __typename?: 'query_root', config?: { __typename: 'ConfigConfig', id: 'ConfigConfig', storage?: { __typename?: 'ConfigStorage', version?: string | null, antivirus?: { __typename?: 'ConfigStorageAntivirus', server?: string | null } | null } | null } | null };
export type DeleteApplicationMutationVariables = Exact<{
appId: Scalars['uuid'];
@@ -19791,6 +20123,13 @@ export type GetApplicationStateQueryVariables = Exact<{
export type GetApplicationStateQuery = { __typename?: 'query_root', app?: { __typename?: 'apps', id: any, name: string, appStates: Array<{ __typename?: 'appStateHistory', id: any, appId: any, message?: string | null, stateId: number, createdAt: any }> } | null };
export type GetProjectLocalesQueryVariables = Exact<{
appId: Scalars['uuid'];
}>;
export type GetProjectLocalesQuery = { __typename?: 'query_root', config?: { __typename?: 'ConfigConfig', auth?: { __typename?: 'ConfigAuth', user?: { __typename?: 'ConfigAuthUser', locale?: { __typename?: 'ConfigAuthUserLocale', allowed?: Array<any> | null, default?: any | null } | null } | null } | null } | null };
export type GetProjectMetricsQueryVariables = Exact<{
appId: Scalars['String'];
subdomain: Scalars['String'];
@@ -20761,6 +21100,10 @@ export const GetAuthenticationSettingsDocument = gql`
default
rating
}
locale {
allowed
default
}
}
version
}
@@ -21063,6 +21406,9 @@ export const GetStorageSettingsDocument = gql`
__typename
storage {
version
antivirus {
server
}
}
}
}
@@ -21299,6 +21645,51 @@ export type GetApplicationStateQueryResult = Apollo.QueryResult<GetApplicationSt
export function refetchGetApplicationStateQuery(variables: GetApplicationStateQueryVariables) {
return { query: GetApplicationStateDocument, variables: variables }
}
export const GetProjectLocalesDocument = gql`
query getProjectLocales($appId: uuid!) {
config(appID: $appId, resolve: true) {
auth {
user {
locale {
allowed
default
}
}
}
}
}
`;
/**
* __useGetProjectLocalesQuery__
*
* To run a query within a React component, call `useGetProjectLocalesQuery` and pass it any options that fit your needs.
* When your component renders, `useGetProjectLocalesQuery` returns an object from Apollo Client that contains loading, error, and data properties
* you can use to render your UI.
*
* @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
*
* @example
* const { data, loading, error } = useGetProjectLocalesQuery({
* variables: {
* appId: // value for 'appId'
* },
* });
*/
export function useGetProjectLocalesQuery(baseOptions: Apollo.QueryHookOptions<GetProjectLocalesQuery, GetProjectLocalesQueryVariables>) {
const options = {...defaultOptions, ...baseOptions}
return Apollo.useQuery<GetProjectLocalesQuery, GetProjectLocalesQueryVariables>(GetProjectLocalesDocument, options);
}
export function useGetProjectLocalesLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetProjectLocalesQuery, GetProjectLocalesQueryVariables>) {
const options = {...defaultOptions, ...baseOptions}
return Apollo.useLazyQuery<GetProjectLocalesQuery, GetProjectLocalesQueryVariables>(GetProjectLocalesDocument, options);
}
export type GetProjectLocalesQueryHookResult = ReturnType<typeof useGetProjectLocalesQuery>;
export type GetProjectLocalesLazyQueryHookResult = ReturnType<typeof useGetProjectLocalesLazyQuery>;
export type GetProjectLocalesQueryResult = Apollo.QueryResult<GetProjectLocalesQuery, GetProjectLocalesQueryVariables>;
export function refetchGetProjectLocalesQuery(variables: GetProjectLocalesQueryVariables) {
return { query: GetProjectLocalesDocument, variables: variables }
}
export const GetProjectMetricsDocument = gql`
query GetProjectMetrics($appId: String!, $subdomain: String!, $from: Timestamp, $to: Timestamp) {
logsVolume: getLogsVolume(appID: $appId, from: $from, to: $to) {

View File

@@ -1,5 +1,14 @@
# @nhost-examples/react-apollo
## 0.1.15
### Patch Changes
- dba71483d: chore: react-apollo-example: add profile to allowedUrls
- e819903f1: chore: remove facebook login
- @nhost/react@2.0.30
- @nhost/react-apollo@5.0.34
## 0.1.14
### Patch Changes

View File

@@ -28,10 +28,11 @@ httpPoolSize = 100
version = 16
[auth]
version = '0.20.2'
version = '0.21.2'
[auth.redirections]
clientUrl = 'http://localhost:3000'
clientUrl = 'https://react-apollo.example.nhost.io/'
allowedUrls = ['https://react-apollo.example.nhost.io/profile']
[auth.signUp]
enabled = true
@@ -94,13 +95,17 @@ enabled = false
enabled = false
[auth.method.oauth.github]
enabled = false
enabled = true
clientId = '{{ secrets.GITHUB_CLIENT_ID }}'
clientSecret = '{{ secrets.GITHUB_CLIENT_SECRET }}'
[auth.method.oauth.gitlab]
enabled = false
[auth.method.oauth.google]
enabled = false
enabled = true
clientId = '{{ secrets.GOOGLE_CLIENT_ID }}'
clientSecret = '{{ secrets.GOOGLE_CLIENT_SECRET }}'
[auth.method.oauth.linkedin]
enabled = false
@@ -124,7 +129,11 @@ enabled = false
enabled = false
[auth.method.webauthn]
enabled = false
enabled = true
[auth.method.webauthn.relyingParty]
name = 'apollo-example'
origins = ['https://react-apollo.example.nhost.io']
[auth.method.webauthn.attestation]
timeout = 60000

View File

@@ -0,0 +1,12 @@
[
{
"op": "replace",
"path": "/auth/method/webauthn/relyingParty/origins/0",
"value": "http://localhost:3000"
},
{
"op": "replace",
"path": "/auth/redirections/clientUrl",
"value": "http://localhost:3000"
}
]

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost-examples/react-apollo",
"version": "0.1.14",
"version": "0.1.15",
"private": true,
"dependencies": {
"@apollo/client": "^3.7.14",

View File

@@ -1,11 +1,11 @@
import { FaFacebook, FaGithub, FaGoogle } from 'react-icons/fa/index.js'
import { FaGithub, FaGoogle } from 'react-icons/fa/index.js'
import { useProviderLink } from '@nhost/react'
import AuthLink from './AuthLink'
export default function OauthLinks() {
const { github, google, facebook } = useProviderLink({ redirectTo: window.location.origin })
const { github, google } = useProviderLink({ redirectTo: window.location.origin })
return (
<>
<AuthLink leftIcon={<FaGithub />} link={github} color="#333">
@@ -14,9 +14,6 @@ export default function OauthLinks() {
<AuthLink leftIcon={<FaGoogle />} link={google} color="#de5246">
Continue with Google
</AuthLink>
<AuthLink leftIcon={<FaFacebook />} link={facebook} color="#3b5998">
Continue with Facebook
</AuthLink>
</>
)
}

View File

@@ -5,6 +5,7 @@ import { RemoveSecurityKeyMutation, SecurityKeysQuery } from 'src/generated'
import { gql, useMutation } from '@apollo/client'
import { ActionIcon, Button, Card, SimpleGrid, Table, TextInput, Title } from '@mantine/core'
import { useInputState } from '@mantine/hooks'
import { showNotification } from '@mantine/notifications'
import { useAddSecurityKey, useUserId } from '@nhost/react'
import { useAuthQuery } from '@nhost/react-apollo'
@@ -42,9 +43,14 @@ export const SecurityKeys: React.FC = () => {
const addKey = async (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault()
const { key, error } = await add(nickname)
if (error) {
const { key, isError, error } = await add(nickname)
if (isError) {
console.log(error)
showNotification({
color: 'red',
title: 'Error',
message: error?.message || null
})
} else {
setNickname('')
}

View File

@@ -1,5 +1,13 @@
# @nhost-examples/serverless-functions
## 0.0.9
### Patch Changes
- 45759c4d4: fix(stripe-graphql-js): fix stripe GraphQL extension export issue in serverless functions
- Updated dependencies [45759c4d4]
- @nhost/stripe-graphql-js@1.0.5
## 0.0.8
### Patch Changes

View File

@@ -17,6 +17,4 @@ https://github.com/nhost/nhost/tree/main/integrations/stripe-graphql-js
import { createStripeGraphQLServer } from '@nhost/stripe-graphql-js'
const server = createStripeGraphQLServer()
export default server
export default createStripeGraphQLServer()

View File

@@ -1,4 +1,7 @@
[global]
[[global.environment]]
name='STRIPE_SECRET_KEY'
value='{{ secrets.STRIPE_SECRET_KEY }}'
[hasura]
version = 'v2.25.1-ce'

View File

@@ -1,13 +1,13 @@
{
"name": "@nhost-examples/serverless-functions",
"private": true,
"version": "0.0.8",
"version": "0.0.9",
"devDependencies": {
"@types/express": "^4.17.13"
},
"dependencies": {
"@graphql-yoga/node": "^2.13.13",
"@nhost/stripe-graphql-js": "^1.0.2",
"@nhost/stripe-graphql-js": "^1.0.5",
"@pothos/core": "^3.21.0",
"cross-fetch": "^3.1.5",
"graphql": "15.7.2",

13
examples/sveltekit/.gitignore vendored Normal file
View File

@@ -0,0 +1,13 @@
.DS_Store
node_modules
/build
/.svelte-kit
/package
.env
.env.*
!.env.example
vite.config.js.timestamp-*
vite.config.ts.timestamp-*
/test-results/
/playwright-report/
/playwright/.cache/

View File

@@ -0,0 +1 @@
hoist-pattern[]=!@nhost/nhost-js

View File

@@ -0,0 +1,5 @@
---
'@nhost-examples/sveltekit': minor
---
feat: add nhost with sveltekit example project

View File

@@ -0,0 +1,44 @@
# Nhost with SvelteKit Example
## Get Started
1. Clone the repository
```sh
git clone https://github.com/nhost/nhost
cd nhost
```
2. Install and build dependencies
```sh
pnpm install
pnpm build
```
3. Go to the SvelteKit example folder
```sh
cd examples/sveltekit
```
4. Create a `.env` file and set the subdomain and region of your Nhost project. When running locally with the CLI, set the subdomain to `local`.
```sh
PUBLIC_NHOST_SUBDOMAIN=
PUBLIC_NHOST_REGION=
```
5. Terminal 1: Start Nhost
> Make sure you have the [Nhost CLI installed](https://docs.nhost.io/platform/cli).
```sh
nhost up
```
6. Terminal 2: Start the SvelteKit dev server
```sh
pnpm dev
```

View File

@@ -0,0 +1,17 @@
{
"extends": "./.svelte-kit/tsconfig.json",
"compilerOptions": {
"allowJs": true,
"checkJs": true,
"esModuleInterop": true,
"forceConsistentCasingInFileNames": true,
"resolveJsonModule": true,
"skipLibCheck": true,
"sourceMap": true,
"strict": true
}
// Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias and https://kit.svelte.dev/docs/configuration#files
//
// If you want to overwrite includes/excludes, make sure to copy over the relevant includes/excludes
// from the referenced tsconfig.json - TypeScript does not merge them in
}

View File

@@ -0,0 +1,45 @@
{
"name": "@nhost-examples/sveltekit",
"version": "0.1.0",
"private": true,
"scripts": {
"dev": "vite dev",
"build": "vite build",
"preview": "vite preview",
"check": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json",
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./jsconfig.json --watch",
"install-browsers": "pnpm dlx playwright@1.31.0 install --with-deps",
"add-nhost-js": "pnpm add @nhost/nhost-js --ignore-workspace",
"test": "pnpm install-browsers && pnpm add-nhost-js && pnpm dlx playwright@1.31.0 test",
"lint": "eslint .",
"postinstall": "pnpm add-nhost-js"
},
"devDependencies": {
"@nhost/nhost-js": "2.2.13",
"@playwright/test": "^1.31.0",
"@sveltejs/adapter-auto": "^2.0.0",
"@sveltejs/kit": "^1.5.0",
"autoprefixer": "^10.4.14",
"eslint": "^8.28.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-svelte": "^2.26.0",
"postcss": "^8.4.23",
"prettier": "^2.8.0",
"prettier-plugin-svelte": "^2.8.1",
"svelte": "^3.54.0",
"svelte-check": "^3.0.1",
"tailwindcss": "^3.3.2",
"typescript": "^5.0.0",
"vite": "^4.3.0",
"vitest": "^0.25.3"
},
"type": "module",
"dependencies": {
"@apollo/client": "^3.8.1",
"graphql": "^16.7.1",
"graphql-tag": "^2.12.6",
"js-cookie": "^3.0.5",
"playwright": "^1.37.1",
"uuid": "^9.0.0"
}
}

View File

@@ -0,0 +1,57 @@
// @ts-check
import { defineConfig, devices } from '@playwright/test'
/**
* Read environment variables from file.
* https://github.com/motdotla/dotenv
*/
// require('dotenv').config();
/**
* @see https://playwright.dev/docs/test-configuration
*/
export default defineConfig({
testDir: './tests',
/* Run tests in files in parallel */
fullyParallel: true,
/* Fail the build on CI if you accidentally left test.only in the source code. */
forbidOnly: !!process.env.CI,
/* Retry on CI only */
retries: process.env.CI ? 2 : 0,
/* Opt out of parallel tests on CI. */
workers: process.env.CI ? 1 : undefined,
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
reporter: 'html',
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
use: {
/* Base URL to use in actions like `await page.goto('/')`. */
baseURL: 'http://localhost:5173',
/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
trace: 'on-first-retry'
},
/* Configure projects for major browsers */
projects: [
{
name: 'chromium',
use: { ...devices['Desktop Chrome'] }
},
{
name: 'firefox',
use: { ...devices['Desktop Firefox'] }
},
{
name: 'webkit',
use: { ...devices['Desktop Safari'] }
}
],
webServer: {
command: 'pnpm dev',
url: 'http://localhost:5173',
reuseExistingServer: !process.env.CI
}
})

179
examples/sveltekit/pnpm-lock.yaml generated Normal file
View File

@@ -0,0 +1,179 @@
lockfileVersion: '6.0'
settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
dependencies:
graphql:
specifier: ^16.7.1
version: 16.8.0
devDependencies:
'@nhost/nhost-js':
specifier: 2.2.13
version: 2.2.13(graphql@16.8.0)
packages:
/@graphql-typed-document-node/core@3.2.0(graphql@16.8.0):
resolution: {integrity: sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==}
peerDependencies:
graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
dependencies:
graphql: 16.8.0
dev: true
/@nhost/graphql-js@0.1.4(graphql@16.8.0):
resolution: {integrity: sha512-IPHuGOf4iQrFsxG7Rh5jCCZzPCN9JkvldFww4Fz1lCVi9ZQNEaGaawIP5gBuBHeYIuALeaK1wVYKPc7vJ/euCA==}
peerDependencies:
graphql: ^14.0.0 || ^15.0.0 || ^16.0.0
dependencies:
'@graphql-typed-document-node/core': 3.2.0(graphql@16.8.0)
graphql: 16.8.0
isomorphic-unfetch: 3.1.0
transitivePeerDependencies:
- encoding
dev: true
/@nhost/hasura-auth-js@2.1.7:
resolution: {integrity: sha512-dbi8zrmuE3xSlA7WMNyrZzVPLKYSBUlKtUjob+axhts0+4TsqsB7NvdLXrhM0fYjRY5SFUtN2JLs+EWDGKAoLQ==}
dependencies:
'@simplewebauthn/browser': 6.2.2
fetch-ponyfill: 7.1.0
js-cookie: 3.0.5
jwt-decode: 3.1.2
xstate: 4.38.2
transitivePeerDependencies:
- encoding
dev: true
/@nhost/hasura-storage-js@2.2.2:
resolution: {integrity: sha512-GMeB1m6YKZMZDSO6UtmgXYWxsFUNlphIZH9JeiDX+6UTmbd62UlDmhBcmx2OGy/tvv57D+HbohpV6AY9S6QL4w==}
dependencies:
fetch-ponyfill: 7.1.0
form-data: 4.0.0
xstate: 4.38.2
transitivePeerDependencies:
- encoding
dev: true
/@nhost/nhost-js@2.2.13(graphql@16.8.0):
resolution: {integrity: sha512-HU9eOpkVBGGMHsRThGyl654Y9W8bksSEnyEvDojUg76+3ngOn2ebrasXR/94YoR206soEzq3v4b0OKmn/1jlnQ==}
peerDependencies:
graphql: ^14.0.0 || ^15.0.0 || ^16.0.0
dependencies:
'@nhost/graphql-js': 0.1.4(graphql@16.8.0)
'@nhost/hasura-auth-js': 2.1.7
'@nhost/hasura-storage-js': 2.2.2
graphql: 16.8.0
isomorphic-unfetch: 3.1.0
transitivePeerDependencies:
- encoding
dev: true
/@simplewebauthn/browser@6.2.2:
resolution: {integrity: sha512-VUtne7+s6BmW4usnbitjZEI1VNT/PNh6bYg+AI4OMdfpo5z+yAq+6iVAWBJlIUGVk5InetEQvTUp6OefBam8qg==}
dev: true
/asynckit@0.4.0:
resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
dev: true
/combined-stream@1.0.8:
resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
engines: {node: '>= 0.8'}
dependencies:
delayed-stream: 1.0.0
dev: true
/delayed-stream@1.0.0:
resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
engines: {node: '>=0.4.0'}
dev: true
/fetch-ponyfill@7.1.0:
resolution: {integrity: sha512-FhbbL55dj/qdVO3YNK7ZEkshvj3eQ7EuIGV2I6ic/2YiocvyWv+7jg2s4AyS0wdRU75s3tA8ZxI/xPigb0v5Aw==}
dependencies:
node-fetch: 2.6.12
transitivePeerDependencies:
- encoding
dev: true
/form-data@4.0.0:
resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
engines: {node: '>= 6'}
dependencies:
asynckit: 0.4.0
combined-stream: 1.0.8
mime-types: 2.1.35
dev: true
/graphql@16.8.0:
resolution: {integrity: sha512-0oKGaR+y3qcS5mCu1vb7KG+a89vjn06C7Ihq/dDl3jA+A8B3TKomvi3CiEcVLJQGalbu8F52LxkOym7U5sSfbg==}
engines: {node: ^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0}
/isomorphic-unfetch@3.1.0:
resolution: {integrity: sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==}
dependencies:
node-fetch: 2.6.12
unfetch: 4.2.0
transitivePeerDependencies:
- encoding
dev: true
/js-cookie@3.0.5:
resolution: {integrity: sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==}
engines: {node: '>=14'}
dev: true
/jwt-decode@3.1.2:
resolution: {integrity: sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==}
dev: true
/mime-db@1.52.0:
resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
engines: {node: '>= 0.6'}
dev: true
/mime-types@2.1.35:
resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
engines: {node: '>= 0.6'}
dependencies:
mime-db: 1.52.0
dev: true
/node-fetch@2.6.12:
resolution: {integrity: sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==}
engines: {node: 4.x || >=6.0.0}
peerDependencies:
encoding: ^0.1.0
peerDependenciesMeta:
encoding:
optional: true
dependencies:
whatwg-url: 5.0.0
dev: true
/tr46@0.0.3:
resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
dev: true
/unfetch@4.2.0:
resolution: {integrity: sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==}
dev: true
/webidl-conversions@3.0.1:
resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
dev: true
/whatwg-url@5.0.0:
resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
dependencies:
tr46: 0.0.3
webidl-conversions: 3.0.1
dev: true
/xstate@4.38.2:
resolution: {integrity: sha512-Fba/DwEPDLneHT3tbJ9F3zafbQXszOlyCJyQqqdzmtlY/cwE2th462KK48yaANf98jHlP6lJvxfNtN0LFKXPQg==}
dev: true

View File

@@ -0,0 +1,7 @@
// eslint-disable-next-line import/no-anonymous-default-export
export default {
plugins: {
tailwindcss: {},
autoprefixer: {}
}
}

13
examples/sveltekit/src/app.d.ts vendored Normal file
View File

@@ -0,0 +1,13 @@
// See https://kit.svelte.dev/docs/types#app
// for information about these interfaces
declare global {
namespace App {
// interface Error {}
interface Locals {}
interface PageData {}
// interface Platform {}
}
}
export { };

View File

@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%sveltekit.assets%/favicon.png" />
<meta name="viewport" content="width=device-width" />
%sveltekit.head%
</head>
<body data-sveltekit-preload-data="hover">
<div style="display: contents">%sveltekit.body%</div>
</body>
</html>

View File

@@ -0,0 +1,15 @@
<script>
/** @type {("button" | "submit" | "reset" | null | undefined)} */
export let type = 'button';
export let disabled = false;
</script>
<button
{disabled}
{type}
class="{disabled == true
? 'bg-indigo-200 hover:bg-grey-700'
: 'bg-indigo-600 hover:bg-indigo-700 focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500'} inline-flex items-center px-4 py-2 border border-transparent text-base font-medium rounded-md shadow-sm text-white focus:outline-none"
>
<slot />
</button>

View File

@@ -0,0 +1,40 @@
<script>
export let value = '';
/** @type {string} */
export let id;
/** @type {string} */
export let label;
export let type = 'text';
/** @type {string} */
export let name;
export let required = false;
export let inputRef = null;
/** @param {HTMLInputElement} node */
function setType(node) {
node.type = type;
}
</script>
<div class={$$props.class}>
<label for={id} class="block text-sm font-medium text-gray-700">
{label}
</label>
<div class="mt-1">
<input
use:setType
{name}
{id}
{required}
bind:value
bind:this={inputRef}
class="block w-full p-3 border rounded-md border-slate-300 focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm"
/>
</div>
</div>

View File

@@ -0,0 +1,66 @@
<script>
import { createEventDispatcher } from 'svelte';
/** @type {import('@nhost/nhost-js').User | undefined} */
export let user;
$: navigation = [
{
href: '/',
name: 'Home'
},
{
href: '/protected',
name: `${user ? '🔓' : '🔒'} Protected`
}
];
const dispatch = createEventDispatcher();
const handleSignOut = () => {
user = undefined;
dispatch('signout', {
signout: true
});
};
</script>
<header class="bg-indigo-600">
<nav class="container mx-auto">
<div class="flex items-center justify-between w-full py-4">
<div class="flex items-center">
<div class="ml-10 space-x-8">
{#each navigation as link}
<a href={link.href} class="text-lg font-medium text-white hover:text-indigo-50">
{link.name}
</a>
{/each}
</div>
</div>
<div class="ml-10 space-x-4">
{#if user}
<button
on:click={handleSignOut}
class="inline-block px-4 py-2 text-base font-medium text-white bg-indigo-500 border border-transparent rounded-md hover:bg-opacity-75"
>
Sign out
</button>
{:else}
<a
href="/sign-in"
class="inline-block px-4 py-2 text-base font-medium text-white bg-indigo-500 border border-transparent rounded-md hover:bg-opacity-75"
>
Sign in
</a>
<a
href="/sign-up"
class="inline-block px-4 py-2 text-base font-medium text-indigo-600 bg-white border border-transparent rounded-md hover:bg-indigo-50"
>
Sign up
</a>
{/if}
</div>
</div>
</nav>
</header>

View File

@@ -0,0 +1,62 @@
import { invalidate } from '$app/navigation';
import { env } from '$env/dynamic/public';
import { NhostClient } from '@nhost/nhost-js';
import Cookies from 'js-cookie';
export const NHOST_SESSION_KEY = 'nhostSession';
const isBrowser = typeof window !== 'undefined';
/** @type {import('@nhost/nhost-js').NhostClient | null} */
let nhost;
/** @param {import('@nhost/nhost-js').NhostSession | null} session */
export const setNhostSessionInCookie = (session) => {
if (!session) {
Cookies.remove(NHOST_SESSION_KEY);
return;
}
const expires = new Date();
// * Expire the cookie 60 seconds before the token expires
expires.setSeconds(expires.getSeconds() + session.accessTokenExpiresIn - 60);
Cookies.set(NHOST_SESSION_KEY, JSON.stringify(session), {
sameSite: 'strict',
expires
});
};
/** @param {import('@sveltejs/kit').Cookies} cookies */
export const getNhostSessionFromCookie = (cookies) => {
const nhostSessionCookie = cookies.get(NHOST_SESSION_KEY);
return nhostSessionCookie ? JSON.parse(nhostSessionCookie) : null;
};
/** @param {import('@nhost/nhost-js').NhostSession} session */
export const getNhostLoadClient = async (session) => {
if (isBrowser && nhost) {
return nhost;
}
nhost = new NhostClient({
subdomain: env.PUBLIC_NHOST_SUBDOMAIN || 'local',
region: env.PUBLIC_NHOST_REGION,
start: false
});
if (isBrowser) {
nhost.auth.onAuthStateChanged((_, session) => {
setNhostSessionInCookie(session);
invalidate('nhost:auth');
});
nhost.auth.onTokenChanged((session) => {
setNhostSessionInCookie(session);
});
}
nhost.auth.client.start({ initialSession: session });
return nhost;
};

View File

@@ -0,0 +1,22 @@
import { getNhostLoadClient } from '$lib/nhost-auth-sveltekit.js';
import { redirect } from '@sveltejs/kit';
const unProtectedRoutes = ['/', '/sign-in', '/sign-up'];
export const load = async ({ data, depends, route }) => {
depends('nhost:auth');
const nhost = await getNhostLoadClient(data.nhostSession);
const session = nhost.auth.getSession();
if (!unProtectedRoutes.includes(route.id ?? '')) {
if (!session) {
throw redirect(303, '/');
}
}
return {
nhost: nhost,
session: session
};
};

View File

@@ -0,0 +1,8 @@
import { getNhostSessionFromCookie } from '$lib/nhost-auth-sveltekit';
/** @type {import('./$types').LayoutServerLoad} */
export async function load({ cookies }) {
return {
nhostSession: getNhostSessionFromCookie(cookies)
};
}

View File

@@ -0,0 +1,24 @@
<script>
import { goto } from '$app/navigation';
import Navigation from '$lib/components/Navigation.svelte';
import './styles.css';
export let data;
let { nhost } = data;
/**
* @param {{ detail: { signout: any; }; }} event
*/
async function handleSignOut(event) {
await nhost.auth.signOut();
await goto(`/`);
}
</script>
<div class="app">
<Navigation user={data.session?.user} on:signout={handleSignOut} />
<div class="container p-4 mx-auto mt-8 antialiased">
<slot />
</div>
</div>

View File

@@ -0,0 +1,6 @@
<svelte:head>
<title>Login</title>
<meta name="description" content="About this app" />
</svelte:head>
<h1 class="text-2xl text-center">Hi, login/register to get started</h1>

View File

@@ -0,0 +1,44 @@
<script>
export let data;
let { session, nhost } = data;
import { gql } from 'graphql-tag';
const getFiles = async () => {
const response = await nhost.graphql.request(gql`
{
files {
id
name
}
}
`);
return response.data.files;
};
</script>
<svelte:head>
<title>Protected Page</title>
<meta name="description" content="About this app" />
</svelte:head>
<h1 class="text-2xl font-semibold text-center">
Hi! You are registered with email: {session?.user.email}.
</h1>
<h2>Files</h2>
{#await getFiles()}
<p>Loading...</p>
{:then files}
<p>Showing {files.length} files</p>
<ul>
{#each files as file}
<li>
{file.name}
</li>
{/each}
</ul>
{:catch error}
<p>{error.message}</p>
{/await}

View File

@@ -0,0 +1,56 @@
<script>
import Input from '$lib/components/Input.svelte';
import Button from '$lib/components/Button.svelte';
import { goto, invalidate } from '$app/navigation';
export let data;
let { nhost } = data;
/** @type {string}*/
let email;
/** @type {string}*/
let password;
/** @type {import('@nhost/nhost-js').AuthErrorPayload | null} */
let error;
const handleSignIn = async () => {
const { error: signInError } = await nhost.auth.signIn({
email,
password
});
error = signInError;
if (!error) {
await invalidate('nhost:auth');
await goto('/protected');
}
};
</script>
<svelte:head>
<title>Sign In</title>
</svelte:head>
<h1 class="text-2xl font-semibold text-center">Sign In</h1>
{#if error}
<p class="mt-3 font-semibold text-center text-red-500">{error.message}</p>
{/if}
<form class="space-y-5" on:submit={handleSignIn}>
<Input label="Email" id="email" name="email" type="email" bind:value={email} required />
<Input
label="Password"
id="password"
name="password"
type="password"
bind:value={password}
required
/>
<Button type="submit">Sign In</Button>
</form>

View File

@@ -0,0 +1,82 @@
<script>
import Input from '$lib/components/Input.svelte';
import Button from '$lib/components/Button.svelte';
import { goto } from '$app/navigation';
export let data;
let { nhost } = data;
/** @type {string}*/
let firstName;
/** @type {string}*/
let lastName;
/** @type {string}*/
let email;
/** @type {string}*/
let password;
/** @type {import('@nhost/nhost-js').AuthErrorPayload | null} */
let error;
const handleSignUp = async () => {
const { error: signUpError } = await nhost.auth.signUp({
email,
password,
options: {
displayName: `${firstName} ${lastName}`
}
});
error = signUpError;
if (!error) {
await goto('/sign-in');
}
};
</script>
<svelte:head>
<title>Sign Up</title>
</svelte:head>
<h1 class="text-2xl font-semibold text-center">Sign Up</h1>
{#if error}
<p class="mt-3 font-semibold text-center text-red-500">{error.message}</p>
{/if}
<form class="space-y-5" on:submit={handleSignUp}>
<Input
label="First Name"
id="firstName"
name="firstName"
type="text"
bind:value={firstName}
required
/>
<Input
label="Last Name"
id="lastName"
name="lastName"
type="text"
bind:value={lastName}
required
/>
<Input label="Email" id="email" name="email" type="email" bind:value={email} required />
<Input
label="Password"
id="password"
name="password"
type="password"
bind:value={password}
required
/>
<Button type="submit">Sign Up</Button>
</form>

View File

@@ -0,0 +1,3 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -0,0 +1,13 @@
import adapter from '@sveltejs/adapter-auto';
/** @type {import('@sveltejs/kit').Config} */
const config = {
kit: {
// adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
// If your environment is not supported or you settled on a specific environment, switch out the adapter.
// See https://kit.svelte.dev/docs/adapters for more information about adapters.
adapter: adapter()
}
};
export default config;

View File

@@ -0,0 +1,9 @@
/** @type {import('tailwindcss').Config} */
// eslint-disable-next-line import/no-anonymous-default-export
export default {
content: ['./src/**/*.{html,js,svelte,ts}'],
theme: {
extend: {}
},
plugins: []
}

View File

@@ -0,0 +1,6 @@
import { expect, test } from '@playwright/test'
test('has title', async ({ page }) => {
await page.goto('/')
await expect(page).toHaveTitle(/Login/)
})

View File

@@ -0,0 +1,6 @@
import { sveltekit } from '@sveltejs/kit/vite'
import { defineConfig } from 'vite'
export default defineConfig({
plugins: [sveltekit()]
})

View File

@@ -8,15 +8,15 @@
outputs = { self, nixpkgs, flake-utils, nix-filter }:
flake-utils.lib.eachDefaultSystem (system:
let
version = "v1.1.0";
version = "v1.5.2";
dist = {
aarch64-darwin = rec {
url = "https://github.com/nhost/cli/releases/download/${version}/cli-${version}-darwin-arm64.tar.gz";
sha256 = "sha256-tF40CEkA357yzg2Gmc9ubjHJ5FlI9qQTdVdWNY/+f+Y=";
sha256 = "0rakx9lpbj5m3jfra5r2iw065x800i951843l3mxbwk9m1hzm185";
};
x86_64-linux = rec {
url = "https://github.com/nhost/cli/releases/download/${version}/cli-${version}-linux-amd64.tar.gz";
sha256 = "sha256-KLv06dI7A+5KGJ5F8xM1qC+oqHRmJ4kMaifLvaTFqak=";
sha256 = "19x83fpvazwzpnrxi0qh6mh14wwhlw77qd7vvc3633dxa5hdigc4";
};
};
overlays = [

View File

@@ -1,5 +1,23 @@
# @nhost/apollo
## 5.2.18
### Patch Changes
- @nhost/nhost-js@2.2.16
## 5.2.17
### Patch Changes
- @nhost/nhost-js@2.2.15
## 5.2.16
### Patch Changes
- @nhost/nhost-js@2.2.14
## 5.2.15
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/apollo",
"version": "5.2.15",
"version": "5.2.18",
"description": "Nhost Apollo Client library",
"license": "MIT",
"keywords": [

View File

@@ -1,5 +1,26 @@
# @nhost/react-apollo
## 5.0.35
### Patch Changes
- @nhost/apollo@5.2.18
- @nhost/react@2.0.31
## 5.0.34
### Patch Changes
- @nhost/apollo@5.2.17
- @nhost/react@2.0.30
## 5.0.33
### Patch Changes
- @nhost/apollo@5.2.16
- @nhost/react@2.0.29
## 5.0.32
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/react-apollo",
"version": "5.0.32",
"version": "5.0.35",
"description": "Nhost React Apollo client",
"license": "MIT",
"keywords": [

View File

@@ -1,5 +1,23 @@
# @nhost/react-urql
## 2.0.32
### Patch Changes
- @nhost/react@2.0.31
## 2.0.31
### Patch Changes
- @nhost/react@2.0.30
## 2.0.30
### Patch Changes
- @nhost/react@2.0.29
## 2.0.29
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/react-urql",
"version": "2.0.29",
"version": "2.0.32",
"description": "Nhost React URQL client",
"license": "MIT",
"keywords": [

View File

@@ -1,5 +1,11 @@
# @nhost/stripe-graphql-js
## 1.0.5
### Patch Changes
- 45759c4d4: fix(stripe-graphql-js): fix stripe GraphQL extension export issue in serverless functions
## 1.0.4
### Patch Changes

View File

@@ -1,3 +1,4 @@
import { createServer } from 'http'
import { Context, createStripeGraphQLServer } from '../src/index'
const isAllowed = (stripeCustomerId: string, context: Context) => {
@@ -10,11 +11,13 @@ const isAllowed = (stripeCustomerId: string, context: Context) => {
return false
}
const server = createStripeGraphQLServer({
const yoga = createStripeGraphQLServer({
isAllowed,
graphiql: true
})
const server = createServer(yoga)
server.listen(4000, () => {
console.info('Stripe GraphQL API server is running on http://localhost:4000')
})

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/stripe-graphql-js",
"version": "1.0.4",
"version": "1.0.5",
"description": "Stripe GraphQL API",
"license": "MIT",
"keywords": [

View File

@@ -1,4 +1,3 @@
import { createServer } from 'node:http'
import { createYoga, YogaInitialContext } from 'graphql-yoga'
import { schema } from './schema'
@@ -54,7 +53,7 @@ const createStripeGraphQLServer = (params?: CreateServerProps) => {
graphqlEndpoint: '*'
})
return createServer(yoga)
return yoga
}
export { createStripeGraphQLServer, schema }

View File

@@ -1,5 +1,11 @@
# @nhost/hasura-auth-js
## 2.1.8
### Patch Changes
- 032c0bd21: fix: make sure errors are correctly thrown on non v8 browsers
## 2.1.7
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/hasura-auth-js",
"version": "2.1.7",
"version": "2.1.8",
"description": "Hasura-auth client",
"license": "MIT",
"keywords": [

View File

@@ -15,7 +15,9 @@ export class CodifiedError extends Error {
error: AuthErrorPayload
constructor(original: Error | AuthErrorPayload) {
super(original.message)
Error.captureStackTrace(this, this.constructor)
if (Error.captureStackTrace) Error.captureStackTrace(this, this.constructor)
if (original instanceof Error) {
this.name = original.name
this.error = {

View File

@@ -1,5 +1,17 @@
# @nhost/hasura-storage-js
## 2.2.4
### Patch Changes
- 83fee5446: fix(hasura-storage-js): swap fetch when running on edge runtime
## 2.2.3
### Patch Changes
- 39de0063b: fix(hasura-storage-js): fix upload response status code check
## 2.2.2
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/hasura-storage-js",
"version": "2.2.2",
"version": "2.2.4",
"description": "Hasura-storage client",
"license": "MIT",
"keywords": [

View File

@@ -2,6 +2,8 @@ import fetchPonyfill from 'fetch-ponyfill'
import FormData from 'form-data'
import { StorageErrorPayload, StorageUploadResponse } from './types'
declare const EdgeRuntime: any
/** Convert any string into ISO-8859-1 */
export const toIso88591 = (fileName: string) => {
try {
@@ -12,7 +14,11 @@ export const toIso88591 = (fileName: string) => {
}
}
const { fetch } = fetchPonyfill()
let fetch = globalThis.fetch
if (typeof EdgeRuntime !== 'string') {
fetch = fetchPonyfill().fetch
}
export const fetchUpload = async (
backendUrl: string,
@@ -87,10 +93,14 @@ export const fetchUpload = async (
xhr.responseType = 'json'
xhr.onload = () => {
if (xhr.status < 200 && xhr.status >= 300) {
if (xhr.status < 200 || xhr.status >= 300) {
return resolve({
fileMetadata: null,
error: { error: xhr.statusText, message: xhr.statusText, status: xhr.status }
error: {
error: xhr.response?.error ?? xhr.response,
message: xhr.response?.error?.message ?? xhr.response,
status: xhr.status
}
})
}
return resolve({ fileMetadata: xhr.response, error: null })

View File

@@ -1,5 +1,23 @@
# @nhost/nextjs
## 1.13.37
### Patch Changes
- @nhost/react@2.0.31
## 1.13.36
### Patch Changes
- @nhost/react@2.0.30
## 1.13.35
### Patch Changes
- @nhost/react@2.0.29
## 1.13.34
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/nextjs",
"version": "1.13.34",
"version": "1.13.37",
"description": "Nhost NextJS library",
"license": "MIT",
"keywords": [

View File

@@ -1,5 +1,26 @@
# @nhost/nhost-js
## 2.2.16
### Patch Changes
- Updated dependencies [83fee5446]
- @nhost/hasura-storage-js@2.2.4
## 2.2.15
### Patch Changes
- Updated dependencies [032c0bd21]
- @nhost/hasura-auth-js@2.1.8
## 2.2.14
### Patch Changes
- Updated dependencies [39de0063b]
- @nhost/hasura-storage-js@2.2.3
## 2.2.13
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/nhost-js",
"version": "2.2.13",
"version": "2.2.16",
"description": "Nhost JavaScript SDK",
"license": "MIT",
"keywords": [

View File

@@ -1,5 +1,23 @@
# @nhost/react
## 2.0.31
### Patch Changes
- @nhost/nhost-js@2.2.16
## 2.0.30
### Patch Changes
- @nhost/nhost-js@2.2.15
## 2.0.29
### Patch Changes
- @nhost/nhost-js@2.2.14
## 2.0.28
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/react",
"version": "2.0.28",
"version": "2.0.31",
"description": "Nhost React library",
"license": "MIT",
"keywords": [

View File

@@ -1,5 +1,23 @@
# @nhost/vue
## 1.13.36
### Patch Changes
- @nhost/nhost-js@2.2.16
## 1.13.35
### Patch Changes
- @nhost/nhost-js@2.2.15
## 1.13.34
### Patch Changes
- @nhost/nhost-js@2.2.14
## 1.13.33
### Patch Changes

View File

@@ -1,6 +1,6 @@
{
"name": "@nhost/vue",
"version": "1.13.33",
"version": "1.13.36",
"description": "Nhost Vue library",
"license": "MIT",
"keywords": [

1316
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff