Show import errors

This commit is contained in:
Gregory Schier
2023-11-09 20:00:19 -08:00
parent bf8aad04c7
commit bb2d3dd5b1
4 changed files with 56 additions and 15 deletions

View File

@@ -269,26 +269,23 @@ async fn import_data(
file_paths: Vec<&str>,
) -> Result<ImportResources, String> {
let pool = &*db_instance.lock().await;
let mut resources = plugin::run_plugin_import(
&window.app_handle(),
"insomnia-importer",
file_paths.first().unwrap(),
)
.await;
println!("Resources: {:?}", resources);
if resources.is_none() {
resources = plugin::run_plugin_import(
let mut resources: Option<ImportResources> = None;
let plugins = vec!["yaak-importer", "insomnia-importer"];
for plugin_name in plugins {
if let Some(r) = plugin::run_plugin_import(
&window.app_handle(),
"yaak-importer",
plugin_name,
file_paths.first().unwrap(),
)
.await;
.await
{
resources = Some(r);
break;
}
}
println!("Resources: {:?}", resources);
match resources {
None => Err("Failed to import data".to_string()),
None => Err("No importers found for the chosen file".to_string()),
Some(r) => {
let mut imported_resources = ImportResources::default();

View File

@@ -2,6 +2,7 @@ import { invoke } from '@tauri-apps/api';
import classNames from 'classnames';
import { memo, useMemo } from 'react';
import { useActiveWorkspace } from '../hooks/useActiveWorkspace';
import { useAlert } from '../hooks/useAlert';
import { useAppRoutes } from '../hooks/useAppRoutes';
import { useCreateWorkspace } from '../hooks/useCreateWorkspace';
import { useDeleteWorkspace } from '../hooks/useDeleteWorkspace';
@@ -38,6 +39,7 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
const { appearance, toggleAppearance } = useTheme();
const dialog = useDialog();
const prompt = usePrompt();
const alert = useAlert();
const routes = useAppRoutes();
const items: DropdownItem[] = useMemo(() => {
@@ -155,7 +157,13 @@ export const WorkspaceActionsDropdown = memo(function WorkspaceActionsDropdown({
key: 'import-data',
label: 'Import Data',
leftSlot: <Icon icon="download" />,
onSelect: () => importData.mutate(),
onSelect: () =>
importData.mutateAsync().catch((err) => {
alert({
title: 'Import Failed',
body: err,
});
}),
},
{
key: 'export-data',

21
src-web/hooks/Alert.tsx Normal file
View File

@@ -0,0 +1,21 @@
import type { ReactNode } from 'react';
import { Button } from '../components/core/Button';
import { HStack, VStack } from '../components/core/Stacks';
export interface AlertProps {
onHide: () => void;
body: ReactNode;
}
export function Alert({ onHide, body }: AlertProps) {
return (
<VStack space={3}>
<div>{body}</div>
<HStack space={2} justifyContent="end">
<Button className="focus" color="primary" onClick={onHide}>
Okay
</Button>
</HStack>
</VStack>
);
}

15
src-web/hooks/useAlert.ts Normal file
View File

@@ -0,0 +1,15 @@
import type { DialogProps } from '../components/core/Dialog';
import { useDialog } from '../components/DialogContext';
import type { AlertProps } from './Alert';
import { Alert } from './Alert';
export function useAlert() {
const dialog = useDialog();
return ({ title, body }: { title: DialogProps['title']; body: AlertProps['body'] }) =>
dialog.show({
title,
hideX: true,
size: 'sm',
render: ({ hide }) => Alert({ onHide: hide, body }),
});
}