Skip to content

Feat: make taskprocessing task types toggleable #49727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 16 commits into from
Dec 18, 2024
Merged

Feat: make taskprocessing task types toggleable #49727

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c09ca83
feat: add switch in frontend
janepie Dec 6, 2024
32b57e7
feat: save state in db
janepie Dec 8, 2024
8cac926
feat: filter disabled apps in task types requests
janepie Dec 8, 2024
76d058f
fix: show all types when no preferences saved
janepie Dec 9, 2024
2973fb8
fix: update build files
janepie Dec 9, 2024
3857dec
fix: eslint
janepie Dec 9, 2024
40fc07b
fix: always regenerate availabe task types
janepie Dec 11, 2024
129af48
test: add disabled task type unit test
janepie Dec 11, 2024
a7f26cf
feat: add occ command for task type toggling
janepie Dec 11, 2024
e5f7d00
docs: document adding of argument
janepie Dec 12, 2024
b1d1bad
test: add explicitly enabled task type unit test
janepie Dec 12, 2024
79023b9
fix(taskrpocessing): Cache result of getAvailableTaskTypes
marcelklehr Dec 12, 2024
8042a82
feat: add occ command for task type toggling
janepie Dec 11, 2024
d87302c
feat: add error flags for json_decode
janepie Dec 12, 2024
ee31b3b
fix: error handling for wrong json values
janepie Dec 17, 2024
75e64e2
fix: egt rid of unused variable
janepie Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix(taskrpocessing): Cache result of getAvailableTaskTypes 
Signed-off-by: Marcel Klehr <[email protected]>
  • Loading branch information
@marcelklehr @janepie
marcelklehr authored and janepie committed Dec 18, 2024
commit 79023b9f3ec18cf72003822c1e837bc97ae0788a
70 changes: 39 additions & 31 deletions lib/private/TaskProcessing/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,41 +733,49 @@ public function getPreferredProvider(string $taskTypeId) {
}

public function getAvailableTaskTypes(bool $showDisabled = false): array {
$taskTypes = $this->_getTaskTypes();
$taskTypeSettings = $this->_getTaskTypeSettings();

$availableTaskTypes = [];
foreach ($taskTypes as $taskType) {
if ((!$showDisabled) && isset($taskTypeSettings[$taskType->getId()]) && !$taskTypeSettings[$taskType->getId()]) {
continue;
}
try {
$provider = $this->getPreferredProvider($taskType->getId());
} catch (\OCP\TaskProcessing\Exception\Exception $e) {
continue;
// Either we have no cache or showDisabled is turned on, which we don't want to cache, ever.
if ($this->availableTaskTypes === null || $showDisabled) {
$taskTypes = $this->_getTaskTypes();
$taskTypeSettings = $this->_getTaskTypeSettings();

$availableTaskTypes = [];
foreach ($taskTypes as $taskType) {
if ((!$showDisabled) && isset($taskTypeSettings[$taskType->getId()]) && !$taskTypeSettings[$taskType->getId()]) {
continue;
}
try {
$provider = $this->getPreferredProvider($taskType->getId());
} catch (\OCP\TaskProcessing\Exception\Exception $e) {
continue;
}
try {
$availableTaskTypes[$provider->getTaskTypeId()] = [
'name' => $taskType->getName(),
'description' => $taskType->getDescription(),
'optionalInputShape' => $provider->getOptionalInputShape(),
'inputShapeEnumValues' => $provider->getInputShapeEnumValues(),
'inputShapeDefaults' => $provider->getInputShapeDefaults(),
'inputShape' => $taskType->getInputShape(),
'optionalInputShapeEnumValues' => $provider->getOptionalInputShapeEnumValues(),
'optionalInputShapeDefaults' => $provider->getOptionalInputShapeDefaults(),
'outputShape' => $taskType->getOutputShape(),
'outputShapeEnumValues' => $provider->getOutputShapeEnumValues(),
'optionalOutputShape' => $provider->getOptionalOutputShape(),
'optionalOutputShapeEnumValues' => $provider->getOptionalOutputShapeEnumValues(),
];
} catch (\Throwable $e) {
$this->logger->error('Failed to set up TaskProcessing provider ' . $provider::class, ['exception' => $e]);
}
}
try {
$availableTaskTypes[$provider->getTaskTypeId()] = [
'name' => $taskType->getName(),
'description' => $taskType->getDescription(),
'optionalInputShape' => $provider->getOptionalInputShape(),
'inputShapeEnumValues' => $provider->getInputShapeEnumValues(),
'inputShapeDefaults' => $provider->getInputShapeDefaults(),
'inputShape' => $taskType->getInputShape(),
'optionalInputShapeEnumValues' => $provider->getOptionalInputShapeEnumValues(),
'optionalInputShapeDefaults' => $provider->getOptionalInputShapeDefaults(),
'outputShape' => $taskType->getOutputShape(),
'outputShapeEnumValues' => $provider->getOutputShapeEnumValues(),
'optionalOutputShape' => $provider->getOptionalOutputShape(),
'optionalOutputShapeEnumValues' => $provider->getOptionalOutputShapeEnumValues(),
];
} catch (\Throwable $e) {
$this->logger->error('Failed to set up TaskProcessing provider ' . $provider::class, ['exception' => $e]);

if ($showDisabled) {
// Do not cache showDisabled, ever.
return $availableTaskTypes;
}

$this->availableTaskTypes = $availableTaskTypes;
}

$this->availableTaskTypes = $availableTaskTypes;


return $this->availableTaskTypes;
}
Expand Down