fixes and conversion

This commit is contained in:
Denys Vuika 2024-09-19 14:45:34 -04:00
parent 6d9838eaf4
commit feca05e835
4 changed files with 13 additions and 14 deletions

View File

@ -16,8 +16,12 @@
*/ */
import { Component, Input } from '@angular/core'; import { Component, Input } from '@angular/core';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { TranslateModule } from '@ngx-translate/core';
@Component({ @Component({
standalone: true,
imports: [MatProgressSpinnerModule, TranslateModule],
templateUrl: './form-spinner.component.html', templateUrl: './form-spinner.component.html',
styleUrls: ['./form-spinner.component.scss'] styleUrls: ['./form-spinner.component.scss']
}) })

View File

@ -46,7 +46,6 @@ import { RichTextEditorModule } from '../rich-text-editor';
import { A11yModule } from '@angular/cdk/a11y'; import { A11yModule } from '@angular/cdk/a11y';
import { OverlayModule } from '@angular/cdk/overlay'; import { OverlayModule } from '@angular/cdk/overlay';
import { FormSpinnerComponent } from './components/spinner/form-spinner.component'; import { FormSpinnerComponent } from './components/spinner/form-spinner.component';
import { FormCloudSpinnerService } from './services/spinner/form-cloud-spinner.service';
@NgModule({ @NgModule({
imports: [ imports: [
@ -66,7 +65,8 @@ import { FormCloudSpinnerService } from './services/spinner/form-cloud-spinner.s
AlfrescoViewerComponent, AlfrescoViewerComponent,
...CONTENT_UPLOAD_DIRECTIVES, ...CONTENT_UPLOAD_DIRECTIVES,
...CONTENT_METADATA_DIRECTIVES, ...CONTENT_METADATA_DIRECTIVES,
FormStylePipe FormStylePipe,
FormSpinnerComponent
], ],
declarations: [ declarations: [
FormCloudComponent, FormCloudComponent,
@ -81,8 +81,7 @@ import { FormCloudSpinnerService } from './services/spinner/form-cloud-spinner.s
PropertiesViewerWidgetComponent, PropertiesViewerWidgetComponent,
FilePropertiesTableCloudComponent, FilePropertiesTableCloudComponent,
FileViewerWidgetComponent, FileViewerWidgetComponent,
DisplayRichTextWidgetComponent, DisplayRichTextWidgetComponent
FormSpinnerComponent
], ],
exports: [ exports: [
FormCloudComponent, FormCloudComponent,
@ -96,7 +95,6 @@ import { FormCloudSpinnerService } from './services/spinner/form-cloud-spinner.s
PropertiesViewerWidgetComponent, PropertiesViewerWidgetComponent,
FileViewerWidgetComponent, FileViewerWidgetComponent,
DisplayRichTextWidgetComponent DisplayRichTextWidgetComponent
], ]
providers: [FormCloudSpinnerService]
}) })
export class FormCloudModule {} export class FormCloudModule {}

View File

@ -18,18 +18,17 @@
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { FormCloudSpinnerService } from './form-cloud-spinner.service'; import { FormCloudSpinnerService } from './form-cloud-spinner.service';
import { OverlayModule } from '@angular/cdk/overlay'; import { OverlayModule } from '@angular/cdk/overlay';
import { FormService, FormSpinnerEvent } from '@alfresco/adf-core'; import { FormService, FormSpinnerEvent, NoopTranslateModule } from '@alfresco/adf-core';
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
import { TranslateModule } from '@ngx-translate/core';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { FormSpinnerComponent } from '../../components/spinner/form-spinner.component'; import { FormSpinnerComponent } from '../../components/spinner/form-spinner.component';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing';
import { PortalModule } from '@angular/cdk/portal'; import { PortalModule } from '@angular/cdk/portal';
import { HarnessLoader } from '@angular/cdk/testing'; import { HarnessLoader } from '@angular/cdk/testing';
import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed';
@Component({ @Component({
standalone: true,
selector: 'adf-cloud-overlay-test', selector: 'adf-cloud-overlay-test',
template: `<div>adf-cloud-overlay-test</div>` template: `<div>adf-cloud-overlay-test</div>`
}) })
@ -48,17 +47,15 @@ describe('FormCloudSpinnerService', () => {
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [FormSpinnerComponent, SpinnerTestComponent], imports: [NoopTranslateModule, FormSpinnerComponent, SpinnerTestComponent, OverlayModule, PortalModule],
providers: [ providers: [
FormCloudSpinnerService,
{ {
provide: FormService, provide: FormService,
useValue: { useValue: {
toggleFormSpinner: new Subject() toggleFormSpinner: new Subject()
} }
} }
], ]
imports: [OverlayModule, PortalModule, MatProgressSpinnerModule, TranslateModule.forRoot()]
}); });
fixture = TestBed.createComponent(SpinnerTestComponent); fixture = TestBed.createComponent(SpinnerTestComponent);

View File

@ -23,7 +23,7 @@ import { Observable } from 'rxjs';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
import { FormSpinnerComponent } from '../../components/spinner/form-spinner.component'; import { FormSpinnerComponent } from '../../components/spinner/form-spinner.component';
@Injectable() @Injectable({ providedIn: 'root' })
export class FormCloudSpinnerService { export class FormCloudSpinnerService {
private formService = inject(FormService); private formService = inject(FormService);
private overlay = inject(Overlay); private overlay = inject(Overlay);