OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Merge branch 'dev' into implementation/66904-split-up-overview-and-dashboard
Alexander Brandon Coles5918c2010652
diff --cc frontend/src/app/features/overview/dashboard.component.tsindex e50e5054bc8,5c9547e0d5c..1653c65d334--- a/frontend/src/app/features/overview/dashboard.component.ts+++ b/frontend/src/app/features/overview/dashboard.component.ts@@@ -26,25 -26,29 +26,35 @@@// See COPYRIGHT and LICENSE files for more details.//++- import { ChangeDetectionStrategy, Component } from '@angular/core';+ import { ChangeDetectionStrategy, Component, ElementRef, inject, Input, OnInit } from '@angular/core';import { GridPageComponent } from 'core-app/shared/components/grids/grid/page/grid-page.component';import { GRID_PROVIDERS } from 'core-app/shared/components/grids/grid/grid.component';+import { OpSharedModule } from 'core-app/shared/shared.module';+import { OpenprojectGridsModule } from 'core-app/shared/components/grids/openproject-grids.module';+ import { populateInputsFromDataset } from 'core-app/shared/components/dataset-inputs';@Component({changeDetection: ChangeDetectionStrategy.OnPush,templateUrl: '../../shared/components/grids/grid/page/grid-page.component.html',styleUrls: ['../../shared/components/grids/grid/page/grid-page.component.sass'],+ imports: [+ OpSharedModule,+ OpenprojectGridsModule,+ ],providers: GRID_PROVIDERS,- standalone: false,+ standalone: true,})- export class DashboardComponent extends GridPageComponent {-export class OverviewComponent extends GridPageComponent implements OnInit {++export class DashboardComponent extends GridPageComponent implements OnInit {+ @Input() projectIdentifier:string;++ readonly elementRef = inject(ElementRef);++ ngOnInit() {+ populateInputsFromDataset(this);+ super.ngOnInit();+ }+protected gridScopePath():string {- return this.pathHelper.projectDashboardsPath(this.currentProject.identifier ?? '');- return this.pathHelper.projectPath(this.projectIdentifier);++ return this.pathHelper.projectDashboardsPath(this.projectIdentifier);}}diff --cc modules/overviews/app/components/overviews/dashboard_component.html.erbindex d9516325423,00000000000..1876761bee7mode 100644,000000..100644--- a/modules/overviews/app/components/overviews/dashboard_component.html.erb+++ b/modules/overviews/app/components/overviews/dashboard_component.html.erb@@@ -1,51 -1,0 +1,51 @@@+<%#-- copyright+OpenProject is an open source project management software.+Copyright (C) the OpenProject GmbH++This program is free software; you can redistribute it and/or+modify it under the terms of the GNU General Public License version 3.++OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:+Copyright (C) 2006-2013 Jean-Philippe Lang+Copyright (C) 2010-2013 the ChiliProject Team++This program is free software; you can redistribute it and/or+modify it under the terms of the GNU General Public License+as published by the Free Software Foundation; either version 2+of the License, or (at your option) any later version.++This program is distributed in the hope that it will be useful,+but WITHOUT ANY WARRANTY; without even the implied warranty of+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+GNU General Public License for more details.++You should have received a copy of the GNU General Public License+along with this program; if not, write to the Free Software+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.++See COPYRIGHT and LICENSE files for more details.++++#%>++<div class="op-grid-page">+ <% if allowed_to_manage? %>+ <%=+ render(Primer::OpenProject::SubHeader.new(classes: "grid-mx")) do |subheader|+ subheader.with_action_button(+ scheme: :primary,+ leading_icon: :plus,+ label: t(:label_widget_new),+ data: {+ controller: "overview--add-widgets",+ action: "click->overview--add-widgets#addWidget"+ },+ test_selector: "overview--add-widgets-button"+ ) do+ t(:label_widget)+ end+ end+ %>+ <% end %>+- <%= angular_component_tag("opce-dashboard") %>++ <%= angular_component_tag("opce-dashboard", inputs: { projectIdentifier: @project.identifier }) %>+</div>