Router.push('/')}>
+ router.push('/')}>
Cancel
diff --git a/studio/pages/project/[ref]/auth/settings.tsx b/studio/pages/project/[ref]/auth/settings.tsx
index 980b24fa4a0..292e6583fa5 100644
--- a/studio/pages/project/[ref]/auth/settings.tsx
+++ b/studio/pages/project/[ref]/auth/settings.tsx
@@ -198,6 +198,8 @@ const Settings = () => {
className="mb-4"
label={authConfig.properties.MAILER_AUTOCONFIRM.title}
onChange={(value) => {
+ // If MAILER_AUTOCONFIRM is set to true, it means we are disabling email confirmations.
+ // "Enable email confirmations" should be toggled off.
handleToggle('MAILER_AUTOCONFIRM', !value)
}}
checked={!model.MAILER_AUTOCONFIRM}
@@ -335,10 +337,13 @@ const Settings = () => {
{
- handleToggle('SMS_AUTOCONFIRM')
+ onChange={(value) => {
+ // If SMS_AUTOCONFIRM is set to true, it means we are disabling phone confirmations.
+ // "Enable phone confirmations" should be toggled off.
+ handleToggle('SMS_AUTOCONFIRM', !value)
}}
- checked={model.SMS_AUTOCONFIRM}
+ //
+ checked={!model.SMS_AUTOCONFIRM}
descriptionText={authConfig.properties.SMS_AUTOCONFIRM.help}
/>
diff --git a/studio/pages/project/[ref]/settings/database.tsx b/studio/pages/project/[ref]/settings/database.tsx
index fc8f8a0d39b..009761a2ab1 100644
--- a/studio/pages/project/[ref]/settings/database.tsx
+++ b/studio/pages/project/[ref]/settings/database.tsx
@@ -188,6 +188,7 @@ const ResetDbPassword: FC = () => {
} else {
ui.setNotification({ category: 'error', message: 'Failed to reset password' })
}
+ setIsUpdatingPassword(false)
}
}
@@ -279,9 +280,6 @@ const DownloadCertificate: FC = ({ createdAt }) => {
}
const GeneralSettings: FC = ({ projectRef }) => {
- const { ui } = useStore()
- const isOwner = ui.selectedOrganization?.is_owner
-
const { data, error }: any = useSWR(`${API_URL}/props/project/${projectRef}/settings`, get)
if (data?.error || error) {
@@ -378,7 +376,7 @@ const GeneralSettings: FC = ({ projectRef }) => {
- {isOwner &&
diff --git a/studio/pages/project/[ref]/settings/logs/[type].tsx b/studio/pages/project/[ref]/settings/logs/[type].tsx
index d60a83f83b5..cfc8a60eb2c 100644
--- a/studio/pages/project/[ref]/settings/logs/[type].tsx
+++ b/studio/pages/project/[ref]/settings/logs/[type].tsx
@@ -3,7 +3,15 @@ import React, { useEffect, useRef, useState } from 'react'
import { NextPage } from 'next'
import { useRouter } from 'next/router'
import { observer } from 'mobx-react-lite'
-import { Typography, IconLoader, IconAlertCircle, IconRewind, Button, IconInfo } from '@supabase/ui'
+import {
+ Typography,
+ IconLoader,
+ IconAlertCircle,
+ IconRewind,
+ Button,
+ IconInfo,
+ Card,
+} from '@supabase/ui'
import { withAuth } from 'hooks'
import { get } from 'lib/common/fetch'
@@ -72,6 +80,9 @@ export const LogPage: NextPage = () => {
if (prevPageData === null) {
// reduce interval window limit by using the timestamp of the last log
queryParams = genQueryParams(params)
+ } else if (prevPageData.data.length === 0) {
+ // no rows returned, indicates that no more data to retrieve and append.
+ return null
} else {
const len = prevPageData.data.length
const { timestamp: tsLimit }: LogData = prevPageData.data[len - 1]
@@ -84,18 +95,16 @@ export const LogPage: NextPage = () => {
}
const {
data = [],
+ error: swrError,
isValidating,
mutate,
size,
setSize,
} = useSWRInfinite(getKeyLogs, get, { revalidateOnFocus: false })
-
- // const { data, isValidating, mutate } = useSWR(logUrl, get, { revalidateOnFocus: false })
let logData: LogData[] = []
- let error: null | string = null
-
+ let error: null | string = swrError ? swrError.message : null
data.forEach((response: Logs) => {
- if (response && response.data) {
+ if (!error && response && response.data) {
logData = [...logData, ...response.data]
}
if (!error && response && response.error) {
@@ -145,10 +154,12 @@ export const LogPage: NextPage = () => {
...prev,
where: isSelectQuery ? '' : editorValue,
sql: isSelectQuery ? editorValue : '',
+ search_query: ''
}))
}
const handleSearch = (v: string) => {
- setParams((prev) => ({ ...prev, search_query: v || '' }))
+ setParams((prev) => ({ ...prev, search_query: v || '', where: '', sql: '' }))
+ setEditorValue('')
}
return (
@@ -220,9 +231,16 @@ export const LogPage: NextPage = () => {
)}
{error && (
-
-
-
Sorry! Could not fetch data
+
+
+
+
+ Sorry! An error occured when fetching data.
+
+
+ {error}
+
)}
diff --git a/studio/pages/support/new.tsx b/studio/pages/support/new.tsx
index 811c2dacbe3..1b7ebfc0278 100644
--- a/studio/pages/support/new.tsx
+++ b/studio/pages/support/new.tsx
@@ -12,11 +12,13 @@ import {
} from '@supabase/ui'
import SVG from 'react-inlinesvg'
import Link from 'next/link'
+import { useRouter } from 'next/router'
import { API_URL } from 'lib/constants'
import { useStore, withAuth } from 'hooks'
import { post } from 'lib/common/fetch'
import { Project } from 'types'
+import { isUndefined } from 'lodash'
const DEFAULT = {
category: {
@@ -49,6 +51,9 @@ function formReducer(state: any, action: any) {
const SupportNew = () => {
const { ui, app } = useStore()
+ const router = useRouter()
+ const projectRef = router.query.ref
+
const [formState, formDispatch] = useReducer(formReducer, DEFAULT)
const [errors, setErrors] = useState
([])
const [loading, setLoading] = useState(false)
@@ -72,7 +77,12 @@ const SupportNew = () => {
useEffect(() => {
// set project default
if (sortedProjects.length > 1) {
- handleOnChange({ name: 'project', value: sortedProjects[0].ref })
+ const selectedProject = sortedProjects.find((project: Project) => project.ref === projectRef)
+ if (!isUndefined(selectedProject)) {
+ handleOnChange({ name: 'project', value: selectedProject.ref })
+ } else {
+ handleOnChange({ name: 'project', value: sortedProjects[0].ref })
+ }
} else {
// set as 'No specific project'
handleOnChange({ name: 'project', value: projectDefaults[0].ref })
diff --git a/studio/pages/vercel/integrate.tsx b/studio/pages/vercel/integrate.tsx
index 89c244c140b..4859b8d02df 100644
--- a/studio/pages/vercel/integrate.tsx
+++ b/studio/pages/vercel/integrate.tsx
@@ -226,7 +226,7 @@ const Connecting = () => (
const ProjectLinksEmptyState = () => (
- You haven’t created a Supabase project yet. Get started by creating a new Supabase project,
+ You haven't created a Supabase project yet. Get started by creating a new Supabase project,
then close this window and retry adding integration.
diff --git a/studio/stores/app/AppStore.ts b/studio/stores/app/AppStore.ts
index b50a0bebfd0..4ce562ef5b8 100644
--- a/studio/stores/app/AppStore.ts
+++ b/studio/stores/app/AppStore.ts
@@ -1,6 +1,6 @@
import { cloneDeep } from 'lodash'
import { values } from 'mobx'
-import { Project } from 'types'
+import { Organization, Project } from 'types'
import { API_URL, STRIPE_PRODUCT_IDS } from 'lib/constants'
import { IRootStore } from '../RootStore'
@@ -71,19 +71,23 @@ export default class AppStore implements IAppStore {
}
}
- onOrgUpdated(org: any) {
- if (org && org.id) {
- this.organizations.data[org.id] = { ...org }
+ onOrgUpdated(updatedOrg: Organization) {
+ if (updatedOrg && updatedOrg.id) {
+ const originalOrg = this.organizations.data[updatedOrg.id]
+ this.organizations.data[updatedOrg.id] = {
+ ...originalOrg,
+ ...updatedOrg,
+ }
}
}
- onOrgAdded(org: any) {
+ onOrgAdded(org: Organization) {
if (org && org.id) {
- this.organizations.data[org.id] = { ...org }
+ this.organizations.data[org.id] = org
}
}
- onOrgDeleted(org: any) {
+ onOrgDeleted(org: Organization) {
if (org && org.id) {
const projects = values(this.projects.data)
// cleanup projects saved queries
diff --git a/studio/tests/pages/projects/LogPanel.test.js b/studio/tests/pages/projects/LogPanel.test.js
index 35afe931a27..285cf0838ed 100644
--- a/studio/tests/pages/projects/LogPanel.test.js
+++ b/studio/tests/pages/projects/LogPanel.test.js
@@ -17,7 +17,12 @@ test('templates', async () => {
// userEvent.click(screen.getByText("Some option"))
// expect(mockFn).toBeCalled()
})
-
+test('custom mode', async () => {
+ render( new Map() }}>
+ new Map(),
+ shouldRetryOnError: false,
+ }}
+ >
)
})
-import { render, fireEvent, waitFor, screen } from '@testing-library/react'
+import { render, fireEvent, waitFor, screen, act } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { getToggleByText } from '../../helpers'
+import { wait } from '@testing-library/user-event/dist/utils'
beforeEach(() => {
// reset mocks between tests
@@ -181,6 +187,12 @@ test('where clause will trigger a log refresh', async () => {
return { data: [] }
})
const { container } = render(
diff --git a/www/data/Announcements.json b/www/data/Announcements.json
index 4145701af75..77b9ce6ccbe 100644
--- a/www/data/Announcements.json
+++ b/www/data/Announcements.json
@@ -1,33 +1,33 @@
[
{
"type": "Announcement",
- "title": "Launch Week II: The SQL",
- "description": "We're launching a product every day for one week in July.",
- "imgUrl": "images/case-study-monitoro.jpg",
- "logoUrl": "images/logos/monitoro.png",
- "organization": "Monitoro",
- "url": "/blog/2021/07/22/supabase-launch-week-sql",
+ "title": "Supabase Launch Week III: Holiday Special",
+ "description": "Santa's little hackers have been hard at work because we've got another five days of launches ready to go.",
+ "imgUrl": "images/blog/launch-week-three/launch-week-three-og.jpg",
+ "logoUrl": "images/blog/launch-week-three/launch-week-three-og.jpg",
+ "organization": "Supabase",
+ "url": "/blog/2021/11/26/supabase-launch-week-the-trilogy",
"postMeta": {
"name": "Paul Copplestone",
"avatarUrl": "https://avatars0.githubusercontent.com/u/10214025?v=4",
- "publishDate": "Mar 16, 2020",
- "readLength": 6
+ "publishDate": "Nov 26, 2021",
+ "readLength": 2
},
"ctaText": "View case study"
},
{
"type": "Announcement",
- "title": "Supabase Storage",
- "description": "Supabase launches Storage leveraging Postgres.",
- "imgUrl": "images/case-study-monitoro.jpg",
- "logoUrl": "images/logos/monitoro.png",
- "organization": "Monitoro",
- "url": "/blog/2021/03/30/supabase-storage",
+ "title": "Supabase $30m Series A",
+ "description": "Supabase just raised $30M, bringing our total funding to $36M. How will we spend this? Read on to find out.",
+ "imgUrl": "images/blog/series-a/supabase-series-a.png",
+ "logoUrl": "images/blog/series-a/supabase-series-a.png",
+ "organization": "Supabase",
+ "url": "/blog/2021/10/28/supabase-series-a",
"postMeta": {
"name": "Paul Copplestone",
"avatarUrl": "https://avatars0.githubusercontent.com/u/10214025?v=4",
- "publishDate": "Mar 16, 2020",
- "readLength": 6
+ "publishDate": "Oct 28, 2021",
+ "readLength": 28
},
"ctaText": "View case study"
}
diff --git a/www/data/PricingFAQ.json b/www/data/PricingFAQ.json
index 88adacfa878..63ab052c5df 100644
--- a/www/data/PricingFAQ.json
+++ b/www/data/PricingFAQ.json
@@ -5,7 +5,7 @@
},
{
"question": "Is there a cap on the number of projects for the Free Tier?",
- "answer": "Yes, on the Free Tier you can have a maximum of two organizations, each with up to two projects. This means that you can have a maximum of four free projects in your account."
+ "answer": "Yes, you have can up to 2 free projects in your account across all organizations that you own. You also are able to create as many organizations as you want."
},
{
"question": "When will I be billed?",