Compare commits

..

2 Commits

Author SHA1 Message Date
Vaclav Barta
057a1afa03 decreasing to 45s 2022-07-01 12:36:15 +02:00
Valtteri Karesto
ca1724e994 Make ping interval 90s 2022-07-01 12:32:51 +03:00
3 changed files with 13 additions and 24 deletions

View File

@@ -87,7 +87,7 @@ const addListeners = (account: ISelect | null) => {
if (streamState.socket) {
interval = setInterval(() => {
streamState.socket?.send("");
}, 10000);
}, 45000);
}
streamState.socket.addEventListener("open", () => onOpen(account));

View File

@@ -31,15 +31,13 @@ interface TabProps {
// TODO customise messages shown
interface Props {
label?: string;
activeIndex?: number;
activeHeader?: string;
headless?: boolean;
children: ReactElement<TabProps>[];
keepAllAlive?: boolean;
defaultExtension?: string;
appendDefaultExtension?: boolean;
allowedExtensions?: string[];
forceDefaultExtension?: boolean;
onCreateNewTab?: (name: string) => any;
onCloseTab?: (index: number, header?: string) => any;
onChangeActive?: (index: number, header?: string) => any;
@@ -48,7 +46,6 @@ interface Props {
export const Tab = (props: TabProps) => null;
export const Tabs = ({
label = "Tab",
children,
activeIndex,
activeHeader,
@@ -58,8 +55,7 @@ export const Tabs = ({
onCloseTab,
onChangeActive,
defaultExtension = "",
appendDefaultExtension = false,
allowedExtensions,
forceDefaultExtension,
}: Props) => {
const [active, setActive] = useState(activeIndex || 0);
const tabs: TabProps[] = children.map(elem => elem.props);
@@ -90,13 +86,9 @@ export const Tabs = ({
if (tabs.find(tab => tab.header === tabname)) {
return { error: "Name already exists." };
}
const ext = tabname.split(".").pop() || "";
if (allowedExtensions && !allowedExtensions.includes(ext)) {
return { error: "This file extension is not allowed!" };
}
return { error: null };
},
[allowedExtensions, tabs]
[tabs]
);
const handleActiveChange = useCallback(
@@ -109,11 +101,9 @@ export const Tabs = ({
const handleCreateTab = useCallback(() => {
// add default extension in case omitted
let _tabname = tabname.includes(".")
? tabname
: `${tabname}.${defaultExtension}`;
if (appendDefaultExtension && !_tabname.endsWith(defaultExtension)) {
_tabname = `${_tabname}.${defaultExtension}`;
let _tabname = tabname.includes(".") ? tabname : tabname + defaultExtension;
if (forceDefaultExtension && !_tabname.endsWith(defaultExtension)) {
_tabname = _tabname + defaultExtension;
}
const chk = validateTabname(_tabname);
@@ -132,7 +122,7 @@ export const Tabs = ({
}, [
tabname,
defaultExtension,
appendDefaultExtension,
forceDefaultExtension,
validateTabname,
onCreateNewTab,
handleActiveChange,
@@ -216,13 +206,13 @@ export const Tabs = ({
size="sm"
css={{ alignItems: "center", px: "$2", mr: "$3" }}
>
<Plus size="16px" /> {tabs.length === 0 && `Add new ${label.toLocaleLowerCase()}`}
<Plus size="16px" /> {tabs.length === 0 && "Add new tab"}
</Button>
</DialogTrigger>
<DialogContent>
<DialogTitle>Create new {label.toLocaleLowerCase()}</DialogTitle>
<DialogTitle>Create new tab</DialogTitle>
<DialogDescription>
<Label>{label} name</Label>
<Label>Tabname</Label>
<Input
value={tabname}
onChange={e => setTabname(e.target.value)}

View File

@@ -76,15 +76,14 @@ const Test = () => {
>
<Box css={{ width: "55%", px: "$2" }}>
<Tabs
label='Transaction'
activeHeader={activeHeader}
// TODO make header a required field
onChangeActive={(idx, header) => {
if (header) transactionsState.activeHeader = header;
}}
keepAllAlive
defaultExtension="json"
allowedExtensions={['json']}
forceDefaultExtension
defaultExtension=".json"
onCreateNewTab={(header) => modifyTransaction(header, {})}
onCloseTab={(idx, header) =>
header && modifyTransaction(header, undefined)