Skip to content

Commit d764de7

Browse files
committed
feat(style): check if we should use the modern 32+ style
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
1 parent ddb610f commit d764de7

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

lib/Listener/BeforeTemplateRenderedListener.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ public function handle(Event $event): void {
6161
$assistantEnabled = $adminAssistantEnabled && $userAssistantEnabled;
6262
$this->initialStateService->provideInitialState('assistant-enabled', $assistantEnabled);
6363
if ($assistantEnabled) {
64+
$useModernStyle = version_compare($this->config->getSystemValueString('version', '0.0.0'), '32.0.0', '>=');
65+
$this->initialStateService->provideInitialState('use-modern-style', $useModernStyle);
66+
6467
$lastTargetLanguage = $this->config->getUserValue($this->userId, Application::APP_ID, 'last_target_language', '');
6568
$this->initialStateService->provideInitialState('last-target-language', $lastTargetLanguage);
6669
$indexingComplete = $this->appConfig->getValueInt('context_chat', 'last_indexed_time', 0) !== 0;

src/components/TaskTypeSelect.vue

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
:menu-name="variants.text"
1313
:container="$refs.taskTypeSelect"
1414
:primary="isCategorySelected(variants)"
15-
:class="{ categoryWithSubSelected: isCategorySelected(variants) }"
15+
:class="{ categoryWithSubSelected: useModernStyle && isCategorySelected(variants) }"
1616
@click="onMenuCategorySelected(variants)">
1717
<NcActionButton v-for="t in variants.tasks"
1818
:key="t.id"
@@ -31,8 +31,8 @@
3131
</NcActions>
3232
<NcButton v-else
3333
:key="variants.id + '-button'"
34-
variant="secondary"
35-
:class="{ categorySelected: isCategorySelected(variants) }"
34+
:variant="isCategorySelected(variants) ? 'primary' : 'secondary'"
35+
:class="{ categorySelected: useModernStyle && isCategorySelected(variants) }"
3636
:title="variants.text"
3737
@click="onMenuCategorySelected(variants)">
3838
<template #icon>
@@ -90,6 +90,8 @@ import NcButton from '@nextcloud/vue/components/NcButton'
9090
import NcActionButton from '@nextcloud/vue/components/NcActionButton'
9191
import NcAssistantButton from '@nextcloud/vue/components/NcAssistantButton'
9292
93+
import { loadState } from '@nextcloud/initial-state'
94+
9395
export default {
9496
name: 'TaskTypeSelect',
9597
@@ -127,6 +129,7 @@ export default {
127129
data() {
128130
return {
129131
categorySubmenu: null,
132+
useModernStyle: loadState('assistant', 'use-modern-style', false),
130133
}
131134
},
132135

0 commit comments

Comments
 (0)