-
Action Type:
-
+
+
+
+ This task will run as soon as it's created on the
+ agent.
+ Start Time must be in the future for run once tasks.
+
+
@@ -579,7 +597,8 @@
@@ -617,7 +636,7 @@
(val) =>
convertPeriodToSeconds(val) >=
convertPeriodToSeconds(
- state.task_repetition_interval
+ state.task_repetition_interval,
) ||
'Repetition duration must be greater than repetition interval',
]"
@@ -712,7 +731,7 @@
@click="
validateStep(
step === 1 ? $refs.taskGeneralForm : undefined,
- $refs.stepper
+ $refs.stepper,
)
"
color="primary"
@@ -769,6 +788,7 @@ const taskTypeOptions = [
{ label: "Monthly", value: "monthly" },
{ label: "Run Once", value: "runonce" },
{ label: "On check failure", value: "checkfailure" },
+ { label: "Onboarding", value: "onboarding" },
{ label: "Manual", value: "manual" },
];
@@ -933,7 +953,7 @@ export default {
task.value.actions.push({
type: "script",
name: scriptOptions.value.find(
- (option) => option.value === script.value
+ (option) => option.value === script.value,
).label,
script: script.value,
timeout: defaultTimeout.value,
@@ -1019,13 +1039,13 @@ export default {
// remove milliseconds and Z to work with native date input
task.value.run_time_date = formatDateInputField(
task.value.run_time_date,
- true
+ true,
);
if (task.value.expire_date)
task.value.expire_date = formatDateInputField(
task.value.expire_date,
- true
+ true,
);
// set task type if monthlydow is being used
@@ -1069,7 +1089,7 @@ export default {
task.value.monthly_weeks_of_month = [];
task.value.task_instance_policy = 0;
task.value.expire_date = null;
- }
+ },
);
// check the collector box when editing task and custom field is set
diff --git a/src/components/ui/TacticalDropdown.vue b/src/components/ui/TacticalDropdown.vue
index cd5e83a0..5093a7c1 100644
--- a/src/components/ui/TacticalDropdown.vue
+++ b/src/components/ui/TacticalDropdown.vue
@@ -25,13 +25,21 @@
:key="mapOptions ? scope.opt.value : scope.opt"
>
-
+
+ {{ scope.opt.cat || "" }}
+ ![]()
- {{
- scope.opt.cat
- }}
v.toLowerCase().indexOf(needle) > -1
+ (v) => v.toLowerCase().indexOf(needle) > -1,
);
else
filteredOptions.value = props.options.filter((v) => {
diff --git a/src/ee/reporting/components/ReportsManager.vue b/src/ee/reporting/components/ReportsManager.vue
index d31ec881..e7928c49 100644
--- a/src/ee/reporting/components/ReportsManager.vue
+++ b/src/ee/reporting/components/ReportsManager.vue
@@ -32,7 +32,7 @@ For details, see: https://license.tacticalrmm.com/ee
:rows="reportTemplates"
:columns="columns"
:loading="isLoading"
- :pagination="{ rowsPerPage: 0, sortBy: 'name', descending: true }"
+ :pagination="{ rowsPerPage: 0, sortBy: 'name', descending: false }"
:filter="search"
row-key="id"
binary-state-sort
diff --git a/src/utils/format.js b/src/utils/format.js
index 6871f414..a54288a5 100644
--- a/src/utils/format.js
+++ b/src/utils/format.js
@@ -1,5 +1,6 @@
import { date } from "quasar";
import { validateTimePeriod } from "@/utils/validation";
+import trmmLogo from "@/assets/trmm_256.png";
// dropdown options formatting
export function removeExtraOptionCategories(array) {
@@ -24,7 +25,7 @@ function _formatOptions(
flat = false,
allowDuplicates = true,
appendToOptionObject = {},
- }
+ },
) {
if (!flat)
// returns array of options in object format [{label: label, value: 1}]
@@ -64,6 +65,7 @@ export function formatScriptOptions(data) {
data.forEach((script) => {
if (script.category === cat) {
tmp.push({
+ img_right: script.script_type === "builtin" ? trmmLogo : undefined,
label: script.name,
value: script.id,
timeout: script.default_timeout,
@@ -100,7 +102,7 @@ export function formatScriptOptions(data) {
export function formatAgentOptions(
data,
flat = false,
- value_field = "agent_id"
+ value_field = "agent_id",
) {
if (flat) {
// returns just agent hostnames in array
@@ -185,7 +187,7 @@ export function formatSiteOptions(data, flat = false) {
label: "name",
flat: flat,
appendToOptionObject: { cat: client.name },
- })
+ }),
);
});
@@ -361,7 +363,7 @@ export function convertToBitArray(number) {
bitArray.push(1);
} else {
bitArray.push(
- parseInt(binary.slice(i), 2) - parseInt(binary.slice(i + 1), 2)
+ parseInt(binary.slice(i), 2) - parseInt(binary.slice(i + 1), 2),
);
}
}
+
+ Action Type:
+
+ Actions:
+ Continue task if an action fails
+
-
-
- Actions:
-
- Continue task if an action fails
-
-
-
-
-
-
-
-
-
-
-
-
- Arguments: {{ element.script_args }}
-
-
- Env Vars: {{ element.env_vars }}
-
-
- Timeout: {{ element.timeout }}
-
-
-
-
-
@@ -283,7 +285,7 @@
+
+
+
+
+
+
+
+
+
+ Arguments: {{ element.script_args }}
+
+
+ Env Vars: {{ element.env_vars }}
+
+
+ Timeout: {{ element.timeout }}
+
+
+
+
+
+
+ Timeout: {{ element.timeout }}
+
+
+
- Timeout: {{ element.timeout }}
-
-
-
-
-
-
-
+
+
+
+
+