Incorporates some of NobodyNightmare feedback

Author: mereghost

modules/wikis/app/components/wikis/project_settings/project_internal_wiki_component.html.erb

@@ -32,14 +32,15 @@ See COPYRIGHT and LICENSE files for more details.
     render(
       Primer::Forms::ToggleSwitchForm.new(
         name: "enable_interal_wiki",
-        label: t("projects.settings.internal_wiki.enable"),
-        caption: t("projects.settings.internal_wiki.caption"),
+        label: t(".enable"),
+        caption: t(".caption"),
         src: project_settings_wiki_path(@project),
         csrf_token: form_authenticity_token,
         status_label_position: :start,
         checked: wiki_enabled?,
         data: { turbo: true },
-        mb: 3
+        mb: 3,
+        test_selector: "project-settings-enable-wiki"
       )
     )
   %>

modules/wikis/app/controllers/wikis/project_settings/wiki_controller.rb

@@ -36,30 +36,25 @@ class WikiController < Projects::SettingsController
 
       menu_item :settings_project_wiki
 
-      before_action :find_project_wiki
-
       def create
-        Wiki.find_by(project: @project)
+        if new_or_changed_wiki.save
+          status = @wiki.enabled? ? ".enabled" : ".disabled"
+          render_success_flash_message_via_turbo_stream(message: t(".success", status: t(".status.#{status}")))
+        else
+          render_error_flash_message_via_turbo_stream(message:)
+        end
 
-        create_or_update_wiki
         replace_via_turbo_stream(component: ProjectInternalWikiComponent.new(@project.reload))
-        render_success_flash_message_via_turbo_stream(message: "Internal wiki disenabled for this project.")
-
         respond_with_turbo_streams
       end
 
       private
 
-      def find_project_wiki
-        @wiki = Wiki.find_by(project: @project)
-      end
+      def new_or_changed_wiki
+        @wiki = Wiki.find_or_initialize_by(project: @project, start_page: "Wiki")
+        @wiki.toggle(:enabled) unless @wiki.new_record?
 
-      def create_or_update_wiki
-        if find_project_wiki
-          @wiki.toggle!(:enabled)
-        else
-          Wiki.create!(project: @project, start_page: "Wiki")
-        end
+        @wiki
       end
     end
   end

modules/wikis/app/views/wikis/project_settings/wiki/show.html.erb

@@ -29,11 +29,11 @@ See COPYRIGHT and LICENSE files for more details.
 
 <%=
   render Primer::OpenProject::PageHeader.new do |header|
-    header.with_title { I18n.t("projects.settings.internal_wiki.title") }
+    header.with_title { I18n.t("projects_settings_wiki.title") }
     header.with_breadcrumbs(
       [{ href: project_overview_path(@project.id), text: @project.name },
        { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
-       I18n.t("projects.settings.internal_wiki.title")]
+       I18n.t("projects_settings_wiki.title")]
     )
   end
 %>

modules/wikis/config/locales/en.yml

@@ -45,15 +45,8 @@ en:
   permission_manage_wiki_page_links: Manage Wiki Page Links
   project_module_wiki_internal: Internal wiki
   project_module_wiki_platforms: Wiki providers
-  projects:
-    settings:
-      internal_wiki:
-        caption: >-
-          This enables OpenProject's native wiki module, which can exist alongside external wiki providers.
-          Disabling it when there are no external providers configured will remove wiki capabilities for this
-          project and hide any existing wiki pages.
-        enable: Enable the internal wiki for this project
-        title: Internal wiki
+  projects_settings_wiki:
+    title: Internal wiki
   wikis:
     admin:
       destroy_confirmation_dialog_component:
@@ -194,6 +187,18 @@ en:
         page_access_forbidden: You do not have permission to access this wiki page
         page_not_found: Linked wiki page no longer available
         unexpected: An unexpected error occurred
+    project_settings:
+      wiki:
+        success: Internal wiki %{status} successfully.
+        status:
+          disabled: disabled
+          enabled: enabled
+      project_internal_wiki_component:
+        caption: >-
+          This enables OpenProject's native wiki module, which can exist alongside external wiki providers.
+          Disabling it when there are no external providers configured will remove wiki capabilities for this
+          project and hide any existing wiki pages.
+        enable: Enable the internal wiki for this project
     provider_types:
       xwiki:
         name: XWiki

spec/features/wiki/adding_editing_history_spec.rb

@@ -31,6 +31,8 @@
 require "spec_helper"
 
 RSpec.describe "wiki pages", :js, :selenium, with_settings: { journal_aggregation_time_minutes: 0 } do
+  shared_let(:internal_provider) { create(:internal_wiki_provider) }
+
   let(:project) do
     create(:project, enabled_module_names: [:news])
   end
@@ -46,6 +48,7 @@
                            edit_wiki_pages
                            view_wiki_edits
                            select_project_modules
+                           manage_wiki
                            edit_project])
   end
   let(:content_first_version) do
@@ -65,16 +68,14 @@
     login_as user
   end
 
-  it "adding, editing and history", skip: "Wiki activation changed, needs update" do
-    visit project_settings_modules_path(project)
+  it "adding, editing and history" do
+    visit project_settings_wiki_path(project)
 
     expect(page).to have_no_css(".menu-sidebar .main-item-wrapper", text: "Wiki")
 
-    within "#content" do
-      check "Wiki"
+    page.find_test_selector("project-settings-enable-wiki").click
 
-      click_button "Save"
-    end
+    visit project_path(project)
 
     expect(page).to have_css(".wiki-menu--main-item", text: "Wiki", visible: :all)