Skip to content
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.

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

adds workspace count to root #6639

Merged
merged 2 commits into from Oct 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 7 additions & 13 deletions packages/insomnia/src/common/export-all-data.ts
@@ -1,12 +1,11 @@
import { mkdir, writeFile } from 'fs/promises';
import { join } from 'path';

import { apiSpec, cookieJar, environment, grpcRequest, project, protoDirectory, protoFile, request, requestGroup, unitTest, unitTestSuite, webSocketPayload, webSocketRequest, workspace } from '../models';
import { apiSpec, cookieJar, environment, grpcRequest, protoDirectory, protoFile, request, requestGroup, unitTest, unitTestSuite, webSocketPayload, webSocketRequest, workspace } from '../models';
import { ApiSpec } from '../models/api-spec';
import { CookieJar } from '../models/cookie-jar';
import { Environment } from '../models/environment';
import { GrpcRequest } from '../models/grpc-request';
import type { Project } from '../models/project';
import { ProtoDirectory } from '../models/proto-directory';
import { ProtoFile } from '../models/proto-file';
import { Request } from '../models/request';
Expand Down Expand Up @@ -214,18 +213,13 @@ export async function exportAllData({
}): Promise<void> {
const insomniaExportFolder = join(dirPath, `insomnia-export.${Date.now()}`);
await mkdir(insomniaExportFolder);
const projects = await database.all<Project>(project.type);

for (const project of projects) {
const workspaces = await database.find<Workspace>(workspace.type, {
parentId: project._id,
});
const workspaces = await database.find<Workspace>(workspace.type);

for (const workspace of workspaces) {
await exportWorkspaceData({
workspaceId: workspace._id,
dirPath: insomniaExportFolder,
});
}
for (const workspace of workspaces) {
await exportWorkspaceData({
workspaceId: workspace._id,
dirPath: insomniaExportFolder,
});
}
}
5 changes: 3 additions & 2 deletions packages/insomnia/src/ui/routes/organization.tsx
Expand Up @@ -344,7 +344,8 @@ const UpgradeButton = () => {
};

const OrganizationRoute = () => {
const { settings } = useRootLoaderData();
const { settings, workspaceCount } = useRootLoaderData();

const { organizations, user } =
useLoaderData() as OrganizationLoaderData;
const workspaceData = useRouteLoaderData(
Expand Down Expand Up @@ -638,7 +639,7 @@ const OrganizationRoute = () => {
/>{' '}
{user
? status.charAt(0).toUpperCase() + status.slice(1)
: 'Log in to sync your data'}
: `Log in to sync your data (${workspaceCount} files)`}
</Button>
<Tooltip
placement="top"
Expand Down
8 changes: 3 additions & 5 deletions packages/insomnia/src/ui/routes/root.tsx
Expand Up @@ -28,11 +28,8 @@ import { NunjucksEnabledProvider } from '../context/nunjucks/nunjucks-enabled-co
import Modals from './modals';

export interface RootLoaderData {
user?: {
name: string;
picture: string;
};
settings: Settings;
workspaceCount: number;
}

export const useRootLoaderData = () => {
Expand All @@ -41,9 +38,10 @@ export const useRootLoaderData = () => {

export const loader: LoaderFunction = async (): Promise<RootLoaderData> => {
const settings = await models.settings.get();

const workspaceCount = await models.workspace.count();
return {
settings,
workspaceCount,
};
};

Expand Down