Merge branch 'master' into launch

frontend/src/views/Admin.jsx

@@ -1159,7 +1159,7 @@ const Admin = (props) => {
 										console.log("Show apps with this category")
 									}}
 								>
-									Find app ({data.apps.length})
+									Find app ({data.apps === null ? 0 : data.apps.length})
 								</Button>
 							</ListItemText>
 						</ListItem>
@@ -1222,7 +1222,7 @@ const Admin = (props) => {
 								style={{minWidth: 150, maxWidth: 150}}
 							/>
 							<ListItemText
-								primary={data.usage.length}
+								primary={data.usage === null ? 0 : data.usage.length}
 								style={{minWidth: 150, maxWidth: 150, overflow: "hidden"}}
 							/>
 							<ListItemText

frontend/src/views/EditWebhook.jsx

@@ -336,7 +336,7 @@ const EditWebhook = (props) => {
 		</div>
 		: null
 	
-	// FIXME - needs refresh everytime you add a new workflow
+	// FIXME - needs refresh every time you add a new workflow
 	const workflowdata = Object.getOwnPropertyNames(webhookData).length > 0 && selectedWorkflows.length > 0 ?
 		<EditWorkflow globalUrl={globalUrl} inputworkflows={selectedWorkflows} inputname={webhookData.info.name} inputtype={webhookData.type} /> : null	
 

frontend/src/views/Workflows.jsx

@@ -65,6 +65,7 @@ const Workflows = (props) => {
 	const [field1, setField1] = React.useState("")
 	const [field2, setField2] = React.useState("")
 	const [downloadUrl, setDownloadUrl] = React.useState("https://github.com/frikky/shuffle-workflows")
+	const [downloadBranch, setDownloadBranch] = React.useState("master")
 	const [loadWorkflowsModalOpen, setLoadWorkflowsModalOpen] = React.useState(false)
 
 	const [modalOpen, setModalOpen] = React.useState(false);
@@ -1186,6 +1187,7 @@ const Workflows = (props) => {
 
 		const parsedData = {
 			"url": url,
+			"field_3": downloadBranch || 'master'
 		}
 
 		if (field1.length > 0) {
@@ -1280,6 +1282,26 @@ const Workflows = (props) => {
 					fullWidth
 					/>
 
+					<span style={{marginTop: 10}}>Branch (default value is "master"):</span>
+					<div style={{display: "flex"}}>
+						<TextField
+							style={{backgroundColor: inputColor}}
+							variant="outlined"
+							margin="normal"
+							value={downloadBranch}
+							InputProps={{
+								style:{
+									color: "white",
+									height: "50px",
+									fontSize: "1em",
+								},
+							}}
+							onChange={e => setDownloadBranch(e.target.value)}
+							placeholder="master"
+							fullWidth
+							/>
+					</div>
+
 				<span style={{marginTop: 10}}>Authentication (optional - private repos etc):</span>
 				<div style={{display: "flex"}}>
 					<TextField