Skip to content

Commit 13022fb

Browse files
gregnrgregnr
committed
Merge branch 'main' into feat/themes
2 parents f57c002 + 11dde05 commit 13022fb

File tree

8 files changed

+294
-27
lines changed

8 files changed

+294
-27
lines changed

‎.github/workflows/run-migrations.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Run Migrations
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
run-migrations:
10+
runs-on: ubuntu-latest
11+
12+
env:
13+
SUPABASE_ACCESS_TOKEN: ${{ secrets.SUPABASE_ACCESS_TOKEN }}
14+
SUPABASE_DB_PASSWORD: ${{ secrets.SUPABASE_PROD_DB_PASSWORD }}
15+
PROJECT_ID: ${{ vars.SUPABASE_PROD_PROJECT_ID }}
16+
17+
# Create placeholder vars so that supabase/config.toml can load
18+
SUPABASE_AUTH_GITHUB_CLIENT_ID: placeholder
19+
SUPABASE_AUTH_GITHUB_SECRET: placeholder
20+
SUPABASE_AUTH_GITHUB_REDIRECT_URI: placeholder
21+
22+
steps:
23+
- uses: actions/checkout@v4
24+
- uses: supabase/setup-cli@v1
25+
with:
26+
version: latest
27+
- run: supabase link --project-ref $PROJECT_ID
28+
- run: supabase db push

