Skip to content

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

Remove spot icons from remaining ts files

Henriette Darge09a449958089
diff --git a/frontend/src/app/features/team-planner/team-planner/planner/team-planner.component.ts b/frontend/src/app/features/team-planner/team-planner/planner/team-planner.component.ts
index 102a5d3e8f6..13dd9f9b442 100644
--- a/frontend/src/app/features/team-planner/team-planner/planner/team-planner.component.ts
+++ b/frontend/src/app/features/team-planner/team-planner/planner/team-planner.component.ts
@@ -37,8 +37,19 @@ import {
TemplateRef,
ViewChild,
} from '@angular/core';
-import { CalendarOptions, DateSelectArg, EventApi, EventDropArg, EventInput } from '@fullcalendar/core';
-import { BehaviorSubject, combineLatest, Observable, Subject } from 'rxjs';
+import {
+ CalendarOptions,
+ DateSelectArg,
+ EventApi,
+ EventDropArg,
+ EventInput,
+} from '@fullcalendar/core';
+import {
+ BehaviorSubject,
+ combineLatest,
+ Observable,
+ Subject,
+} from 'rxjs';
import {
debounceTime,
distinctUntilChanged,
@@ -63,22 +74,21 @@ import interactionPlugin, {
import { FullCalendarComponent } from '@fullcalendar/angular';
import { I18nService } from 'core-app/core/i18n/i18n.service';
import { ConfigurationService } from 'core-app/core/config/configuration.service';
-import {
- WorkPackageViewFiltersService,
-} from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-filters.service';
+import { WorkPackageViewFiltersService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-filters.service';
import { IsolatedQuerySpace } from 'core-app/features/work-packages/directives/query-space/isolated-query-space';
import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
import { splitViewRoute } from 'core-app/features/work-packages/routing/split-view-routes.helper';
import { QueryFilterInstanceResource } from 'core-app/features/hal/resources/query-filter-instance-resource';
import { PrincipalsResourceService } from 'core-app/core/state/principals/principals.service';
-import { ApiV3ListFilter, ApiV3ListParameters } from 'core-app/core/apiv3/paths/apiv3-list-resource.interface';
+import {
+ ApiV3ListFilter,
+ ApiV3ListParameters,
+} from 'core-app/core/apiv3/paths/apiv3-list-resource.interface';
import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
import { HalResource } from 'core-app/features/hal/resources/hal-resource';
import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
import { OpCalendarService } from 'core-app/features/calendar/op-calendar.service';
-import {
- HalResourceEditingService,
-} from 'core-app/shared/components/fields/edit/services/hal-resource-editing.service';
+import { HalResourceEditingService } from 'core-app/shared/components/fields/edit/services/hal-resource-editing.service';
import { HalResourceNotificationService } from 'core-app/features/hal/services/hal-resource-notification.service';
import { SchemaCacheService } from 'core-app/core/schemas/schema-cache.service';
import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
@@ -86,9 +96,7 @@ import { MAGIC_PAGE_NUMBER } from 'core-app/core/apiv3/helpers/get-paginated-res
import { CalendarDragDropService } from 'core-app/features/team-planner/team-planner/calendar-drag-drop.service';
import { StatusResource } from 'core-app/features/hal/resources/status-resource';
import { ResourceChangeset } from 'core-app/shared/components/fields/changeset/resource-changeset';
-import {
- KeepTabService,
-} from 'core-app/features/work-packages/components/wp-single-view-tabs/keep-tab/keep-tab.service';
+import { KeepTabService } from 'core-app/features/work-packages/components/wp-single-view-tabs/keep-tab/keep-tab.service';
import { HalError } from 'core-app/features/hal/services/hal-error';
import { ActionsService } from 'core-app/core/state/actions/actions.service';
import {
@@ -97,7 +105,10 @@ import {
teamPlannerPageRefresh,
} from 'core-app/features/team-planner/team-planner/planner/team-planner.actions';
import { imagePath } from 'core-app/shared/helpers/images/path-helper';
-import { skeletonEvents, skeletonResources } from './loading-skeleton-data';
+import {
+ skeletonEvents,
+ skeletonResources,
+} from './loading-skeleton-data';
import { CapabilitiesResourceService } from 'core-app/core/state/capabilities/capabilities.service';
import { ICapability } from 'core-app/core/state/capabilities/capability.model';
import { ToastService } from 'core-app/shared/components/toaster/toast.service';
@@ -108,13 +119,21 @@ import { RawOptionsFromRefiners } from '@fullcalendar/core/internal';
import { ViewOptionRefiners } from '@fullcalendar/common';
import { ResourceApi } from '@fullcalendar/resource';
import { DeviceService } from 'core-app/core/browser/device.service';
-import { EffectCallback, registerEffectCallbacks } from 'core-app/core/state/effects/effect-handler.decorator';
+import {
+ EffectCallback,
+ registerEffectCallbacks,
+} from 'core-app/core/state/effects/effect-handler.decorator';
import {
addBackgroundEvents,
removeBackgroundEvents,
} from 'core-app/features/team-planner/team-planner/planner/background-events';
import moment from 'moment-timezone';
import allLocales from '@fullcalendar/core/locales-all';
+import { octionElement } from 'core-app/shared/helpers/op-icon-builder';
+import {
+ personIconData,
+ toDOMString,
+} from '@openproject/octicons-angular';
export type TeamPlannerViewOptionKey = 'resourceTimelineWorkWeek'|'resourceTimelineWeek'|'resourceTimelineTwoWeeks'|'resourceTimelineFourWeeks'|'resourceTimelineEightWeeks';
export type TeamPlannerViewOptions = { [K in TeamPlannerViewOptionKey]:RawOptionsFromRefiners<Required<ViewOptionRefiners>> };
@@ -311,6 +330,12 @@ export class TeamPlannerComponent extends UntilDestroyedMixin implements OnInit,
private initialCalendarView = this.workPackagesCalendar.initialView || 'resourceTimelineWorkWeek';
+ private personIcon = toDOMString(
+ personIconData, // SVG data for the icon.
+ 'small',
+ { 'aria-hidden': 'true',},
+ );
+
private viewOptionDefaults = {
type: 'resourceTimeline',
slotDuration: { days: 1 },
@@ -318,7 +343,7 @@ export class TeamPlannerComponent extends UntilDestroyedMixin implements OnInit,
{
field: 'title',
headerContent: {
- html: `<span class="spot-link spot-link_inactive"><span aria-label="${this.text.assignee}" class="spot-icon spot-icon_user"></span><span class="hidden-for-mobile">${this.text.assignee}</span></span>`,
+ html: `<span class="spot-link spot-link_inactive">${this.personIcon}<span class="hidden-for-mobile">${this.text.assignee}</span></span>`,
},
},
],
diff --git a/frontend/src/app/features/work-packages/components/wp-fast-table/builders/baseline/baseline-column-builder.ts b/frontend/src/app/features/work-packages/components/wp-fast-table/builders/baseline/baseline-column-builder.ts
index ef3eaf33820..af7c5af0fab 100644
--- a/frontend/src/app/features/work-packages/components/wp-fast-table/builders/baseline/baseline-column-builder.ts
+++ b/frontend/src/app/features/work-packages/components/wp-fast-table/builders/baseline/baseline-column-builder.ts
@@ -1,16 +1,19 @@
import { Injector } from '@angular/core';
-import {
- WorkPackageResource,
-} from 'core-app/features/hal/resources/work-package-resource';
+import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator';
import { States } from 'core-app/core/states/states.service';
import { WorkPackageViewBaselineService } from 'core-app/features/work-packages/routing/wp-view-base/view-services/wp-view-baseline.service';
import { tdClassName } from 'core-app/features/work-packages/components/wp-fast-table/builders/cell-builder';
import { QueryColumn } from 'core-app/features/work-packages/components/wp-query/query-column';
-import { opIconElement } from 'core-app/shared/helpers/op-icon-builder';
+import { octionElement } from 'core-app/shared/helpers/op-icon-builder';
import { SchemaCacheService } from 'core-app/core/schemas/schema-cache.service';
import { I18nService } from 'core-app/core/i18n/i18n.service';
import { getBaselineState } from '../../../wp-baseline/baseline-helpers';
+import {
+ opArrowInIconData,
+ opTriangleDeltaIconData,
+ replyIconData,
+} from '@openproject/octicons-angular';
export const baselineCellName = 'op-table-baseline--column-cell';
@@ -52,21 +55,24 @@ export class BaselineColumnBuilder {
):HTMLElement|null {
const state = getBaselineState(workPackage, this.schemaCache);
if (state === 'added') {
- const icon = opIconElement('spot-icon', 'spot-icon_1', 'spot-icon_flex', 'spot-icon_arrow-in', 'op-table-baseline--icon-added');
- icon.title = this.I18n.t('js.work_packages.baseline.addition_label');
- return icon;
+ return octionElement(opArrowInIconData,
+ 'small',
+ 'op-table-baseline--icon-added',
+ this.I18n.t('js.work_packages.baseline.addition_label'));
}
if (state === 'removed') {
- const icon = opIconElement('spot-icon', 'spot-icon_1', 'spot-icon_flex', 'spot-icon_arrow-out', 'op-table-baseline--icon-removed');
- icon.title = this.I18n.t('js.work_packages.baseline.removal_label');
- return icon;
+ return octionElement(replyIconData,
+ 'small',
+ 'op-table-baseline--icon-removed',
+ this.I18n.t('js.work_packages.baseline.removal_label'));
}
if (state === 'updated') {
- const icon = opIconElement('spot-icon', 'spot-icon_1', 'spot-icon_flex', 'spot-icon_delta-triangle', 'op-table-baseline--icon-changed');
- icon.title = this.I18n.t('js.work_packages.baseline.modification_label');
- return icon;
+ return octionElement(opTriangleDeltaIconData,
+ 'small',
+ 'op-table-baseline--icon-changed',
+ this.I18n.t('js.work_packages.baseline.modification_label'));
}
return null;
diff --git a/frontend/src/app/shared/components/principal/principal.component.sass b/frontend/src/app/shared/components/principal/principal.component.sass
index 581e052777b..0f6b4db34ed 100644
--- a/frontend/src/app/shared/components/principal/principal.component.sass
+++ b/frontend/src/app/shared/components/principal/principal.component.sass
@@ -8,3 +8,7 @@
top: 0
right: -6px
background: var(--display-red-bgColor-emphasis)
+ fill: white
+
+ i
+ vertical-align: middle
diff --git a/frontend/src/app/shared/components/time_entries/services/time-entry-timer.service.ts b/frontend/src/app/shared/components/time_entries/services/time-entry-timer.service.ts
index f3b92b64b15..c8c27840c65 100644
--- a/frontend/src/app/shared/components/time_entries/services/time-entry-timer.service.ts
+++ b/frontend/src/app/shared/components/time_entries/services/time-entry-timer.service.ts
@@ -1,20 +1,32 @@
-import { inject, Injectable, Injector } from '@angular/core';
-import { filter, map, tap } from 'rxjs/operators';
+import {
+ inject,
+ Injectable,
+ Injector,
+} from '@angular/core';
+import {
+ filter,
+ map,
+ tap,
+} from 'rxjs/operators';
import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
import { TimeEntryResource } from 'core-app/features/hal/resources/time-entry-resource';
import { ApiV3FilterBuilder } from 'core-app/shared/helpers/api-v3/api-v3-filter-builder';
-import { BehaviorSubject, firstValueFrom, Observable } from 'rxjs';
+import {
+ BehaviorSubject,
+ firstValueFrom,
+ Observable,
+} from 'rxjs';
import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service';
import { ToastService } from 'core-app/shared/components/toaster/toast.service';
import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
import { I18nService } from 'core-app/core/i18n/i18n.service';
import moment from 'moment/moment';
-import {
- StopExistingTimerModalComponent,
-} from 'core-app/shared/components/time_entries/timer/stop-existing-timer-modal.component';
+import { StopExistingTimerModalComponent } from 'core-app/shared/components/time_entries/timer/stop-existing-timer-modal.component';
import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
import { OpModalService } from 'core-app/shared/components/modal/modal.service';
import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service';
+import { octionElement } from 'core-app/shared/helpers/op-icon-builder';
+import { clockIconData } from '@openproject/octicons-angular';
@Injectable()
export class TimeEntryTimerService {
@@ -106,9 +118,8 @@ export class TimeEntryTimerService {
private renderTimer() {
const timerElement = document.createElement('span');
- const icon = document.createElement('span');
+ const icon = octionElement(clockIconData, 'xsmall');
timerElement.classList.add('op-principal--timer');
- icon.classList.add('spot-icon', 'spot-icon_time', 'spot-icon_1_25');
timerElement.appendChild(icon);
const avatar = document.querySelector<HTMLElement>('.op-top-menu-user-avatar');
diff --git a/frontend/src/app/shared/helpers/op-icon-builder.ts b/frontend/src/app/shared/helpers/op-icon-builder.ts
index 1a9e06d8d2d..b9eefbeb583 100644
--- a/frontend/src/app/shared/helpers/op-icon-builder.ts
+++ b/frontend/src/app/shared/helpers/op-icon-builder.ts
@@ -1,3 +1,5 @@
+import { toDOMString } from '@openproject/octicons-angular';
+
/**
* Return an <i> HTML element with the given icon classes
* and aria-hidden=true set.
@@ -9,3 +11,21 @@ export function opIconElement(...classes:string[]) {
return icon;
}
+
+/**
+ * Return an <i> HTML element with the octicon SVG inside
+ * aria-hidden=true is set
+ */
+export function octionElement(iconData:any, size:'xsmall'|'small' = 'small', classes = '', title = '') {
+ const iconString:string = toDOMString(
+ iconData, // SVG data for the icon.
+ size,
+ { 'aria-hidden': 'true',
+ class: classes,
+ title: title},
+ );
+ const icon = document.createElement('i');
+ icon.innerHTML = iconString;
+
+ return icon;
+}
diff --git a/frontend/src/app/spot/components/filter-chip/filter-chip.component.html b/frontend/src/app/spot/components/filter-chip/filter-chip.component.html
deleted file mode 100644
index 6fc09c405ad..00000000000
--- a/frontend/src/app/spot/components/filter-chip/filter-chip.component.html
+++ /dev/null
@@ -1,19 +0,0 @@
-@if (removable) {
- <button
- class="spot-filter-chip--remove"
- type="button"
- (click)="remove.emit()"
- [attr.aria-label]="text.remove"
- [disabled]="disabled"
- >
- <svg x-icon size="small" />
- </button>
-}
-<div class="spot-filter-chip--title">
- @if (icon) {
- <span
- [ngClass]="iconClasses"
- ></span>
- }
- {{ title }}
-</div>
diff --git a/frontend/src/app/spot/components/filter-chip/filter-chip.component.ts b/frontend/src/app/spot/components/filter-chip/filter-chip.component.ts
deleted file mode 100644
index b606e65a134..00000000000
--- a/frontend/src/app/spot/components/filter-chip/filter-chip.component.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import {
- Component,
- EventEmitter,
- HostBinding,
- Input,
- Output,
-} from '@angular/core';
-import { I18nService } from 'core-app/core/i18n/i18n.service';
-
-@Component({
- selector: 'spot-filter-chip',
- templateUrl: './filter-chip.component.html',
- standalone: false,
-})
-export class SpotFilterChipComponent {
- @HostBinding('class.spot-filter-chip') public className = true;
-
- @Input() @HostBinding('class.spot-filter-chip_disabled') public disabled = false;
-
- @Input() removable = true;
-
- @Input() title = '';
-
- @Input() icon = '';
-
- @Output() remove = new EventEmitter<void>();
-
- public text = {
- remove: this.i18n.t('js.spot.filter_chip.remove'),
- };
-
- public get iconClasses():string[] {
- return [
- 'spot-icon',
- `spot-icon_${this.icon}`,
- ];
- }
-
- constructor(readonly i18n:I18nService) {}
-}
diff --git a/frontend/src/app/spot/spot.module.ts b/frontend/src/app/spot/spot.module.ts
index 8ba8d212736..8a7bfd0768b 100644
--- a/frontend/src/app/spot/spot.module.ts
+++ b/frontend/src/app/spot/spot.module.ts
@@ -12,7 +12,6 @@ import { SpotCheckboxComponent } from './components/checkbox/checkbox.component'
import { SpotSwitchComponent } from './components/switch/switch.component';
import { SpotToggleComponent } from './components/toggle/toggle.component';
import { SpotTextFieldComponent } from './components/text-field/text-field.component';
-import { SpotFilterChipComponent } from './components/filter-chip/filter-chip.component';
import { SpotDropModalComponent } from './components/drop-modal/drop-modal.component';
import { SpotTooltipComponent } from './components/tooltip/tooltip.component';
import { SpotFormFieldComponent } from './components/form-field/form-field.component';
@@ -40,7 +39,6 @@ import { SpotDropModalPortalComponent } from './components/drop-modal/drop-modal
SpotSwitchComponent,
SpotToggleComponent,
SpotTextFieldComponent,
- SpotFilterChipComponent,
SpotDropModalComponent,
SpotDropModalPortalComponent,
SpotDropModalPortalComponent,
@@ -56,7 +54,6 @@ import { SpotDropModalPortalComponent } from './components/drop-modal/drop-modal
SpotSwitchComponent,
SpotToggleComponent,
SpotTextFieldComponent,
- SpotFilterChipComponent,
SpotDropModalComponent,
SpotDropModalPortalComponent,
SpotDropModalPortalComponent,
diff --git a/frontend/src/app/spot/styles/sass/components/button-overrides.sass b/frontend/src/app/spot/styles/sass/components/button-overrides.sass
deleted file mode 100644
index be52c479403..00000000000
--- a/frontend/src/app/spot/styles/sass/components/button-overrides.sass
+++ /dev/null
@@ -1,14 +0,0 @@
-.button:not(.button_flex)
- .spot-icon
- // Add rules for using new spot icons boxed within the old buttons
- // prevent icon box to inflate button height
- margin-top: -1rem
- margin-bottom: -1rem
- position: relative
- top: 0.33em
-
- &:not(:last-child)
- margin-right: 0.25rem
-
- &:not(:first-child)
- margin-left: 0.25rem
diff --git a/frontend/src/app/spot/styles/sass/components/filter-chip.sass b/frontend/src/app/spot/styles/sass/components/filter-chip.sass
deleted file mode 100644
index c32b74904c7..00000000000
--- a/frontend/src/app/spot/styles/sass/components/filter-chip.sass
+++ /dev/null
@@ -1,29 +0,0 @@
-.spot-filter-chip
- @include spot-caption
-
- display: inline-flex
- align-items: center
- flex-wrap: nowrap
- background-color: $spot-color-main-light
- color: $spot-color-basic-gray-1
- border-radius: 5px
-
- &--remove
- display: flex
- justify-content: center
- align-items: center
- border: 0
- border-right: 1px solid rgba($spot-color-main, 0.5)
- background: transparent
- cursor: pointer
- padding: $spot-spacing-0_25
-
- &:focus
- @include spot-focus
-
- &--title
- padding: $spot-spacing-0_25
-
- &_disabled
- color: var(--fgColor-muted)
- background-color: $spot-color-basic-gray-5
diff --git a/frontend/src/app/spot/styles/sass/components/index.sass b/frontend/src/app/spot/styles/sass/components/index.sass
index 1e0a8fba240..613504b0ac1 100644
--- a/frontend/src/app/spot/styles/sass/components/index.sass
+++ b/frontend/src/app/spot/styles/sass/components/index.sass
@@ -1,7 +1,6 @@
// This directory will hold files that implement the styles for specific blocks and components
// Import them here
@import './button'
-@import './button-overrides'
@import './breadcrumbs'
@import './divider'
@import './link'
@@ -9,7 +8,6 @@
@import './checkbox'
@import './switch'
@import './text-field'
-@import './filter-chip'
@import './drop-modal'
@import './list'
@import './modal'
diff --git a/frontend/src/global_styles/layout/_toolbar_mobile.sass b/frontend/src/global_styles/layout/_toolbar_mobile.sass
index 5d1ebee2ee6..afb50ccc451 100644
--- a/frontend/src/global_styles/layout/_toolbar_mobile.sass
+++ b/frontend/src/global_styles/layout/_toolbar_mobile.sass
@@ -43,7 +43,7 @@
// Hide toolbar button texts on mobile
@include hide-button-texts
.icon-pulldown,
- .spot-icon_dropdown
+ .octicon[triangle-down-icon]
display: none
.op-icon--wrapper
diff --git a/frontend/src/global_styles/layout/work_packages/_table_baseline.sass b/frontend/src/global_styles/layout/work_packages/_table_baseline.sass
index 9e4c1fa3582..7948cd7f33a 100644
--- a/frontend/src/global_styles/layout/work_packages/_table_baseline.sass
+++ b/frontend/src/global_styles/layout/work_packages/_table_baseline.sass
@@ -32,12 +32,15 @@
&--icon-added
color: #5F42E0
+ fill: #5F42E0
&--icon-removed
color: #555555
+ fill: #555555
&--icon-changed
color: #54AFE0
+ fill: #54AFE0
&--old-field
@include spot-caption
diff --git a/spec/features/my/sessions_management_spec.rb b/spec/features/my/sessions_management_spec.rb
index 2a3dbabba72..7c3be907906 100644
--- a/spec/features/my/sessions_management_spec.rb
+++ b/spec/features/my/sessions_management_spec.rb
@@ -60,7 +60,6 @@ RSpec.describe "My account session management", :js, :selenium do
expect(trs[0]).to have_text("unknown browser")
expect(trs[0]).to have_text("unknown operating system")
expect(trs[0]).to have_no_css(".buttons a")
- expect(trs[1]).to have_no_css(".spot-icon_yes")
expect(trs[1]).to have_text("Mozilla Firefox (Version 12.3)")
expect(trs[1]).to have_text("Linux")
expect(trs[1]).to have_text format_time(old_session_time)