Fixed access right problems for app reloading
This commit is contained in:
@@ -59,7 +59,7 @@ SHUFFLE_BASE_IMAGE_TAG_SUFFIX="-1.0.0"
|
|||||||
SHUFFLE_CONTAINER_AUTO_CLEANUP=false
|
SHUFFLE_CONTAINER_AUTO_CLEANUP=false
|
||||||
SHUFFLE_ELASTIC=true
|
SHUFFLE_ELASTIC=true
|
||||||
SHUFFLE_LOGS_DISABLED=false
|
SHUFFLE_LOGS_DISABLED=false
|
||||||
SHUFFLE_CHAT_DISABLED=false
|
SHUFFLE_CHAT_DISABLED=false # Controls support chat
|
||||||
SHUFFLE_RERUN_SCHEDULE=300
|
SHUFFLE_RERUN_SCHEDULE=300
|
||||||
|
|
||||||
# DATABASE CONFIGURATIONS
|
# DATABASE CONFIGURATIONS
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
# This can be done in the dockerpush workflow itself
|
# This can be done in the dockerpush workflow itself
|
||||||
docker pull frikky/shuffle-backend:nightly
|
docker pull frikky/shuffle-backend:nightly
|
||||||
docker pull frikky/shuffle-frontend:nightly
|
docker pull frikky/shuffle-frontend:nightly
|
||||||
|
|
||||||
docker tag frikky/shuffle-backend:nightly ghcr.io/frikky/shuffle-backend:nightly
|
docker tag frikky/shuffle-backend:nightly ghcr.io/frikky/shuffle-backend:nightly
|
||||||
docker tag frikky/shuffle-frontend:nightly ghcr.io/frikky/shuffle-frontend:nightly
|
docker tag frikky/shuffle-frontend:nightly ghcr.io/frikky/shuffle-frontend:nightly
|
||||||
|
|
||||||
|
docker push ghcr.io/frikky/shuffle-backend:nightly
|
||||||
|
docker push ghcr.io/frikky/shuffle-frontend:nightly
|
||||||
|
|||||||
@@ -21,10 +21,11 @@ import {
|
|||||||
} from '@material-ui/core';
|
} from '@material-ui/core';
|
||||||
|
|
||||||
import WorkflowPaper from "../components/WorkflowPaper.jsx"
|
import WorkflowPaper from "../components/WorkflowPaper.jsx"
|
||||||
|
import WorkflowPaperNew from "../components/WorkflowPaperNew.jsx"
|
||||||
|
|
||||||
const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240")
|
const searchClient = algoliasearch("JNSS5CFDZZ", "db08e40265e2941b9a7d8f644b6e5240")
|
||||||
const AppGrid = props => {
|
const AppGrid = props => {
|
||||||
const { maxRows, showName, showSuggestion, isMobile, globalUrl, parsedXs } = props
|
const { maxRows, showName, showSuggestion, isMobile, globalUrl, parsedXs, alternativeView, } = props
|
||||||
|
|
||||||
const isCloud =
|
const isCloud =
|
||||||
window.location.host === "localhost:3002" ||
|
window.location.host === "localhost:3002" ||
|
||||||
@@ -241,7 +242,11 @@ const AppGrid = props => {
|
|||||||
return (
|
return (
|
||||||
<Zoom key={index} in={true} style={{ transitionDelay: `${workflowDelay}ms` }}>
|
<Zoom key={index} in={true} style={{ transitionDelay: `${workflowDelay}ms` }}>
|
||||||
<Grid item xs={xs} style={{ padding: "12px 10px 12px 10px" }}>
|
<Grid item xs={xs} style={{ padding: "12px 10px 12px 10px" }}>
|
||||||
<WorkflowPaper key={index} data={data} />
|
{alternativeView === true ?
|
||||||
|
<WorkflowPaperNew key={index} data={data} />
|
||||||
|
:
|
||||||
|
<WorkflowPaper key={index} data={data} />
|
||||||
|
}
|
||||||
</Grid>
|
</Grid>
|
||||||
</Zoom>
|
</Zoom>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1019,7 +1019,7 @@ const Apps = (props) => {
|
|||||||
{activateButton}
|
{activateButton}
|
||||||
{editNewButton}
|
{editNewButton}
|
||||||
{(props.userdata !== undefined &&
|
{(props.userdata !== undefined &&
|
||||||
(props.userdata.role === "admin" ||
|
(props.userdata.admin === "true" ||
|
||||||
props.userdata.id === selectedApp.owner ||
|
props.userdata.id === selectedApp.owner ||
|
||||||
selectedApp.owner === ""
|
selectedApp.owner === ""
|
||||||
)) || !selectedApp.generated ? (
|
)) || !selectedApp.generated ? (
|
||||||
@@ -1408,6 +1408,7 @@ const Apps = (props) => {
|
|||||||
}, [appValidation, isDropzone]);
|
}, [appValidation, isDropzone]);
|
||||||
|
|
||||||
var appDelay = -75
|
var appDelay = -75
|
||||||
|
|
||||||
const appView = isLoggedIn ? (
|
const appView = isLoggedIn ? (
|
||||||
<Dropzone
|
<Dropzone
|
||||||
style={{ width: viewWidth * 2 + 20, margin: "auto", padding: 20 }}
|
style={{ width: viewWidth * 2 + 20, margin: "auto", padding: 20 }}
|
||||||
@@ -1481,7 +1482,7 @@ const Apps = (props) => {
|
|||||||
</Tooltip>
|
</Tooltip>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{userdata === undefined || userdata === null || userdata.role !== "admin" ? null :
|
{userdata === undefined || userdata === null || userdata.admin === "false" ? null :
|
||||||
<Tooltip
|
<Tooltip
|
||||||
title={"Download from Github"}
|
title={"Download from Github"}
|
||||||
style={{ marginTop: "28px", width: "100%" }}
|
style={{ marginTop: "28px", width: "100%" }}
|
||||||
|
|||||||
@@ -151,7 +151,10 @@ const Search = (props) => {
|
|||||||
<AppGrid maxRows={3} showSuggestion={true} globalUrl={globalUrl} isMobile={isMobile} userdata={userdata} />
|
<AppGrid maxRows={3} showSuggestion={true} globalUrl={globalUrl} isMobile={isMobile} userdata={userdata} />
|
||||||
:
|
:
|
||||||
curTab === 1 ?
|
curTab === 1 ?
|
||||||
<WorkflowGrid maxRows={3} showSuggestion={true} globalUrl={globalUrl} isMobile={isMobile} userdata={userdata} />
|
window.location.pathname === "/search" ?
|
||||||
|
<WorkflowGrid maxRows={3} showSuggestion={true} globalUrl={globalUrl} isMobile={isMobile} userdata={userdata} />
|
||||||
|
:
|
||||||
|
<WorkflowGrid maxRows={3} showSuggestion={true} globalUrl={globalUrl} isMobile={isMobile} userdata={userdata} />
|
||||||
:
|
:
|
||||||
curTab === 2 ?
|
curTab === 2 ?
|
||||||
<DocsGrid maxRows={6} parsedXs={12} showSuggestion={true} globalUrl={globalUrl} isMobile={isMobile} userdata={userdata} />
|
<DocsGrid maxRows={6} parsedXs={12} showSuggestion={true} globalUrl={globalUrl} isMobile={isMobile} userdata={userdata} />
|
||||||
@@ -162,6 +165,7 @@ const Search = (props) => {
|
|||||||
null}
|
null}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
//{/*alternativeView={true} />*/}
|
||||||
|
|
||||||
const loadedCheck = isLoaded ?
|
const loadedCheck = isLoaded ?
|
||||||
<div>
|
<div>
|
||||||
|
|||||||
Reference in New Issue
Block a user