diff --git a/BeWo/ViewModel/UserGroupVM.cs b/BeWo/ViewModel/UserGroupVM.cs index 856a8861e..d202b038c 100644 --- a/BeWo/ViewModel/UserGroupVM.cs +++ b/BeWo/ViewModel/UserGroupVM.cs @@ -288,9 +288,9 @@ namespace BeWo.ViewModel return false; } private static bool IsAiModuleRight(UserRightType right) => - ContainsRight(right, UserRightType.AiModuleView, UserRightType.AiModuleChatAdd, UserRightType.AiModuleChatDelete, UserRightType.AiModuleChatEdit, UserRightType.AiModuleChatClone); + ContainsRight(right, UserRightType.AiModuleView, UserRightType.AiModuleChatAdd, UserRightType.AiModuleChatDelete, UserRightType.AiModuleChatEdit); private static bool IsAiModuleSettingRight(UserRightType right) => - ContainsRight(right, UserRightType.AiModuleViewSetting); + ContainsRight(right); private static bool ContainsRight(UserRightType right, params UserRightType[] rightTypes) { diff --git a/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs b/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs index a0cc1c481..641290d39 100644 --- a/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs +++ b/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs @@ -40,9 +40,9 @@ namespace BeWo.ViewModel.View.AI ReloadConversationsCommand = new DelegateCommand(ReloadConversations); ReloadModelsCommand = new DelegateCommand(ReloadModels); - OpenSettingCommand = new DelegateCommand(OpenSetting, () => (BeWoApp.AppSettings?.ModuleAiSettingsEnabled ?? true) && BeWoApp.HasLoggedOnUserRight(UserRightType.AiModuleViewSetting)); + OpenSettingCommand = new DelegateCommand(OpenSetting, () => BeWoApp.AppSettings?.ModuleAiSettingsEnabled ?? false); RenameCommand = new DelegateCommand(Rename, () => BeWoApp.HasLoggedOnUserRight(UserRightType.AiModuleChatEdit) && ListVM.SelectedVM is object); - OpenCloneCommand = new DelegateCommand(OpenClone, () => BeWoApp.HasLoggedOnUserRight(UserRightType.AiModuleChatClone) && ListVM.SelectedVM is object && BeWoAppInfo.IsInAiDeveloperMode); + OpenCloneCommand = new DelegateCommand(OpenClone, () => ListVM.SelectedVM is object && BeWoAppInfo.IsInAiDeveloperMode); CloneCommand = new DelegateCommand(Clone); AskDeleteCommand = new DelegateCommand(AskDelete, () => BeWoApp.HasLoggedOnUserRight(UserRightType.AiModuleChatDelete) && ListVM.SelectedVM is object); diff --git a/Data/Security/UserRightHelper.cs b/Data/Security/UserRightHelper.cs index ae1d8f494..0119004af 100644 --- a/Data/Security/UserRightHelper.cs +++ b/Data/Security/UserRightHelper.cs @@ -229,15 +229,15 @@ namespace BeWo.Data.Security { return r == UserRightType.KalenderInAbwesenheitenUebernehmen || r == UserRightType.AiModuleView - || r == UserRightType.AiModuleChatClone - || r == UserRightType.AiModuleViewSetting + //|| r == UserRightType.AiModuleChatClone + //|| r == UserRightType.AiModuleViewSetting || r == UserRightType.AiModuleChatAdd || r == UserRightType.AiModuleChatDelete || r == UserRightType.AiModuleChatEdit || r == UserRightType.AiModulePromptbausteineAdd || r == UserRightType.AiModulePromptbausteineEdit || r == UserRightType.AiModulePromptbausteineRemove - || r == UserRightType.AiModulePromptbausteineSeeAll + //|| r == UserRightType.AiModulePromptbausteineSeeAll || r == UserRightType.AiModulePromptbausteineView //|| r == UserRightType.AiModulePromptbausteineExecute || r == UserRightType.AiVoiceView; diff --git a/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs b/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs index 1c1a3327a..7eaa1141b 100644 --- a/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs +++ b/Service/ServiceContracts/Enhanced/IAiEnhancedService.cs @@ -23,7 +23,7 @@ namespace BeWo.Service.ServiceContracts.Enhanced [FaultContract(typeof(BeWoFault))] [OperationContract] - [RequireWcfAuthorization(UserRightType.AiModuleViewSetting)] + //[RequireWcfAuthorization(UserRightType.AiModuleViewSetting)] AiConfigDC UpdateAiConfig(AiConfigDC toUpdate); [FaultContract(typeof(BeWoFault))] @@ -48,7 +48,7 @@ namespace BeWo.Service.ServiceContracts.Enhanced [FaultContract(typeof(BeWoFault))] [OperationContract] - [RequireWcfAuthorization(UserRightType.AiModuleChatClone)] + //[RequireWcfAuthorization(UserRightType.AiModuleChatClone)] AiConversationDC CloneAiConversation(long conversation_oid, long? message_oid); [FaultContract(typeof(BeWoFault))] diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs index 8d96334dc..e0598e6bf 100644 --- a/Shared/BeWoEntityEnums.cs +++ b/Shared/BeWoEntityEnums.cs @@ -644,14 +644,14 @@ namespace BS.Shared AiModuleChatAdd = 201001, AiModuleChatEdit = 201002, AiModuleChatDelete = 201003, - AiModuleViewSetting = 201005, - AiModuleChatClone = 201006, + //AiModuleViewSetting = 201005, + //AiModuleChatClone = 201006, AiModulePromptbausteineView = 201007, AiModulePromptbausteineAdd = 201008, AiModulePromptbausteineEdit = 201009, AiModulePromptbausteineRemove = 201010, - AiModulePromptbausteineSeeAll = 201011, + //AiModulePromptbausteineSeeAll = 201011, //AiModulePromptbausteineExecute = 201012, AiVoiceView= 201020, } diff --git a/Shared/Core/EnumTranslations.cs b/Shared/Core/EnumTranslations.cs index 4412d90e7..e2ba5607a 100644 --- a/Shared/Core/EnumTranslations.cs +++ b/Shared/Core/EnumTranslations.cs @@ -769,16 +769,16 @@ namespace BS.Shared.Core dict.Add(UserRightType.AiModuleView, Translator.Translate($"KI-Chat verwenden {action_keywords[0]}")); dict.Add(UserRightType.AiModuleChatAdd, Translator.Translate($"KI-Konversationen/Nachrichten {action_keywords[2]}")); - dict.Add(UserRightType.AiModuleChatClone, Translator.Translate($"KI-Konversationen/Nachrichten {action_keywords[6]}")); + //dict.Add(UserRightType.AiModuleChatClone, Translator.Translate($"KI-Konversationen/Nachrichten {action_keywords[6]}")); dict.Add(UserRightType.AiModuleChatEdit, Translator.Translate($"KI-Konversationen/Nachrichten {action_keywords[3]}")); dict.Add(UserRightType.AiModuleChatDelete, Translator.Translate($"KI-Konversationen/Nachrichten {action_keywords[4]}")); - dict.Add(UserRightType.AiModuleViewSetting, Translator.Translate($"KI-Einstellungen {action_keywords[0]}")); + //dict.Add(UserRightType.AiModuleViewSetting, Translator.Translate($"KI-Einstellungen {action_keywords[0]}")); dict.Add(UserRightType.AiModulePromptbausteineView, Translator.Translate($"KI-Promptbausteine {action_keywords[0]}")); dict.Add(UserRightType.AiModulePromptbausteineAdd, Translator.Translate($"KI-Promptbaustein {action_keywords[2]}")); dict.Add(UserRightType.AiModulePromptbausteineEdit, Translator.Translate($"KI-Promptbaustein {action_keywords[3]}")); dict.Add(UserRightType.AiModulePromptbausteineRemove, Translator.Translate($"KI-Promptbaustein {action_keywords[4]}")); - dict.Add(UserRightType.AiModulePromptbausteineSeeAll, Translator.Translate($"KI-Promptbausteine {action_keywords[7]}")); + //dict.Add(UserRightType.AiModulePromptbausteineSeeAll, Translator.Translate($"KI-Promptbausteine {action_keywords[7]}")); //dict.Add(UserRightType.AiModulePromptbausteineExecute, Translator.Translate($"KI-Promptbausteine {action_keywords[8]}")); dict.Add(UserRightType.PersonView_Create, Translator.Translate("Personen anlegen"));