Merge pull request opf#15823 from opf/impl/ui-router-backlogs

Remove ui-router from backlogs

app/helpers/frontend_asset_helper.rb

@@ -46,16 +46,20 @@ def include_frontend_assets
         concat nonced_javascript_include_tag variable_asset_path(file), skip_pipeline: true
       end
 
-      concat stylesheet_link_tag variable_asset_path("styles.css"), media: :all, skip_pipeline: true
+      concat frontend_stylesheet_link_tag("styles.css")
     end
   end
 
   def include_spot_assets
     capture do
-      concat stylesheet_link_tag variable_asset_path("spot.css"), media: :all, skip_pipeline: true
+      concat frontend_stylesheet_link_tag("spot.css")
     end
   end
 
+  def frontend_stylesheet_link_tag(path)
+    stylesheet_link_tag variable_asset_path(path), media: :all, skip_pipeline: true
+  end
+
   def nonced_javascript_include_tag(path, **)
     javascript_include_tag(path, nonce: content_security_policy_script_nonce, **)
   end

frontend/angular.json

@@ -52,6 +52,10 @@
                 "input": "src/spot.scss",
                 "bundleName": "spot"
               },
+              {
+                "input": "src/backlogs.scss",
+                "bundleName": "backlogs"
+              },
               "src/styles.scss",
               "node_modules/codemirror/lib/codemirror.css",
               "node_modules/jquery-ui/themes/base/core.css",

frontend/src/app/core/routing/openproject.routes.ts

@@ -82,18 +82,6 @@ export const OPENPROJECT_ROUTES:Ng2StateDeclaration[] = [
     url: '/bcf',
     loadChildren: () => import('../../features/bim/ifc_models/openproject-ifc-models.module').then((m) => m.OpenprojectIFCModelsModule),
   },
-  {
-    name: 'backlogs.**',
-    parent: 'optional_project',
-    url: '/backlogs',
-    loadChildren: () => import('../../features/backlogs/openproject-backlogs.module').then((m) => m.OpenprojectBacklogsModule),
-  },
-  {
-    name: 'backlogs_sprint.**',
-    parent: 'optional_project',
-    url: '/sprints',
-    loadChildren: () => import('../../features/backlogs/openproject-backlogs.module').then((m) => m.OpenprojectBacklogsModule),
-  },
   {
     name: 'reporting.**',
     parent: 'optional_project',

frontend/src/app/core/setup/global-dynamic-components.const.ts

@@ -90,10 +90,6 @@ import {
   TriggerActionsEntryComponent,
   triggerActionsEntryComponentSelector,
 } from 'core-app/shared/components/time_entries/edit/trigger-actions-entry.component';
-import {
-  BacklogsPageComponent,
-  backlogsPageComponentSelector,
-} from 'core-app/features/backlogs/backlogs-page/backlogs-page.component';
 import {
   AttributeHelpTextComponent,
   attributeHelpTextSelector,
@@ -224,7 +220,6 @@ export const globalDynamicComponents:OptionalBootstrapDefinition[] = [
   { selector: opTeamPlannerSidemenuSelector, cls: TeamPlannerSidemenuComponent },
   { selector: opCalendarSidemenuSelector, cls: CalendarSidemenuComponent },
   { selector: triggerActionsEntryComponentSelector, cls: TriggerActionsEntryComponent, embeddable: true },
-  { selector: backlogsPageComponentSelector, cls: BacklogsPageComponent },
   { selector: editableQueryPropsSelector, cls: EditableQueryPropsComponent },
   { selector: backupSelector, cls: BackupComponent },
   { selector: opInAppNotificationBellSelector, cls: InAppNotificationBellComponent },

frontend/src/backlogs.scss

@@ -0,0 +1,2 @@
+// Backlogs
+@import "assets/sass/backlogs";

frontend/src/global_styles/openproject/_index.sass

@@ -13,3 +13,5 @@
 @import working-days-admin-settings
 
 @import ndc-dynamic
+
+@import backlogs

modules/backlogs/app/views/layouts/backlogs.html.erb

@@ -31,14 +31,10 @@ See COPYRIGHT and LICENSE files for more details.
   <%= nonced_javascript_tag do %>
     <%= render(partial: 'shared/server_variables', formats: [:js]) %>
   <% end %>
+  <%= frontend_stylesheet_link_tag "backlogs.css" %>
 <% end %>
 
-<% content_for :content_body do %>
-  <openproject-base></openproject-base>
-  <%# Allow projection pages to show rails rendered content after initialization %>
-  <div data-controller="backlogs" data-application-target="dynamic" id="projected-content" hidden>
-    <%= yield %>
-  </div>
-<% end -%>
+<% content_controller 'backlogs',
+                      dynamic: true %>
 
-<%= render template: 'layouts/base', locals: local_assigns.merge({ no_layout_yield: true }) %>
+<%= render template: 'layouts/base', locals: local_assigns %>