diff --git a/README.md b/README.md index 32a3ce732..7a958827c 100644 --- a/README.md +++ b/README.md @@ -137,7 +137,9 @@ We're currently setting the foundation and building [integrations](https://infis - 🔜 Supabase + + ✔️ Supabase + @@ -145,7 +147,9 @@ We're currently setting the foundation and building [integrations](https://infis - 🔜 Railway (https://github.com/Infisical/infisical/issues/271) + + ✔️ Railway + diff --git a/backend/package-lock.json b/backend/package-lock.json index 5cd3d3a63..575ec0619 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -13,7 +13,7 @@ "@godaddy/terminus": "^4.11.2", "@octokit/rest": "^19.0.5", "@sentry/node": "^7.41.0", - "@sentry/tracing": "^7.41.0", + "@sentry/tracing": "^7.45.0", "@types/crypto-js": "^4.1.1", "@types/libsodium-wrappers": "^0.7.10", "await-to-js": "^3.0.0", @@ -38,7 +38,7 @@ "jsrp": "^0.2.4", "libsodium-wrappers": "^0.7.10", "lodash": "^4.17.21", - "mongoose": "^6.10.3", + "mongoose": "^6.10.4", "nodemailer": "^6.8.0", "posthog-node": "^2.6.0", "query-string": "^7.1.3", @@ -3644,6 +3644,58 @@ "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" }, + "node_modules/@sentry-internal/tracing": { + "version": "7.45.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.45.0.tgz", + "integrity": "sha512-0aIDY2OvUX7k2XHaimOlWkboXoQvJ9dEKvfpu0Wh0YxfUTGPa+wplUdg3WVdkk018sq1L11MKmj4MPZyYUvXhw==", + "dependencies": { + "@sentry/core": "7.45.0", + "@sentry/types": "7.45.0", + "@sentry/utils": "7.45.0", + "tslib": "^1.9.3" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry-internal/tracing/node_modules/@sentry/core": { + "version": "7.45.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.45.0.tgz", + "integrity": "sha512-xJfdTS4lRmHvZI/A5MazdnKhBJFkisKu6G9EGNLlZLre+6W4PH5sb7QX4+xoBdqG7v10Jvdia112vi762ojO2w==", + "dependencies": { + "@sentry/types": "7.45.0", + "@sentry/utils": "7.45.0", + "tslib": "^1.9.3" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry-internal/tracing/node_modules/@sentry/types": { + "version": "7.45.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.45.0.tgz", + "integrity": "sha512-iFt7msfUK8LCodFF3RKUyaxy9tJv/gpWhzxUFyNxtuVwlpmd+q6mtsFGn8Af3pbpm8A+MKyz1ebMwXj0PQqknw==", + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry-internal/tracing/node_modules/@sentry/utils": { + "version": "7.45.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.45.0.tgz", + "integrity": "sha512-aTY7qqtNUudd09SH5DVSKMm3iQ6ZeWufduc0I9bPZe6UMM09BDc4KmjmrzRkdQ+VaOmHo7+v+HZKQk5f+AbuTQ==", + "dependencies": { + "@sentry/types": "7.45.0", + "tslib": "^1.9.3" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/@sentry-internal/tracing/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, "node_modules/@sentry/core": { "version": "7.41.0", "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.41.0.tgz", @@ -3685,24 +3737,16 @@ "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" }, "node_modules/@sentry/tracing": { - "version": "7.41.0", - "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.41.0.tgz", - "integrity": "sha512-zh1ceuwQ8NzE5n8r4y78QrYD/alJl4qlkiEX9lAL6PnLMWJkVWM02BBu+x75yPFWSSDfDA/kZ9WqKkHNdjGpDw==", + "version": "7.45.0", + "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.45.0.tgz", + "integrity": "sha512-FsoFmZPzTBGvWeJH73NxSF1ot61Zw3aIZo5XolengiKnRmcrQOFxebtMKBiZ61QBRYGqsm5uT7QB7zITU6Ikgg==", "dependencies": { - "@sentry/core": "7.41.0", - "@sentry/types": "7.41.0", - "@sentry/utils": "7.41.0", - "tslib": "^1.9.3" + "@sentry-internal/tracing": "7.45.0" }, "engines": { "node": ">=8" } }, - "node_modules/@sentry/tracing/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - }, "node_modules/@sentry/types": { "version": "7.41.0", "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.41.0.tgz", @@ -8257,9 +8301,9 @@ } }, "node_modules/mongoose": { - "version": "6.10.3", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.10.3.tgz", - "integrity": "sha512-fZ3pIlQn7lM632r1l4qiU58lKrJ+FufKVG8TNeRXSChAeu9alCl5KoQ9bLw4jnQNYevSq9o+sqZmFDHP+EVW3g==", + "version": "6.10.4", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.10.4.tgz", + "integrity": "sha512-xCHVVEaOuhZxbthsKYxvHexWafJqWsl03sD7y7uyyt3euLd1sQoDI8DKueeJq9+hrbWkMkAGbGzgFPTIRqenPg==", "dependencies": { "bson": "^4.7.0", "kareem": "2.5.1", @@ -15916,6 +15960,48 @@ "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" }, + "@sentry-internal/tracing": { + "version": "7.45.0", + "resolved": "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.45.0.tgz", + "integrity": "sha512-0aIDY2OvUX7k2XHaimOlWkboXoQvJ9dEKvfpu0Wh0YxfUTGPa+wplUdg3WVdkk018sq1L11MKmj4MPZyYUvXhw==", + "requires": { + "@sentry/core": "7.45.0", + "@sentry/types": "7.45.0", + "@sentry/utils": "7.45.0", + "tslib": "^1.9.3" + }, + "dependencies": { + "@sentry/core": { + "version": "7.45.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.45.0.tgz", + "integrity": "sha512-xJfdTS4lRmHvZI/A5MazdnKhBJFkisKu6G9EGNLlZLre+6W4PH5sb7QX4+xoBdqG7v10Jvdia112vi762ojO2w==", + "requires": { + "@sentry/types": "7.45.0", + "@sentry/utils": "7.45.0", + "tslib": "^1.9.3" + } + }, + "@sentry/types": { + "version": "7.45.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-7.45.0.tgz", + "integrity": "sha512-iFt7msfUK8LCodFF3RKUyaxy9tJv/gpWhzxUFyNxtuVwlpmd+q6mtsFGn8Af3pbpm8A+MKyz1ebMwXj0PQqknw==" + }, + "@sentry/utils": { + "version": "7.45.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-7.45.0.tgz", + "integrity": "sha512-aTY7qqtNUudd09SH5DVSKMm3iQ6ZeWufduc0I9bPZe6UMM09BDc4KmjmrzRkdQ+VaOmHo7+v+HZKQk5f+AbuTQ==", + "requires": { + "@sentry/types": "7.45.0", + "tslib": "^1.9.3" + } + }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + } + } + }, "@sentry/core": { "version": "7.41.0", "resolved": "https://registry.npmjs.org/@sentry/core/-/core-7.41.0.tgz", @@ -15955,21 +16041,11 @@ } }, "@sentry/tracing": { - "version": "7.41.0", - "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.41.0.tgz", - "integrity": "sha512-zh1ceuwQ8NzE5n8r4y78QrYD/alJl4qlkiEX9lAL6PnLMWJkVWM02BBu+x75yPFWSSDfDA/kZ9WqKkHNdjGpDw==", + "version": "7.45.0", + "resolved": "https://registry.npmjs.org/@sentry/tracing/-/tracing-7.45.0.tgz", + "integrity": "sha512-FsoFmZPzTBGvWeJH73NxSF1ot61Zw3aIZo5XolengiKnRmcrQOFxebtMKBiZ61QBRYGqsm5uT7QB7zITU6Ikgg==", "requires": { - "@sentry/core": "7.41.0", - "@sentry/types": "7.41.0", - "@sentry/utils": "7.41.0", - "tslib": "^1.9.3" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" - } + "@sentry-internal/tracing": "7.45.0" } }, "@sentry/types": { @@ -19430,9 +19506,9 @@ } }, "mongoose": { - "version": "6.10.3", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.10.3.tgz", - "integrity": "sha512-fZ3pIlQn7lM632r1l4qiU58lKrJ+FufKVG8TNeRXSChAeu9alCl5KoQ9bLw4jnQNYevSq9o+sqZmFDHP+EVW3g==", + "version": "6.10.4", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-6.10.4.tgz", + "integrity": "sha512-xCHVVEaOuhZxbthsKYxvHexWafJqWsl03sD7y7uyyt3euLd1sQoDI8DKueeJq9+hrbWkMkAGbGzgFPTIRqenPg==", "requires": { "bson": "^4.7.0", "kareem": "2.5.1", diff --git a/backend/package.json b/backend/package.json index 7df70d890..d321112d2 100644 --- a/backend/package.json +++ b/backend/package.json @@ -3,7 +3,7 @@ "@aws-sdk/client-secrets-manager": "^3.299.0", "@godaddy/terminus": "^4.11.2", "@octokit/rest": "^19.0.5", - "@sentry/tracing": "^7.41.0", + "@sentry/tracing": "^7.45.0", "@sentry/node": "^7.40.0", "@sentry/node": "^7.41.0", "@types/crypto-js": "^4.1.1", @@ -30,7 +30,7 @@ "jsrp": "^0.2.4", "libsodium-wrappers": "^0.7.10", "lodash": "^4.17.21", - "mongoose": "^6.10.3", + "mongoose": "^6.10.4", "nodemailer": "^6.8.0", "posthog-node": "^2.6.0", "query-string": "^7.1.3", diff --git a/frontend/src/components/dashboard/DeleteActionButton.tsx b/frontend/src/components/dashboard/DeleteActionButton.tsx index 91819b43c..48b81eaee 100644 --- a/frontend/src/components/dashboard/DeleteActionButton.tsx +++ b/frontend/src/components/dashboard/DeleteActionButton.tsx @@ -1,10 +1,9 @@ -import React, { useState } from 'react' +import React from 'react' import { useTranslation } from 'react-i18next'; import { faXmark } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import Button from '../basic/buttons/Button'; -import { DeleteEnvVar } from '../basic/dialog/DeleteEnvVar'; type Props = { onSubmit: () => void; @@ -13,7 +12,6 @@ type Props = { export const DeleteActionButton = ({ onSubmit, isPlain }: Props) => { const { t } = useTranslation(); - const [open, setOpen] = useState(false) return (
{ onKeyDown={() => null} role="button" tabIndex={0} - onClick={() => setOpen(true)} + onClick={onSubmit} className="invisible group-hover:visible" >
: diff --git a/frontend/src/views/Settings/OrgSettingsPage/OrgSettingsPage.tsx b/frontend/src/views/Settings/OrgSettingsPage/OrgSettingsPage.tsx index d5d8687b7..33b94eafe 100644 --- a/frontend/src/views/Settings/OrgSettingsPage/OrgSettingsPage.tsx +++ b/frontend/src/views/Settings/OrgSettingsPage/OrgSettingsPage.tsx @@ -62,7 +62,10 @@ export const OrgSettingsPage = () => { (orgUsers || []).length >= 5 && subscriptionPlan === plans.starter && host === 'https://app.infisical.com' && - currentWorkspace?._id !== '63ea8121b6e2b0543ba79616'; + currentWorkspace?._id !== '63ea8121b6e2b0543ba79616' && + currentWorkspace?._id !== '634870246fd2e26f28e76996' && + currentWorkspace?._id !== '63d823cef9e728a0a961255a' && + currentWorkspace?._id !== '6412ec319db25595ac00b8c6'; const onRenameOrg = async (name: string) => { if (!currentOrg?._id) return;