Fixed a copy bug for firefox
This commit is contained in:
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
version: '3'
|
version: '3'
|
||||||
services:
|
services:
|
||||||
frontend:
|
frontend:
|
||||||
#build: ./frontend
|
build: ./frontend
|
||||||
image: ghcr.io/frikky/shuffle-frontend:nightly
|
image: ghcr.io/frikky/shuffle-frontend:nightly
|
||||||
container_name: shuffle-frontend
|
container_name: shuffle-frontend
|
||||||
hostname: shuffle-frontend
|
hostname: shuffle-frontend
|
||||||
@@ -16,7 +16,7 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
- backend
|
- backend
|
||||||
backend:
|
backend:
|
||||||
build: ./backend
|
#build: ./backend
|
||||||
image: ghcr.io/frikky/shuffle-backend:nightly
|
image: ghcr.io/frikky/shuffle-backend:nightly
|
||||||
container_name: shuffle-backend
|
container_name: shuffle-backend
|
||||||
hostname: ${BACKEND_HOSTNAME}
|
hostname: ${BACKEND_HOSTNAME}
|
||||||
|
|||||||
@@ -1764,16 +1764,14 @@ const Admin = (props) => {
|
|||||||
run2FASetup(userdata);
|
run2FASetup(userdata);
|
||||||
}}
|
}}
|
||||||
disabled={
|
disabled={
|
||||||
(selectedUser.role === "admin" &&
|
(selectedUser.role === "admin" && selectedUser.username !== userdata.username)
|
||||||
selectedUser.username !== userdata.username) ||
|
|
||||||
selectedUser.active === false
|
|
||||||
}
|
}
|
||||||
variant="outlined"
|
variant="outlined"
|
||||||
color="primary"
|
color="primary"
|
||||||
>
|
>
|
||||||
{selectedUser.mfa_info !== undefined &&
|
{ selectedUser.mfa_info !== undefined &&
|
||||||
selectedUser.mfa_info !== null &&
|
selectedUser.mfa_info !== null &&
|
||||||
selectedUser.mfa_info.active === true
|
selectedUser.mfa_info.active === true
|
||||||
? "Disable 2FA"
|
? "Disable 2FA"
|
||||||
: "Enable 2FA"}
|
: "Enable 2FA"}
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -2983,6 +2983,16 @@ const AngularWorkflow = (props) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
event.target !== undefined &&
|
||||||
|
event.target !== null
|
||||||
|
) {
|
||||||
|
if (event.target.localName !== "body") {
|
||||||
|
console.log("Skipping because body is not targeted")
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
console.log("CTRL+C");
|
console.log("CTRL+C");
|
||||||
if (cy !== undefined) {
|
if (cy !== undefined) {
|
||||||
var cydata = cy.$(":selected").jsons();
|
var cydata = cy.$(":selected").jsons();
|
||||||
@@ -3051,19 +3061,31 @@ const AngularWorkflow = (props) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const handlePaste = (event) => {
|
const handlePaste = (event) => {
|
||||||
//console.log(event)
|
//console.log("EV: ", event)
|
||||||
if (
|
if (
|
||||||
event.path !== undefined &&
|
event.path !== undefined &&
|
||||||
event.path !== null &&
|
event.path !== null &&
|
||||||
event.path.length > 0
|
event.path.length > 0
|
||||||
) {
|
) {
|
||||||
//console.log(event.path[0])
|
console.log("PATH: ", event.path[0])
|
||||||
if (event.path[0].localName !== "body") {
|
if (event.path[0].localName !== "body") {
|
||||||
//console.log("Skipping because body is not targeted")
|
//console.log("Skipping because body is not targeted")
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log("PATH2: ", event.target)
|
||||||
|
if (
|
||||||
|
event.target !== undefined &&
|
||||||
|
event.target !== null
|
||||||
|
) {
|
||||||
|
if (event.target.localName !== "body") {
|
||||||
|
//console.log("Skipping because body is not targeted")
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
const clipboard = (event.originalEvent || event).clipboardData.getData(
|
const clipboard = (event.originalEvent || event).clipboardData.getData(
|
||||||
"text/plain"
|
"text/plain"
|
||||||
@@ -3078,6 +3100,7 @@ const AngularWorkflow = (props) => {
|
|||||||
for (var key in parsedjson) {
|
for (var key in parsedjson) {
|
||||||
const item = parsedjson[key];
|
const item = parsedjson[key];
|
||||||
console.log("Adding: ", item);
|
console.log("Adding: ", item);
|
||||||
|
item.data.id = uuidv4()
|
||||||
|
|
||||||
cy.add({
|
cy.add({
|
||||||
group: item.group,
|
group: item.group,
|
||||||
@@ -5025,7 +5048,7 @@ const AngularWorkflow = (props) => {
|
|||||||
</div>
|
</div>
|
||||||
</Zoom>
|
</Zoom>
|
||||||
:
|
:
|
||||||
<div>
|
<div key={index}>
|
||||||
{extraMessage}
|
{extraMessage}
|
||||||
<ParsedAppPaper key={index} app={app} />
|
<ParsedAppPaper key={index} app={app} />
|
||||||
</div>
|
</div>
|
||||||
@@ -10571,7 +10594,9 @@ const AngularWorkflow = (props) => {
|
|||||||
executionData.completed_at !== null &&
|
executionData.completed_at !== null &&
|
||||||
executionData.completed_at > 0 ? (
|
executionData.completed_at > 0 ? (
|
||||||
<div style={{ display: "flex" }}>
|
<div style={{ display: "flex" }}>
|
||||||
<Typography variant="body1">
|
<Typography variant="body1" onClick={() => {
|
||||||
|
console.log(executionData)
|
||||||
|
}}>
|
||||||
<b>Finished </b>
|
<b>Finished </b>
|
||||||
</Typography>
|
</Typography>
|
||||||
<Typography variant="body1" color="textSecondary">
|
<Typography variant="body1" color="textSecondary">
|
||||||
|
|||||||
@@ -72,13 +72,14 @@ const Docs = (props) => {
|
|||||||
position: "relative",
|
position: "relative",
|
||||||
padding: 30,
|
padding: 30,
|
||||||
paddingTop: 15,
|
paddingTop: 15,
|
||||||
height: "80vh",
|
|
||||||
marginTop: 15,
|
marginTop: 15,
|
||||||
|
minHeight: "50vh",
|
||||||
|
//height: "50vh",
|
||||||
};
|
};
|
||||||
|
|
||||||
const SideBar = {
|
const SideBar = {
|
||||||
maxWidth: 250,
|
maxWidth: 250,
|
||||||
flex: "1",
|
flex: 1,
|
||||||
position: "fixed",
|
position: "fixed",
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -649,8 +650,9 @@ const Docs = (props) => {
|
|||||||
// </Dialog>
|
// </Dialog>
|
||||||
// {imageModal}
|
// {imageModal}
|
||||||
|
|
||||||
|
// Padding and zIndex etc set because of footer in cloud.
|
||||||
const loadedCheck = (
|
const loadedCheck = (
|
||||||
<div>
|
<div style={{minHeight: 1000, paddingBottom: 150, zIndex: 50000, }}>
|
||||||
<BrowserView>{postDataBrowser}</BrowserView>
|
<BrowserView>{postDataBrowser}</BrowserView>
|
||||||
<MobileView>{postDataMobile}</MobileView>
|
<MobileView>{postDataMobile}</MobileView>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -384,12 +384,12 @@ const Settings = (props) => {
|
|||||||
<Grid item xs={4} style={{ borderRadius: theme.palette.borderRadius }}>
|
<Grid item xs={4} style={{ borderRadius: theme.palette.borderRadius }}>
|
||||||
<Paper style={innerPaperStyle}>
|
<Paper style={innerPaperStyle}>
|
||||||
<img
|
<img
|
||||||
src={data.image_thumbnail_url}
|
src={data.image}
|
||||||
alt={data.name}
|
alt={data.name}
|
||||||
style={{ width: "100%", marginBottom: 10 }}
|
style={{ width: "100%", marginBottom: 10 }}
|
||||||
/>
|
/>
|
||||||
<Typography variant="body2" color="textSecondary">
|
<Typography variant="body2" color="textSecondary">
|
||||||
{data.collection.name}
|
{data.collection}
|
||||||
</Typography>
|
</Typography>
|
||||||
<Typography variant="body2">{data.name}</Typography>
|
<Typography variant="body2">{data.name}</Typography>
|
||||||
</Paper>
|
</Paper>
|
||||||
@@ -746,7 +746,7 @@ const Settings = (props) => {
|
|||||||
>
|
>
|
||||||
<Typography>
|
<Typography>
|
||||||
<img
|
<img
|
||||||
src="https://upload.wikimedia.org/wikipedia/commons/thumb/6/6f/Ethereum-icon-purple.svg/480px-Ethereum-icon-purple.svg.png"
|
src="/images/social/ethereum.png"
|
||||||
alt="ethereum-icon"
|
alt="ethereum-icon"
|
||||||
style={{ height: 30 }}
|
style={{ height: 30 }}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -2521,8 +2521,8 @@ const Workflows = (props) => {
|
|||||||
<Typography style={{ marginTop: 7, marginBottom: "auto" }}>
|
<Typography style={{ marginTop: 7, marginBottom: "auto" }}>
|
||||||
<a
|
<a
|
||||||
rel="noopener noreferrer"
|
rel="noopener noreferrer"
|
||||||
href="https://shuffler.io/docs/workflows"
|
|
||||||
target="_blank"
|
target="_blank"
|
||||||
|
href="https://shuffler.io/docs/workflows"
|
||||||
style={{ textDecoration: "none", color: "#f85a3e" }}
|
style={{ textDecoration: "none", color: "#f85a3e" }}
|
||||||
>
|
>
|
||||||
Learn more about Workflows
|
Learn more about Workflows
|
||||||
|
|||||||
Reference in New Issue
Block a user