Fixed file search issue

frontend/src/views/Admin.jsx

@@ -43,6 +43,7 @@ import {
   DialogContent,
   CircularProgress,
   Box,
+	InputAdornment,
 } from "@material-ui/core";
 
 import { Autocomplete } from "@mui/material";
@@ -67,6 +68,8 @@ import {
   Schedule as ScheduleIcon,
   Cloud as CloudIcon,
   Business as BusinessIcon,
+	Visibility as VisibilityIcon,
+	VisibilityOff as VisibilityOffIcon,
 } from "@material-ui/icons";
 
 import { useAlert } from "react-alert";
@@ -185,6 +188,8 @@ const Admin = (props) => {
   const [dealerror, setDealerror] = React.useState("");
   const [dealList, setDealList] = React.useState([]);
   const [adminTab, setAdminTab] = React.useState(1);
+	const [showApiKey, setShowApiKey] = useState(false);
+
 
   const [billingInfo, setBillingInfo] = React.useState({});
   
@@ -2242,7 +2247,7 @@ const Admin = (props) => {
       <DialogTitle>
         <span style={{ color: "white" }}>Enable cloud features</span>
       </DialogTitle>
-      <DialogContent>
+      <DialogContent color="textSecondary">
         What does{" "}
         <a
           href="https://shuffler.io/docs/organizations#cloud_sync"
@@ -2532,18 +2537,26 @@ const Admin = (props) => {
 									Billing
 								</span>
 							/>
+							<Tab
+								disabled={true}
+								label=<span>
+									Branding	
+								</span>
+							/>
 							<Tab
 								disabled={true}
 								label=<span>
 									Usage	
 								</span>
 							/>
+							{/*
 							<Tab
 								disabled={true}
 								label=<span>
 									Notifications	
 								</span>
 							/>
+							*/}
 						</Tabs>
 
             <Divider
@@ -2614,13 +2627,28 @@ const Admin = (props) => {
             		      <div style={{ display: "flex" }}>
             		        <TextField
             		          color="primary"
-            		          style={{ backgroundColor: theme.palette.inputColor }}
+            		          style={{ 
+														backgroundColor: theme.palette.inputColor,
+														maxWidth: 500,
+													}}
             		          InputProps={{
             		            style: {
             		              height: "50px",
             		              color: "white",
             		              fontSize: "1em",
             		            },
+														endAdornment: (
+															<InputAdornment position="end">
+																<IconButton
+																	aria-label="toggle password visibility"
+																	onClick={() => {
+																		setShowApiKey(!showApiKey)
+																	}}
+																>
+																	{showApiKey ? <VisibilityIcon /> : <VisibilityOffIcon />}
+																</IconButton>
+															</InputAdornment>
+														)
             		          }}
             		          required
             		          fullWidth={true}
@@ -2631,6 +2659,7 @@ const Admin = (props) => {
             		          placeholder="Cloud Apikey"
             		          variant="outlined"
             		          defaultValue={userSettings.apikey}
+													type={!isCloud || showApiKey ? "text" : "password"}
             		        />
             		        {selectedOrganization.cloud_sync_active ? (
             		          <Button
@@ -2718,10 +2747,11 @@ const Admin = (props) => {
             		    ) : null}
             		  </div>
             		)}
-            		<Typography
-            		  style={{ marginTop: 40, marginLeft: 10, marginBottom: 5 }}
-            		>
-            		  Cloud sync features (monthly usage)
+            		<Typography variant="h6" style={{ marginLeft: 5, marginTop: 40, marginBottom: 5 }}>
+            		  Cloud sync features 
+            		</Typography>
+            		<Typography variant="body2" color="textSecondary" style={{marginBottom: 10, marginLeft: 5, }}>
+									If not otherwise specified, Usage will reset monthly
             		</Typography>
             		<Grid container style={{ width: "100%", marginBottom: 15 }}>
             		  {selectedOrganization.sync_features === undefined ||

frontend/src/views/AngularWorkflow.jsx

@@ -8320,17 +8320,15 @@ const AngularWorkflow = (defaultprops) => {
 
     var injectedData = <div></div>;
 
-    if (
-      selectedEdge.conditions !== undefined &&
-      selectedEdge.conditions !== null &&
-      selectedEdge.conditions.length > 0
-    ) {
+    if (selectedEdge.conditions !== undefined && selectedEdge.conditions !== null && selectedEdge.conditions.length > 0) {
       injectedData = selectedEdge.conditions.map((condition, index) => {
         return ConditionHandler(condition, index);
       });
     }
 
-    // FIXME - remove index
+		// Startnode = dest node
+		const conditionsDisabled = false
+
     const conditionId = uuidv4();
     return (
       <div style={appApiViewStyle}>
@@ -8363,7 +8361,7 @@ const AngularWorkflow = (defaultprops) => {
 
         <Button
           style={{ margin: "auto", marginTop: "10px" }}
-          color="primary"
+          color="secondary"
           variant="outlined"
           onClick={() => {
             if (conditionsModalOpen) {
@@ -8396,6 +8394,13 @@ const AngularWorkflow = (defaultprops) => {
         >
           New condition
         </Button>
+
+				{/* Check if dest is the same as start */}
+				{conditionsDisabled ? 
+					<Typography variant="body1">
+						Conditions are unavailable between triggers and the startnode.
+					</Typography>
+				: null}
       </div>
     );
   };

frontend/src/views/AppCreator.jsx

@@ -1618,7 +1618,16 @@ const AppCreator = (defaultprops) => {
     }
 
     setProjectCategories(all_categories);
+
+		// Rearrange them by which has action_label
+		const firstActions = newActions.filter(data => data.action_label !== undefined && data.action_label !== null && data.action_label !== "No Label")
+		console.log("First actions: ", firstActions)
+		const secondActions = newActions.filter(data => data.action_label === undefined || data.action_label === null || data.action_label === "No Label")
+		newActions = firstActions.concat(secondActions)
     setActions(newActions);
+		//data.paths[item.url][item.method.toLowerCase()]["x-label"] = item.action_label
+
+
     setFilteredActions(newActions);
     setIsAppLoaded(true);
   };
@@ -4031,12 +4040,16 @@ const AppCreator = (defaultprops) => {
 							}}
 							value={data.action_label}
 							style={{
+								border: data.action_label === undefined || data.action_label === "No Label" ? "" : `2px solid ${bgColor}`,
+								borderRadius: theme.shape.borderRadius,
 								backgroundColor: inputColor,
 								paddingLeft: 10,
 								color: "white",
 								height: 30,
-								maxWidth: 50, 
+								maxWidth: 35, 
 								marginLeft: 10, 
+								marginRight: 10, 
+								overflow: "hidden",
 							}}
 							inputProps={{
 								name: "Method",
@@ -4048,7 +4061,8 @@ const AppCreator = (defaultprops) => {
 									<MenuItem
 										key={labelindex}
 										value={label}
-										style={{ }}
+										style={{ 
+										}}
 									>
 										{label}
 									</MenuItem>