mirrors/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia synced 2024-11-07 22:30:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added new event to open the requested organization [INS-3300] (#6759)

Browse Source 
* Added new event to open the requested organization

* Check if the organization id exist

* Remove line
This commit is contained in:
Pavlos Koutoglou 2023-11-15 16:44:07 +01:00 committed by GitHub
parent 83df663b45
commit 1238ae4318
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/insomnia/src/ui/routes/organization.tsx
View File

@ -281,15 +281,24 @@ export interface FeatureList {
export const singleOrgLoader: LoaderFunction = async ({ params }) => {
const { organizationId } = params as { organizationId: string };
const organization = organizationsData.organizations.find(o => o.id === organizationId);
if (!organization) {
return redirect('/organization');
}
const fallbackFeatures = {
gitSync: { enabled: false, reason: 'Insomnia API unreachable' },
orgBasicRbac: { enabled: false, reason: 'Insomnia API unreachable' },
};
if (isScratchpadOrganizationId(organizationId)) {
return {
features: fallbackFeatures,
};
}
try {
const response = await window.main.insomniaFetch<{ features: FeatureList } | undefined>({
method: 'GET',

9
packages/insomnia/src/ui/routes/root.tsx
View File

@ -2,7 +2,7 @@ import '../css/styles.css';
import { IpcRendererEvent } from 'electron';
import React, { useEffect, useState } from 'react';
import { LoaderFunction, Outlet, useFetcher, useParams, useRouteLoaderData } from 'react-router-dom';
import { LoaderFunction, Outlet, useFetcher, useNavigate, useParams, useRouteLoaderData } from 'react-router-dom';
import { isDevelopment } from '../../common/constants';
import * as models from '../../models';
@ -53,6 +53,7 @@ const Root = () => {
const [importUri, setImportUri] = useState('');
const actionFetcher = useFetcher();
const navigate = useNavigate();
useEffect(() => {
return window.main.on(
@ -201,13 +202,17 @@ const Root = () => {
break;
}
case 'insomnia://app/open/organization':
navigate(`/organization/${params.organizationId}`);
break;
default: {
console.log(`Unknown deep link: ${url}`);
}
}
},
);
}, [actionFetcher]);
}, [actionFetcher, navigate]);
return (
<AIProvider>