Skip to content

fix: post-emulator regressions #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
flowdeskadmin merged 3 commits into from
Jul 3, 2026
+95 −81
Merged

fix: post-emulator regressions #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
136122c
fix: refresh collections reducer not updating for emulator projects
re1sub Jul 1, 2026
709680e
fix: hide add database UI for emulator projects
re1sub Jul 1, 2026
2ba3451
fix: await refreshCollections after createCollection to surface errors
re1sub Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/features/collections/store/collectionSlice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,13 +323,13 @@ export const createCollection = createAppAsyncThunk<
}

const fdId = firestoreDatabaseId ?? getActiveFirestoreDatabase(project)?.id;
dispatch(
await dispatch(
refreshCollections({
project,
refreshToken: project.refreshToken,
...(fdId ? { firestoreDatabaseId: fdId } : {}),
}),
);
).unwrap();
return trimmedName;
} catch (error) {
const errorMessage = error instanceof Error ? error.message : 'Unknown error';
Expand Down
14 changes: 8 additions & 6 deletions src/features/projects/components/sidebar/SidebarMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,14 @@ function SidebarMenu({
<Typography sx={{ fontSize: '0.8rem', color: 'text.primary', fontWeight: 600 }}>Firestore</Typography>
</Box>
<Divider />
<MenuItem onClick={() => handleAction(onAddFirestoreDatabase, menuTarget.project)}>
<ListItemIcon>
<AddIcon fontSize="small" />
</ListItemIcon>
Add database
</MenuItem>
{menuTarget.project.authMethod !== 'emulator' && (
<MenuItem onClick={() => handleAction(onAddFirestoreDatabase, menuTarget.project)}>
<ListItemIcon>
<AddIcon fontSize="small" />
</ListItemIcon>
Add database
</MenuItem>
)}
</>
) : menuTarget?.menuType === 'firestoreDatabase' ? (
<>
Expand Down
154 changes: 82 additions & 72 deletions src/features/projects/components/sidebar/SidebarProjectsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,18 +430,20 @@ function SidebarProjectsList({
>
Firestore
</Typography>
<Tooltip title="Add database">
<IconButton
size="small"
onClick={(e) => {
e.stopPropagation();
onAddFirestoreDatabase(project);
}}
sx={{ p: 0.25, color: 'primary.main' }}
>
<AddIcon sx={{ fontSize: 16 }} />
</IconButton>
</Tooltip>
{project.authMethod !== 'emulator' && (
<Tooltip title="Add database">
<IconButton
size="small"
onClick={(e) => {
e.stopPropagation();
onAddFirestoreDatabase(project);
}}
sx={{ p: 0.25, color: 'primary.main' }}
>
<AddIcon sx={{ fontSize: 16 }} />
</IconButton>
</Tooltip>
)}
<IconButton
size="small"
onClick={(e) => {
Expand Down Expand Up @@ -927,18 +929,20 @@ function SidebarProjectsList({
>
Firestore
</Typography>
<Tooltip title="Add database">
<IconButton
size="small"
onClick={(e) => {
e.stopPropagation();
onAddFirestoreDatabase(project);
}}
sx={{ p: 0.25, color: 'primary.main' }}
>
<AddIcon sx={{ fontSize: 16 }} />
</IconButton>
</Tooltip>
{project.authMethod !== 'emulator' && (
<Tooltip title="Add database">
<IconButton
size="small"
onClick={(e) => {
e.stopPropagation();
onAddFirestoreDatabase(project);
}}
sx={{ p: 0.25, color: 'primary.main' }}
>
<AddIcon sx={{ fontSize: 16 }} />
</IconButton>
</Tooltip>
)}
<IconButton
size="small"
onClick={(e) => {
Expand Down Expand Up @@ -1171,24 +1175,26 @@ function SidebarProjectsList({
);
})}

<Box
onClick={(e) => {
e.stopPropagation();
onAddFirestoreDatabase(project);
}}
sx={{
display: 'flex',
alignItems: 'center',
px: 1,
py: 0.5,
cursor: 'pointer',
color: 'primary.main',
'&:hover': { bgcolor: 'action.hover' },
}}
>
<AddIcon sx={{ fontSize: 14, mr: 0.5 }} />
<Typography sx={{ fontSize: '0.75rem' }}>Add database</Typography>
</Box>
{project.authMethod !== 'emulator' && (
<Box
onClick={(e) => {
e.stopPropagation();
onAddFirestoreDatabase(project);
}}
sx={{
display: 'flex',
alignItems: 'center',
px: 1,
py: 0.5,
cursor: 'pointer',
color: 'primary.main',
'&:hover': { bgcolor: 'action.hover' },
}}
>
<AddIcon sx={{ fontSize: 14, mr: 0.5 }} />
<Typography sx={{ fontSize: '0.75rem' }}>Add database</Typography>
</Box>
)}
</Box>
</Collapse>
</Box>
Expand Down Expand Up @@ -1392,18 +1398,20 @@ function SidebarProjectsList({
>
Firestore
</Typography>
<Tooltip title="Add database">
<IconButton
size="small"
onClick={(e) => {
e.stopPropagation();
onAddFirestoreDatabase(project);
}}
sx={{ p: 0.25, color: 'primary.main' }}
>
<AddIcon sx={{ fontSize: 16 }} />
</IconButton>
</Tooltip>
{project.authMethod !== 'emulator' && (
<Tooltip title="Add database">
<IconButton
size="small"
onClick={(e) => {
e.stopPropagation();
onAddFirestoreDatabase(project);
}}
sx={{ p: 0.25, color: 'primary.main' }}
>
<AddIcon sx={{ fontSize: 16 }} />
</IconButton>
</Tooltip>
)}
<IconButton
size="small"
onClick={(e) => {
Expand Down Expand Up @@ -1636,24 +1644,26 @@ function SidebarProjectsList({
);
})}

<Box
onClick={(e) => {
e.stopPropagation();
onAddFirestoreDatabase(project);
}}
sx={{
display: 'flex',
alignItems: 'center',
px: 1,
py: 0.5,
cursor: 'pointer',
color: 'primary.main',
'&:hover': { bgcolor: 'action.hover' },
}}
>
<AddIcon sx={{ fontSize: 14, mr: 0.5 }} />
<Typography sx={{ fontSize: '0.75rem' }}>Add database</Typography>
</Box>
{project.authMethod !== 'emulator' && (
<Box
onClick={(e) => {
e.stopPropagation();
onAddFirestoreDatabase(project);
}}
sx={{
display: 'flex',
alignItems: 'center',
px: 1,
py: 0.5,
cursor: 'pointer',
color: 'primary.main',
'&:hover': { bgcolor: 'action.hover' },
}}
>
<AddIcon sx={{ fontSize: 14, mr: 0.5 }} />
<Typography sx={{ fontSize: '0.75rem' }}>Add database</Typography>
</Box>
)}
</Box>
</Collapse>
</Box>
Expand Down
4 changes: 3 additions & 1 deletion src/features/projects/store/projectsSlice.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,9 @@ const projectsSlice = createSlice({
if (item.id === projectId) {
const proj = item as Project;
if (
(proj.authMethod === 'serviceAccount' || proj.authMethod === 'google') &&
(proj.authMethod === 'serviceAccount' ||
proj.authMethod === 'google' ||
proj.authMethod === 'emulator') &&
firestoreDatabaseId &&
proj.firestoreDatabases?.length
) {
Expand Down
Loading