{alertThresholds.map((threshold, index) => (
@@ -2706,6 +2705,7 @@ const BillingStatsChildOrg = memo(({ userdata, globalUrl, selectedOrganization,
const { themeMode, brandColor, supportEmail } = useContext(Context);
const theme = getTheme(themeMode, brandColor);
+
// Handle page change
const handleChangePage = (event, newPage) => {
setPage(newPage);
@@ -2830,6 +2830,7 @@ const BillingStatsChildOrg = memo(({ userdata, globalUrl, selectedOrganization,
usage: stat?.monthly_app_executions || "N/A",
workflows_usage: stat?.total_workflow_executions || "N/A",
workflow_usage_limit: subOrg?.sync_features?.workflow_executions?.limit || "N/A",
+ app_runs_hard_limit: subOrg?.Billing?.app_runs_hard_limit || 0,
}
})
@@ -2890,6 +2891,33 @@ const BillingStatsChildOrg = memo(({ userdata, globalUrl, selectedOrganization,
)}
},
+ {
+ field: "app_runs_hard_limit", headerName: "App Executions Hard Limit", width: 200, renderCell: (params) => {
+ console.log("params.row: ", params.row)
+ return (
+ <>
+
+ {params.row.app_runs_hard_limit}
+
+ {
+ setOpen(true)
+ setEditingOrgId(params.row.orgId)
+ setEditing("app_executions_hard_limit")
+ if (params.row.app_runs_hard_limit === "N/A") {
+ setLimit("")
+ } else {
+ setLimit(params.row.app_runs_hard_limit)
+ }
+ }}
+ >
+
+
+ )
+ }
+ }
]
setSubOrgStatsColumns(columns)
@@ -2913,7 +2941,7 @@ const BillingStatsChildOrg = memo(({ userdata, globalUrl, selectedOrganization,
return
}
- if (selectedOrganization.sync_features.app_executions.limit <= 10000) {
+ if (selectedOrganization.sync_features.app_executions.limit <= 10000 && editing === "app_executions") {
toast.error("Insufficient app execution limit to increase child org limit")
return
}
@@ -2939,7 +2967,10 @@ const BillingStatsChildOrg = memo(({ userdata, globalUrl, selectedOrganization,
const org = subOrgs[orgIndex]
- org.sync_features[editing].limit = limit
+ if (editing !== "app_executions_hard_limit") {
+ org.sync_features[editing].limit = limit
+ }
+
org.sync_features.editing = true
const sync_features = org.sync_features
const data = {
@@ -2947,6 +2978,13 @@ const BillingStatsChildOrg = memo(({ userdata, globalUrl, selectedOrganization,
sync_features: sync_features,
}
+ if (editing === "app_executions_hard_limit") {
+ data.editing = "app_runs_hard_limit";
+ data.billing = {
+ app_runs_hard_limit: limit || 0
+ };
+ }
+
const url = `${globalUrl}/api/v1/orgs/${orgId}`;
fetch(url, {
method: "POST",
@@ -2974,6 +3012,12 @@ const BillingStatsChildOrg = memo(({ userdata, globalUrl, selectedOrganization,
newRows[orgIndex].workflow_usage_limit = limit;
return newRows;
});
+ }else if (editing === "app_executions_hard_limit") {
+ setSubOrgStatsRows((prevRows) => {
+ const newRows = [...prevRows];
+ newRows[orgIndex].app_runs_hard_limit = limit;
+ return newRows;
+ });
}
}
})
@@ -3087,10 +3131,21 @@ const IncreaseLimitPopUp = memo(({ open, onClose, limit, setLimit, HandleEditLim
}
}}
>
-
+ {editing === "app_executions_hard_limit" ? (
+
+ Add {editing.replaceAll("_", " ").replace(/\b\w/g, c => c.toUpperCase())}
+
+ ) : (
+
Increase {editing.replaceAll("_", " ").replace(/\b\w/g, c => c.toUpperCase())} Limit
+ )}
+ { editing === "app_executions_hard_limit" ? (
+
+ Please note that once you set a hard limit for app runs workflows will not be able to run if the limit is reached. You will be notified by email when you reach the limit.
+
+ ) : null}
setCurrentLimit(e.target.value)}
diff --git a/frontend/src/components/BillingStats.jsx b/frontend/src/components/BillingStats.jsx
index 5bb09ddb..7bd33476 100644
--- a/frontend/src/components/BillingStats.jsx
+++ b/frontend/src/components/BillingStats.jsx
@@ -31,57 +31,10 @@ import {
Box,
} from "@mui/material";
-import {
- BarChart,
- BarSeries,
- Bar,
- BarLabel,
-
- GridlineSeries,
- Gridline,
- TooltipArea,
- ChartTooltip,
- TooltipTemplate,
-} from 'reaviz';
-
import { typecost, typecost_single, } from "../views/HandlePaymentNew.jsx";
+import LineChartWrapper from '../components/LineChartWrapper.jsx';
import { Context } from '../context/ContextApi.jsx';
-const LineChartWrapper = ({keys, inputname, height, width}) => {
- const [hovered, setHovered] = useState("");
- const inputdata = keys.data === undefined ? keys : keys.data
- const {themeMode} = useContext(Context)
- const theme = getTheme(themeMode)
-
-
- return (
-
+ No categories available. Please add categories in the settings.
+
+ )
+ }
+
+ return (
+ option?.value.includes(c)) || []}
+ classes={{ inputRoot: classes.inputRoot }}
+ ListboxProps={{
+ style: {
+ backgroundColor: theme.palette.surfaceColor,
+ color: theme.palette.text.primary,
+ borderRadius: theme.palette.borderRadius,
+ },
+ }}
+ onChange={(event, newValue) => {
+ console.log("New Value: ", newValue)
+
+ option.value = ""
+ for (var i = 0; i < newValue.length; i++) {
+ option.value += newValue[i] + ","
+ }
+
+ if (newValue.length > 0) {
+ updatedAutomation.enabled = true
+ } else {
+ updatedAutomation.enabled = false
+ }
+
+ updatedAutomation.options[optionIndex] = option
+ setUpdatedAutomation(updatedAutomation)
+ setUpdated(true)
+
+ setUpdate(Math.random()) // Force re-render
+ }}
+
+ getOptionLabel={(option) => {
+ if (option === undefined || option === null) {
+ return "No Categories Selected";
+ }
+
+ return option
+ }}
+ options={datastoreCategories}
+ fullWidth
+ style={{
+ backgroundColor: theme.palette.textFieldStyle.backgroundColor,
+ borderRadius: theme.palette.textFieldStyle.borderRadius,
+ color: theme.palette.textFieldStyle.color,
+ height: 35,
+ marginBottom: 40,
+ }}
+ renderOption={(props, data, state) => {
+ const fixedname = data?.charAt(0)?.toUpperCase() + data?.slice(1)?.replaceAll("_", " ")
+ const iconDetails = GetIconInfo({
+ "app_name": fixedname,
+ "name": fixedname,
+ })
+
+ const keyfound = option?.value.includes(data)
+
+ return (
+
+ {data.image !== undefined && data.image !== null && data.image.length > 0 ?
+ 
+ : null}
+
+ Choose {data}
+
+
+ } >
+
+
+ )
+ }}
+ renderInput={(params) => {
+ return (
+ {
{...props}
style={{
backgroundColor: theme.palette.surfaceColor,
- color: data.id === option?.value ? "red" : theme.palette.text.primary,
- borderBottom: data.id === "parent" ? "2px solid rgba(255,255,255,0.5)" : null
+ color: data.id === option?.value ? red : theme.palette.text.primary,
}}
value={data}
>
@@ -1327,16 +1491,11 @@ const CacheView = memo((props) => {
}}
collapsed={true}
enableClipboard={(copy) => {
- // handleReactJsonClipboard(copy);
+ handleReactJsonClipboard(copy)
}}
collapseStringsAfterLength={theme.palette.jsonCollapseStringsAfterLength}
iconStyle={theme.palette.jsonIconStyle}
displayDataTypes={false}
- onSelect={(select) => {
-
- // HandleJsonCopy(showResult, select, data.action.label);
- console.log("SELECTED!: ", select);
- }}
name={null}
/>
:
@@ -1419,7 +1578,9 @@ const CacheView = memo((props) => {
{
+ onClick={(e) => {
+ e.preventDefault()
+ e.stopPropagation()
// Try to make the value JSON indented
const valid = validateJson(data.value)
var newvalue = data.value
@@ -1469,7 +1630,9 @@ const CacheView = memo((props) => {
{
+ onClick={(e) => {
+ e.preventDefault()
+ e.stopPropagation()
window.open(`${globalUrl}/api/v1/orgs/${orgId}/cache/${data.key}?type=text&authorization=${data.public_authorization}`, "_blank");
}}
>
@@ -1486,7 +1649,9 @@ const CacheView = memo((props) => {
{
+ onClick={(e) => {
+ e.preventDefault()
+ e.stopPropagation()
deleteEntry(orgId, data.key, data.category)
}}
>
@@ -1609,6 +1774,8 @@ const CacheView = memo((props) => {
workflows={workflows}
getWorkflows={getWorkflows}
+
+ apps={apps}
/>
{cacheDistributionModal}
@@ -2067,12 +2234,14 @@ const CacheView = memo((props) => {
{
+ setSelectedRows(newSelection);
+ }}
onRowSelectionModelChange={(newSelection) => {
- setSelectedRows(newSelection)
+ setSelectedRows(newSelection);
}}
keepNonExistentRowsSelected={false}
getRowId={(row) => row.key}
@@ -2245,6 +2414,11 @@ const CacheView = memo((props) => {
-
- {inputname}
-
-
-
- )
-}
-
const AppStats = (defaultprops) => {
const {
diff --git a/frontend/src/components/CacheView.jsx b/frontend/src/components/CacheView.jsx
index 1e94d131..e9670baf 100644
--- a/frontend/src/components/CacheView.jsx
+++ b/frontend/src/components/CacheView.jsx
@@ -4,7 +4,8 @@ import { getTheme } from "../theme.jsx";
import { toast } from 'react-toastify';
import ReactJson from "react-json-view-ssr";
-import { GetIconInfo } from "../views/Workflows2.jsx";
+import { GetIconInfo, } from "../views/Workflows2.jsx";
+import { validateJson, handleReactJsonClipboard, } from "../views/Workflows.jsx";
import { red } from "../views/AngularWorkflow.jsx";
import CollectIngestModal from "../components/CollectIngestModal.jsx";
import {
@@ -76,8 +77,8 @@ import {
SmartToy as SmartToyIcon,
Settings as SettingsIcon,
FilterAlt as FilterAltIcon,
+ CompareArrows as CompareArrowsIcon,
} from "@mui/icons-material";
-import { validateJson, } from "../views/Workflows.jsx";
import { Context } from "../context/ContextApi.jsx";
const scrollStyle1 = {
@@ -130,7 +131,6 @@ const CacheView = memo((props) => {
})
const [_, setUpdate] = useState(Math.random())
const [selectedRows, setSelectedRows] = useState([]);
-
// Direct category migration from ../components/Files.jsx
const [selectAllChecked, setSelectAllChecked] = React.useState(false)
const [renderTextBox, setRenderTextBox] = React.useState(false);
@@ -139,12 +139,14 @@ const CacheView = memo((props) => {
const [selectedFileId, setSelectedFileId] = React.useState("");
const [updateToThisCategory, setUpdateToThisCategory] = useState("")
const [workflows, setWorkflows] = useState([]);
+ const [apps, setApps] = useState([]);
const [selectedFiles, setSelectedFiles] = useState([]);
const [showAutomationMenu, setShowAutomationMenu] = useState(false);
const [showSettingsMenu, setShowSettingsMenu] = useState(false);
const [showCollectIngestMenu, setShowCollectIngestMenu] = useState(false);
+ var to_be_copied = "";
const defaultAutomation = [
{
"name": "Run workflow",
@@ -156,6 +158,42 @@ const CacheView = memo((props) => {
"icon":