‎LICENSE

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright 2024 Supabase
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎apps/postgres-new/components/sidebar.tsx

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
ArrowLeftToLine,
66
ArrowRightToLine,
77
Database as DbIcon,
8+
Download,
89
Loader,
910
LogOut,
1011
MoreVertical,
@@ -22,9 +23,10 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '~/components/ui/tooltip
2223
import { useDatabaseDeleteMutation } from '~/data/databases/database-delete-mutation'
2324
import { useDatabaseUpdateMutation } from '~/data/databases/database-update-mutation'
2425
import { useDatabasesQuery } from '~/data/databases/databases-query'
25-
import { usePublishWaitlistCreateMutation } from '~/data/publish-waitlist/publish-waitlist-create-mutation'
26-
import { useIsOnPublishWaitlistQuery } from '~/data/publish-waitlist/publish-waitlist-query'
26+
import { useDeployWaitlistCreateMutation } from '~/data/deploy-waitlist/deploy-waitlist-create-mutation'
27+
import { useIsOnDeployWaitlistQuery } from '~/data/deploy-waitlist/deploy-waitlist-query'
2728
import { Database } from '~/lib/db'
29+
import { downloadFile, titleToKebabCase } from '~/lib/util'
2830
import { cn } from '~/lib/utils'
2931
import { useApp } from './app-provider'
3032
import { CodeBlock } from './code-block'
@@ -226,34 +228,34 @@ type DatabaseMenuItemProps = {
226228

227229
function DatabaseMenuItem({ database, isActive }: DatabaseMenuItemProps) {
228230
const router = useRouter()
229-
const { user } = useApp()
231+
const { user, dbManager } = useApp()
230232
const [isPopoverOpen, setIsPopoverOpen] = useState(false)
231233
const { mutateAsync: deleteDatabase } = useDatabaseDeleteMutation()
232234
const { mutateAsync: updateDatabase } = useDatabaseUpdateMutation()
233235

234236
const [isRenaming, setIsRenaming] = useState(false)
235-
const [isPublishDialogOpen, setIsPublishDialogOpen] = useState(false)
237+
const [isDeployDialogOpen, setIsDeployDialogOpen] = useState(false)
236238

237-
const { data: isOnPublishWaitlist } = useIsOnPublishWaitlistQuery()
238-
const { mutateAsync: joinPublishWaitlist } = usePublishWaitlistCreateMutation()
239+
const { data: isOnDeployWaitlist } = useIsOnDeployWaitlistQuery()
240+
const { mutateAsync: joinDeployWaitlist } = useDeployWaitlistCreateMutation()
239241

240242
return (
241243
<>
242244
<Dialog
243-
open={isPublishDialogOpen}
245+
open={isDeployDialogOpen}
244246
onOpenChange={(open) => {
245-
setIsPublishDialogOpen(open)
247+
setIsDeployDialogOpen(open)
246248
}}
247249
>
248250
<DialogContent className="max-w-2xl">
249251
<DialogHeader>
250-
<DialogTitle>Database publishing is in Private Alpha</DialogTitle>
252+
<DialogTitle>Deployments are in Private Alpha</DialogTitle>
251253
<div className="py-2 border-b" />
252254
</DialogHeader>
253-
<h2 className="font-medium">What is database publishing?</h2>
255+
<h2 className="font-medium">What are deployments?</h2>
254256
<p>
255-
Publish your database so that it can be accessed outside the browser using any Postgres
256-
client:
257+
Deploy your database to a serverless PGlite instance so that it can be accessed outside
258+
the browser using any Postgres client:
257259
</p>
258260
<CodeBlock
259261
className="language-curl bg-neutral-800"
@@ -265,11 +267,11 @@ function DatabaseMenuItem({ database, isActive }: DatabaseMenuItemProps) {
265267
</CodeBlock>
266268
<div className="flex justify-center items-center mt-3">
267269
<AnimatePresence initial={false}>
268-
{!isOnPublishWaitlist ? (
270+
{!isOnDeployWaitlist ? (
269271
<button
270272
className="px-4 py-3 bg-black text-white rounded-md"
271273
onClick={async () => {
272-
await joinPublishWaitlist()
274+
await joinDeployWaitlist()
273275
}}
274276
>
275277
Join Private Alpha
@@ -284,8 +286,8 @@ function DatabaseMenuItem({ database, isActive }: DatabaseMenuItemProps) {
284286
initial="hidden"
285287
animate="show"
286288
>
287-
<h3 className="font-medium mb-2">🎉 You&apos;re on the list!</h3>
288-
<p>We&apos;ll let you know when you have access to publish.</p>
289+
<h3 className="font-medium mb-2">🎉 You&apos;re on the waitlist!</h3>
290+
<p>We&apos;ll send you an email when you have access to deploy.</p>
289291
</m.div>
290292
)}
291293
</AnimatePresence>
@@ -379,7 +381,30 @@ function DatabaseMenuItem({ database, isActive }: DatabaseMenuItemProps) {
379381
className="gap-3"
380382
onSelect={async (e) => {
381383
e.preventDefault()
382-
setIsPublishDialogOpen(true)
384+
385+
if (!dbManager) {
386+
throw new Error('dbManager is not available')
387+
}
388+
389+
const db = await dbManager.getDbInstance(database.id)
390+
const dumpBlob = await db.dumpDataDir()
391+
392+
const fileName = `${titleToKebabCase(database.name ?? 'My Database')}-${Date.now()}`
393+
const file = new File([dumpBlob], fileName, { type: dumpBlob.type })
394+
395+
downloadFile(file)
396+
}}
397+
>
398+
<Download size={16} strokeWidth={2} className="flex-shrink-0" />
399+
400+
<span>Download</span>
401+
</DropdownMenuItem>
402+
<DropdownMenuItem
403+
className="bg-inherit justify-start hover:bg-neutral-200 flex gap-3"
404+
onClick={async (e) => {
405+
e.preventDefault()
406+
407+
setIsDeployDialogOpen(true)
383408
setIsPopoverOpen(false)
384409
}}
385410
disabled={user === undefined}

‎apps/postgres-new/data/publish-waitlist/publish-waitlist-create-mutation.ts renamed to ‎apps/postgres-new/data/deploy-waitlist/deploy-waitlist-create-mutation.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'
22
import { createClient } from '~/utils/supabase/client'
3-
import { getIsOnPublishWaitlistQueryKey } from './publish-waitlist-query'
3+
import { getIsOnDeployWaitlistQueryKey } from './deploy-waitlist-query'
44

5-
export const usePublishWaitlistCreateMutation = ({
5+
export const useDeployWaitlistCreateMutation = ({
66
onSuccess,
77
onError,
88
...options
@@ -13,15 +13,15 @@ export const usePublishWaitlistCreateMutation = ({
1313
mutationFn: async () => {
1414
const supabase = createClient()
1515

16-
const { error } = await supabase.from('publish_waitlist').insert({})
16+
const { error } = await supabase.from('deploy_waitlist').insert({})
1717

1818
if (error) {
1919
throw error
2020
}
2121
},
2222
async onSuccess(data, variables, context) {
2323
await Promise.all([
24-
queryClient.invalidateQueries({ queryKey: getIsOnPublishWaitlistQueryKey() }),
24+
queryClient.invalidateQueries({ queryKey: getIsOnDeployWaitlistQueryKey() }),
2525
])
2626
return onSuccess?.(data, variables, context)
2727
},

0 commit comments

Comments
 (0)