feat(editor-content): apply format #29872

dotCMS · Sep 27, 2024 · 274c6af · 274c6af
1 parent 6ffdd79
commit 274c6af
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 18 deletions.
diff --git a/core-web/libs/data-access/src/lib/dot-upload-file/dot-upload-file.service.spec.ts b/core-web/libs/data-access/src/lib/dot-upload-file/dot-upload-file.service.spec.ts
@@ -9,7 +9,6 @@ describe('DotUploadFileService', () => {
     let spectator: SpectatorHttp<DotUploadFileService>;
     let dotWorkflowActionsFireService: SpyObject<DotWorkflowActionsFireService>;
 
-
     const createHttp = createHttpFactory({
         service: DotUploadFileService,
         providers: [DotUploadFileService, mockProvider(DotWorkflowActionsFireService)]
@@ -27,7 +26,9 @@ describe('DotUploadFileService', () => {
 
     describe('uploadDotAsset', () => {
         it('should upload a file as a dotAsset', () => {
-            dotWorkflowActionsFireService.newContentlet.mockReturnValueOnce(of({ entity: { identifier: 'test' } }));
+            dotWorkflowActionsFireService.newContentlet.mockReturnValueOnce(
+                of({ entity: { identifier: 'test' } })
+            );
 
             const file = new File([''], 'test.png', {
                 type: 'image/png'

diff --git a/core-web/libs/data-access/src/lib/dot-upload-file/dot-upload-file.service.ts b/core-web/libs/data-access/src/lib/dot-upload-file/dot-upload-file.service.ts
@@ -32,7 +32,7 @@ export class DotUploadFileService {
     readonly #BASE_URL = '/api/v1/workflow/actions/default';
     readonly #httpClient = inject(HttpClient);
     readonly #uploadService = inject(DotUploadService);
-    readonly #workflowActionsFireService = inject(DotWorkflowActionsFireService)
+    readonly #workflowActionsFireService = inject(DotWorkflowActionsFireService);
 
     publishContent({
         data,
@@ -95,6 +95,10 @@ export class DotUploadFileService {
         const formData = new FormData();
         formData.append('file', file);
 
-        return this.#workflowActionsFireService.newContentlet<DotCMSContentlet>('dotAsset', { file: file.name }, formData);
+        return this.#workflowActionsFireService.newContentlet<DotCMSContentlet>(
+            'dotAsset',
+            { file: file.name },
+            formData
+        );
     }
 }
diff --git a/...s/data-access/src/lib/dot-workflow-actions-fire/dot-workflow-actions-fire.service.spec.ts b/...s/data-access/src/lib/dot-workflow-actions-fire/dot-workflow-actions-fire.service.spec.ts
@@ -85,10 +85,12 @@ describe('DotWorkflowActionsFireService', () => {
         const formData = new FormData();
         formData.append('file', file);
 
-        spectator.service.newContentlet('dotAsset', { file: file.name }, formData).subscribe((res) => {
-            expect(res).toEqual([mockResult]);
-            done();
-        });
+        spectator.service
+            .newContentlet('dotAsset', { file: file.name }, formData)
+            .subscribe((res) => {
+                expect(res).toEqual([mockResult]);
+                done();
+            });
 
         const req = spectator.expectOne(
             '/api/v1/workflow/actions/default/fire/NEW',

diff --git a/...b/libs/data-access/src/lib/dot-workflow-actions-fire/dot-workflow-actions-fire.service.ts b/...b/libs/data-access/src/lib/dot-workflow-actions-fire/dot-workflow-actions-fire.service.ts
@@ -87,7 +87,11 @@ export class DotWorkflowActionsFireService {
      *
      * @memberof DotWorkflowActionsFireService
      */
-    newContentlet<T>(contentType: string, data: { [key: string]: string }, formData?: FormData): Observable<T> {
+    newContentlet<T>(
+        contentType: string,
+        data: { [key: string]: string },
+        formData?: FormData
+    ): Observable<T> {
         return this.request<T>({ contentType, data, action: ActionToFire.NEW, formData });
     }
 
@@ -175,28 +179,25 @@ export class DotWorkflowActionsFireService {
         individualPermissions,
         formData
     }: DotActionRequestOptions): Observable<T> {
-
         let url = `${this.BASE_URL}/actions/default/fire/${action}`;
 
         const contentlet = contentType ? { contentType: contentType, ...data } : data;
         const bodyRequest = individualPermissions
-                ? { contentlet, individualPermissions }
-                : { contentlet };
+            ? { contentlet, individualPermissions }
+            : { contentlet };
 
         if (data['inode']) {
-            url += `?inode=${data['inode']}`
+            url += `?inode=${data['inode']}`;
         }
 
         if (formData) {
             formData.append('json', JSON.stringify(bodyRequest));
         }
 
         return this.httpClient
-            .put(
-                url,
-                formData ? formData : bodyRequest,
-                { headers: formData ? new HttpHeaders() : this.defaultHeaders }
-            )
+            .put(url, formData ? formData : bodyRequest, {
+                headers: formData ? new HttpHeaders() : this.defaultHeaders
+            })
             .pipe(take(1), pluck('entity'));
     }
 }
diff --git a/core-web/libs/dotcms-models/src/lib/dot-contentlet.model.ts b/core-web/libs/dotcms-models/src/lib/dot-contentlet.model.ts
@@ -32,6 +32,7 @@ export interface DotCMSContentlet {
     url: string;
     working: boolean;
     body?: string;
+    content?: string;
     contentTypeIcon?: string;
     variant?: string;
     __icon__?: string;