mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2026-08-01 16:42:18 +00:00
Chorehancement: update to Angular v22, 'zoneless' / 'reactive' (#13114)
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
@if (customLogo) {
|
||||
<img src="{{customLogo}}" [class]="getClasses()" [attr.style]="'height:'+height" />
|
||||
<img src="{{customLogo}}" [class]="getClasses()" [attr.style]="'height:'+height()" />
|
||||
} @else {
|
||||
<svg [class]="getClasses()" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2670 860" [attr.style]="'height:'+height">
|
||||
<svg [class]="getClasses()" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2670 860" [attr.style]="'height:'+height()">
|
||||
<path class="leaf" style="fill:#005616;" d="M2227.4,821.2c-6.1-17.8-18.1-53.6-19.2-53.4-174.7-77.8-159.8-201.2-117.5-304.2,26.3,120.1,235.3,130.3,128,294.1-.7,2,8.8,24.3,17.1,44.9,19.9-45.4,51.3-101.1,48.8-105.7-199.9-357.4,278.8-444.7,350.7-690.2,72.6,220.1,46.5,577.5-330.4,713.3-1.8,1.2-55.6,130-58.5,131.4-.2-1.9-29.1,2.5-26.4-7.6,1.4-6.2,4.2-14.2,7.2-22.4h0v-.2h.2,0ZM2211.7,731.2c42.3-62.9-11.1-105.7-49.8-133.2,71,94,58.1,105.7,49.8,133.2h0Z"/>
|
||||
<g class="text" style="fill: #000;">
|
||||
<path class="st1" d="M654.6,393.2l-.7,137.7h-85.5V188.7h85.4c.4,11.3-.3,21.7,1.3,33.8,23.1-34.1,62.3-50,101.1-38.3,16.5,5,29.6,16.4,39.7,30,34.4,46.5,35.1,134,3.6,182.2-10.1,14.4-22.5,26.9-39,33.4-39.5,15.7-81,1.1-105.9-36.6h0ZM721,362.2c21-26.1,21-82.7-.4-108.4-13.2-15.9-36.4-16.1-49.9-.4-22.2,25.8-21.7,85.3.5,110.1,13.6,15.2,36.6,15,49.7-1.3h.1Z"/>
|
||||
|
||||
@@ -28,7 +28,7 @@ describe('LogoComponent', () => {
|
||||
|
||||
it('should support extra classes', () => {
|
||||
expect(fixture.debugElement.queryAll(By.css('.foo'))).toHaveLength(0)
|
||||
component.extra_classes = 'foo'
|
||||
fixture.componentRef.setInput('extra_classes', 'foo')
|
||||
fixture.detectChanges()
|
||||
expect(fixture.debugElement.queryAll(By.css('.foo'))).toHaveLength(1)
|
||||
})
|
||||
@@ -37,7 +37,7 @@ describe('LogoComponent', () => {
|
||||
expect(fixture.debugElement.query(By.css('svg')).attributes.style).toEqual(
|
||||
'height:6em'
|
||||
)
|
||||
component.height = '10em'
|
||||
fixture.componentRef.setInput('height', '10em')
|
||||
fixture.detectChanges()
|
||||
expect(fixture.debugElement.query(By.css('svg')).attributes.style).toEqual(
|
||||
'height:10em'
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Component, Input, inject } from '@angular/core'
|
||||
import { Component, inject, input } from '@angular/core'
|
||||
import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
|
||||
import { SettingsService } from 'src/app/services/settings.service'
|
||||
import { environment } from 'src/environments/environment'
|
||||
@@ -10,12 +10,8 @@ import { environment } from 'src/environments/environment'
|
||||
})
|
||||
export class LogoComponent {
|
||||
private settingsService = inject(SettingsService)
|
||||
|
||||
@Input()
|
||||
extra_classes: string
|
||||
|
||||
@Input()
|
||||
height = '6em'
|
||||
readonly extra_classes = input<string>(undefined)
|
||||
readonly height = input('6em')
|
||||
|
||||
get customLogo(): string {
|
||||
return this.settingsService.get(SETTINGS_KEYS.APP_LOGO)?.length
|
||||
@@ -27,6 +23,6 @@ export class LogoComponent {
|
||||
}
|
||||
|
||||
getClasses() {
|
||||
return ['logo'].concat(this.extra_classes).join(' ')
|
||||
return ['logo'].concat(this.extra_classes()).join(' ')
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user