From 0a77f9a0c8b1c1bb94ff3bc72627ef14371b7b74 Mon Sep 17 00:00:00 2001 From: esau-morais Date: Wed, 15 Feb 2023 11:06:48 -0300 Subject: [PATCH 1/4] fix(i18n): add missing `forgot-password` in pt-BR --- frontend/public/locales/pt-BR/login.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/public/locales/pt-BR/login.json b/frontend/public/locales/pt-BR/login.json index 9510d1a22..e06a59acd 100644 --- a/frontend/public/locales/pt-BR/login.json +++ b/frontend/public/locales/pt-BR/login.json @@ -4,5 +4,6 @@ "og-description": "Infisical é uma plataforma simples e criptografada de ponta a ponta que permite que as equipes sincronizem e gerenciem seus arquivos .env.", "login": "Entrar", "need-account": "Precisa de uma conta Infisical?", + "forgot-password": "Esqueceu sua senha?", "create-account": "Criar uma conta" -} \ No newline at end of file +} From 5aa75ecd3f1c475d4092df1cf32a5eea0cb91231 Mon Sep 17 00:00:00 2001 From: esau-morais Date: Wed, 15 Feb 2023 12:46:54 -0300 Subject: [PATCH 2/4] feat: save selected env on url --- frontend/src/pages/dashboard/[id].tsx | 55 ++++++++++++++++++--------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/frontend/src/pages/dashboard/[id].tsx b/frontend/src/pages/dashboard/[id].tsx index d0dda0240..4befe8b32 100644 --- a/frontend/src/pages/dashboard/[id].tsx +++ b/frontend/src/pages/dashboard/[id].tsx @@ -138,7 +138,7 @@ export default function Dashboard() { const [dropZoneData, setDropZoneData] = useState(); const [projectTags, setProjectTags] = useState([]); - const { hasUnsavedChanges, setHasUnsavedChanges } = useLeaveConfirm({initialValue: false}); + const { hasUnsavedChanges, setHasUnsavedChanges } = useLeaveConfirm({ initialValue: false }); const { t } = useTranslation(); const { createNotification } = useNotificationContext(); @@ -189,6 +189,7 @@ export default function Dashboard() { useEffect(() => { (async () => { try { + const { push, query } = router const tempNumSnapshots = await getProjectSercetSnapshotsCount({ workspaceId }); @@ -196,19 +197,35 @@ export default function Dashboard() { const userWorkspaces = await getWorkspaces(); const workspace = userWorkspaces.find((wp) => wp._id === workspaceId); if (!workspace) { - router.push(`/dashboard/${userWorkspaces?.[0]?._id}`); + push(`/dashboard/${userWorkspaces?.[0]?._id}`); } setAutoCapitalization(workspace?.autoCapitalization ?? true); const accessibleEnvironments = await getWorkspaceEnvironments({ workspaceId }); setWorkspaceEnvs(accessibleEnvironments || []); + // set env const env = accessibleEnvironments?.[0] || { name: 'unknown', - slug: 'unkown' + slug: 'unknown' }; setSelectedEnv(env); setSelectedSnapshotEnv(env); + + if (query.env) { + const index = accessibleEnvironments?.findIndex(({ slug }: { slug: string }) => slug === query.env) + + setSelectedEnv({ + name: accessibleEnvironments?.[index]?.name as string, + slug: query.env as string + }) + setSelectedSnapshotEnv({ + name: accessibleEnvironments?.[index]?.name as string, + slug: query.env as string + }) + + } + const user = await getUser(); setIsNew((Date.parse(String(new Date())) - Date.parse(user.createdAt)) / 60000 < 3); @@ -418,11 +435,11 @@ export default function Dashboard() { (newData!.filter((dataPoint) => dataPoint.id === initDataPoint.id)[0].value !== initDataPoint.value || newData!.filter((dataPoint) => dataPoint.id === initDataPoint.id)[0].key !== - initDataPoint.key || + initDataPoint.key || newData!.filter((dataPoint) => dataPoint.id === initDataPoint.id)[0].comment !== - initDataPoint.comment) || - newData!.filter((dataPoint) => dataPoint.id === initDataPoint.id)[0]?.tags !== - initDataPoint?.tags + initDataPoint.comment) || + newData!.filter((dataPoint) => dataPoint.id === initDataPoint.id)[0]?.tags !== + initDataPoint?.tags ) .map((secret) => secret.id) .includes(newDataPoint.id) @@ -470,7 +487,7 @@ export default function Dashboard() { (newOverrides!.filter((dataPoint) => dataPoint.id === initDataPoint.id)[0] .valueOverride !== initDataPoint.valueOverride || newOverrides!.filter((dataPoint) => dataPoint.id === initDataPoint.id)[0].key !== - initDataPoint.key || + initDataPoint.key || newOverrides!.filter((dataPoint) => dataPoint.id === initDataPoint.id)[0] .comment !== initDataPoint.comment || newOverrides!.filter((dataPoint) => dataPoint.id === initDataPoint.id)[0]?.tags !== initDataPoint?.tags) @@ -560,7 +577,7 @@ export default function Dashboard() { }; const handleOnEnvironmentChange = (envName: string) => { - if(hasUnsavedChanges) { + if (hasUnsavedChanges) { if (!window.confirm(leaveConfirmDefaultMessage)) return; } @@ -577,6 +594,10 @@ export default function Dashboard() { } setHasUnsavedChanges(false); + router.push({ + pathname: router.pathname, + query: { ...router.query, env: selectedWorkspaceEnv.slug }, + }) }; return data ? ( @@ -803,13 +824,13 @@ export default function Dashboard() {
0
Key - {!snapshotData && reorderRows(1)} > - {sortMethod === 'alphabetical' ? : } + {sortMethod === 'alphabetical' ? : } }
@@ -836,7 +857,7 @@ export default function Dashboard() {
null} role="none" - onClick={() => {}} + onClick={() => { }} className="invisible group-hover:visible" > @@ -847,8 +868,8 @@ export default function Dashboard() {
{!snapshotData && data - ?.filter((row) => - row.key?.toUpperCase().includes(searchKeys.toUpperCase()) + ?.filter((row) => + row.key?.toUpperCase().includes(searchKeys.toUpperCase()) || row.tags?.map(tag => tag.name).join(" ")?.toUpperCase().includes(searchKeys.toUpperCase()) || row.comment?.toUpperCase().includes(searchKeys.toUpperCase())) .filter((row) => !sharedToHide.includes(row.id)) @@ -917,13 +938,13 @@ export default function Dashboard() { /> ))}
-
-
From ea5811c24c3f7be7d5c44d8552d2975537c3d64b Mon Sep 17 00:00:00 2001 From: Vladyslav Matsiiako Date: Mon, 20 Feb 2023 20:30:03 -0800 Subject: [PATCH 3/4] Fixed the bug with the tab indicators --- frontend/src/layouts/AppLayout/AppLayout.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/layouts/AppLayout/AppLayout.tsx b/frontend/src/layouts/AppLayout/AppLayout.tsx index 1e13a6cb0..f29b8aaf2 100644 --- a/frontend/src/layouts/AppLayout/AppLayout.tsx +++ b/frontend/src/layouts/AppLayout/AppLayout.tsx @@ -274,7 +274,7 @@ export const AppLayout = ({ children }: LayoutProps) => { } > {t('nav:menu.secrets')} From bdc99e34cccc5f4f682e28cb695e04a7a0a2b0ed Mon Sep 17 00:00:00 2001 From: Vladyslav Matsiiako Date: Mon, 20 Feb 2023 20:40:32 -0800 Subject: [PATCH 4/4] Fix TS issue --- frontend/src/pages/dashboard/[id].tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frontend/src/pages/dashboard/[id].tsx b/frontend/src/pages/dashboard/[id].tsx index 4befe8b32..62bbd4980 100644 --- a/frontend/src/pages/dashboard/[id].tsx +++ b/frontend/src/pages/dashboard/[id].tsx @@ -217,11 +217,15 @@ export default function Dashboard() { setSelectedEnv({ name: accessibleEnvironments?.[index]?.name as string, - slug: query.env as string + slug: query.env as string, + isWriteDenied: accessibleEnvironments?.[index]?.isWriteDenied as boolean, + isReadDenied: accessibleEnvironments?.[index]?.isReadDenied as boolean }) setSelectedSnapshotEnv({ name: accessibleEnvironments?.[index]?.name as string, - slug: query.env as string + slug: query.env as string, + isWriteDenied: accessibleEnvironments?.[index]?.isWriteDenied as boolean, + isReadDenied: accessibleEnvironments?.[index]?.isReadDenied as boolean }) }