Compare commits

...

6 Commits

Author SHA1 Message Date
muzam1l
b08b66529c Fix split error 2022-07-05 17:31:49 +05:30
Valtteri Karesto
3af2bad536 Make ping interval longer (#232)
* Make ping interval 45s

Co-authored-by: Vaclav Barta <vbarta@mangrove.cz>
2022-07-04 12:22:06 +02:00
muzamil
0289d64f5e Merge pull request #233 from XRPLF/fix/tab-names
Fix tab names
2022-07-01 19:29:33 +05:30
muzamil
868a0bcf78 Merge pull request #234 from XRPLF/feat/account-in-deploy-dialog
Add account selectable in deploy dialog.
2022-07-01 18:51:04 +05:30
muzam1l
cb25986d72 update transaction tab labels 2022-07-01 17:30:57 +05:30
muzam1l
309ad57173 Skip auto appneding test file extension. 2022-07-01 17:26:10 +05:30
4 changed files with 26 additions and 15 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,13 +31,15 @@ interface TabProps {
// TODO customise messages shown
interface Props {
label?: string;
activeIndex?: number;
activeHeader?: string;
headless?: boolean;
children: ReactElement<TabProps>[];
keepAllAlive?: boolean;
defaultExtension?: string;
forceDefaultExtension?: boolean;
appendDefaultExtension?: boolean;
allowedExtensions?: string[];
onCreateNewTab?: (name: string) => any;
onCloseTab?: (index: number, header?: string) => any;
onChangeActive?: (index: number, header?: string) => any;
@@ -46,6 +48,7 @@ interface Props {
export const Tab = (props: TabProps) => null;
export const Tabs = ({
label = "Tab",
children,
activeIndex,
activeHeader,
@@ -55,7 +58,8 @@ export const Tabs = ({
onCloseTab,
onChangeActive,
defaultExtension = "",
forceDefaultExtension,
appendDefaultExtension = false,
allowedExtensions,
}: Props) => {
const [active, setActive] = useState(activeIndex || 0);
const tabs: TabProps[] = children.map(elem => elem.props);
@@ -86,9 +90,13 @@ 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 };
},
[tabs]
[allowedExtensions, tabs]
);
const handleActiveChange = useCallback(
@@ -101,9 +109,11 @@ export const Tabs = ({
const handleCreateTab = useCallback(() => {
// add default extension in case omitted
let _tabname = tabname.includes(".") ? tabname : tabname + defaultExtension;
if (forceDefaultExtension && !_tabname.endsWith(defaultExtension)) {
_tabname = _tabname + defaultExtension;
let _tabname = tabname.includes(".")
? tabname
: `${tabname}.${defaultExtension}`;
if (appendDefaultExtension && !_tabname.endsWith(defaultExtension)) {
_tabname = `${_tabname}.${defaultExtension}`;
}
const chk = validateTabname(_tabname);
@@ -122,7 +132,7 @@ export const Tabs = ({
}, [
tabname,
defaultExtension,
forceDefaultExtension,
appendDefaultExtension,
validateTabname,
onCreateNewTab,
handleActiveChange,
@@ -206,13 +216,13 @@ export const Tabs = ({
size="sm"
css={{ alignItems: "center", px: "$2", mr: "$3" }}
>
<Plus size="16px" /> {tabs.length === 0 && "Add new tab"}
<Plus size="16px" /> {tabs.length === 0 && `Add new ${label.toLocaleLowerCase()}`}
</Button>
</DialogTrigger>
<DialogContent>
<DialogTitle>Create new tab</DialogTitle>
<DialogTitle>Create new {label.toLocaleLowerCase()}</DialogTitle>
<DialogDescription>
<Label>Tabname</Label>
<Label>{label} name</Label>
<Input
value={tabname}
onChange={e => setTabname(e.target.value)}

View File

@@ -45,7 +45,7 @@ const Test = () => {
? [50, 20, 30]
: hasScripts
? [50, 20, 50]
: [50, 50]
: [50, 50, 0]
}
gutterSize={4}
gutterAlign="center"
@@ -76,14 +76,15 @@ 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
forceDefaultExtension
defaultExtension=".json"
defaultExtension="json"
allowedExtensions={['json']}
onCreateNewTab={(header) => modifyTransaction(header, {})}
onCloseTab={(idx, header) =>
header && modifyTransaction(header, undefined)

View File

@@ -3480,7 +3480,7 @@ react-select@^5.2.1:
react-split@^2.0.14:
version "2.0.14"
resolved "https://registry.npmjs.org/react-split/-/react-split-2.0.14.tgz"
resolved "https://registry.yarnpkg.com/react-split/-/react-split-2.0.14.tgz#ef198259bf43264d605f792fb3384f15f5b34432"
integrity sha512-bKWydgMgaKTg/2JGQnaJPg51T6dmumTWZppFgEbbY0Fbme0F5TuatAScCLaqommbGQQf/ZT1zaejuPDriscISA==
dependencies:
prop-types "^15.5.7"