#26696 adding a jsp to render a custom field #26716

jdotcms · 2023-11-16T05:39:43Z

Adding a jsp to render a legacy custom field

fmontes · 2023-11-20T16:05:28Z

dotCMS/src/main/webapp/WEB-INF/portlet.xml

Check if this is not showing in the portlets in the tools and groups

Did somebody checked this?

fmontes · 2023-11-20T16:07:00Z

dotCMS/src/main/webapp/WEB-INF/jsp/legacycustomfield/custom-field-legacy.jsp

We need to add the partial /core/dotCMS/src/main/webapp/html/common/top_inc.jsp

we should not need the top_inc?

…ore into issue-26696-legacy-custom-field

…dotCMS/core into issue-26696-legacy-custom-field

jdotcms · 2023-11-27T19:22:55Z

dotCMS/src/main/webapp/html/legacy_custom_field/legacy-custom-field.jsp

+
+%>
+
+<%--


you can remove this comment

...t-content/src/lib/components/dot-edit-content-field/dot-edit-content-field.component.spec.ts

core-web/libs/edit-content/src/lib/services/dot-edit-content.service.ts

zJaaal · 2023-11-28T12:42:59Z

dotCMS/src/main/webapp/WEB-INF/portlet.xml

+
+

rjvelazco · 2023-11-29T19:34:47Z

...tent/src/lib/fields/dot-edit-content-custom-field/dot-edit-content-custom-field.component.ts

+        this.variables = this.field.fieldVariables.reduce((result, item) => {
+            result[item.key] = item.value;
+
+            return result;
+        }, {});


We are using this in multiple places. Should we create a global util?

...nt/src/lib/fields/dot-edit-content-custom-field/dot-edit-content-custom-field.component.scss

zJaaal · 2023-11-29T19:50:41Z

...tent/src/lib/fields/dot-edit-content-custom-field/dot-edit-content-custom-field.component.ts

+        switch (event.data.type) {
+            case 'turnOnFullScreen':
+                this.isFullscreen = true;
+                break;
+
+            case 'turnOffFullScreen':
+                this.isFullscreen = false;
+                break;
+
+            default:
+                break;
+        }


can we avoid the use of switch/case ?

Should we call this toggleFullScreen? and just do !... maybe?

...nt/src/lib/fields/dot-edit-content-custom-field/dot-edit-content-custom-field.component.scss

fmontes · 2023-11-29T22:37:31Z

...src/lib/fields/dot-edit-content-custom-field/dot-edit-content-custom-field.component.spec.ts

+                }
+            },
+            mockProvider(DotContentTypeService),
+            mockProvider(DotWorkflowActionsFireService)


I just check, is because the DotEditContentService uses DotWorkflowActionsFireService and you are not mocking DotEditContentService.

But now the questions here is bigger, why are you bringing all these services to the test if at first look the component you are testing here is no use to any of those, I think.

Also, I just noticed that this component is importing BlockEditorModule and DotEditContentBinaryFieldComponent, should those not be included in the DotEditContentFieldsModule as well?

fmontes · 2023-11-29T22:38:36Z

...tent/src/lib/fields/dot-edit-content-custom-field/dot-edit-content-custom-field.component.ts

+        switch (event.data.type) {
+            case 'turnOnFullScreen':
+                this.isFullscreen = true;
+                break;
+
+            case 'turnOffFullScreen':
+                this.isFullscreen = false;
+                break;
+
+            default:
+                break;
+        }


Should we call this toggleFullScreen? and just do !... maybe?

fmontes · 2023-11-29T22:38:49Z

dotCMS/src/main/webapp/WEB-INF/portlet.xml

Did somebody checked this?

…tom-field scss.

...t-content/src/lib/components/dot-edit-content-field/dot-edit-content-field.component.spec.ts

zJaaal · 2023-12-01T19:53:40Z

...src/lib/fields/dot-edit-content-custom-field/dot-edit-content-custom-field.component.spec.ts

+                }
+            },
+            mockProvider(DotContentTypeService),
+            mockProvider(DotWorkflowActionsFireService)


We should talk about this in the next meeting.

fmontes · 2023-12-04T14:28:07Z

...nt/src/lib/fields/dot-edit-content-custom-field/dot-edit-content-custom-field.component.html

+    data-testId="iframe"
+    frameborder="0"></iframe>
+
+<dot-icon *ngIf="isFullscreen" (click)="isFullscreen = false" name="close"></dot-icon>


This needs a <button> to make sure sematically ie clickable. We can use the primeng button with an icon https://primeng.org/button#icons

fmontes · 2023-12-04T14:32:07Z

...src/lib/fields/dot-edit-content-custom-field/dot-edit-content-custom-field.component.spec.ts

+                }
+            },
+            mockProvider(DotContentTypeService),
+            mockProvider(DotWorkflowActionsFireService)


Why this test all the fields? we should be testing each field independently... I might be missing something.

fmontes · 2023-12-04T14:33:36Z

dotCMS/src/main/webapp/WEB-INF/portlet.xml

fmontes · 2023-12-05T01:59:53Z

...t-content/src/lib/components/dot-edit-content-field/dot-edit-content-field.component.spec.ts

+        providers: [
+            mockProvider(DotContentTypeService),
+            mockProvider(DotWorkflowActionsFireService)
+        ]


This is weird to me... I can't find any relationship between DotEditContentCustomFieldComponent and this services... there have to be something leaking somewhere or I am missing something.

For me what looks like that needs to be mocked is DotEditContentService which is the only service in DotEditContentCustomFieldComponent

fmontes · 2023-12-05T02:03:01Z

...t-content/src/lib/components/dot-edit-content-field/dot-edit-content-field.component.spec.ts

+    [FIELD_TYPES.JSON]: {
+        component: DotEditContentJsonFieldComponent,
+        declarations: [MockComponent(DotEditContentJsonFieldComponent)]
+    }


Why do you pass the component and then mock it?

cc: @rjvelazco you have more context of this case

fmontes · 2023-12-05T02:13:37Z

...src/lib/fields/dot-edit-content-custom-field/dot-edit-content-custom-field.component.spec.ts

+            mockProvider(DotContentTypeService),
+            mockProvider(DotWorkflowActionsFireService)


I remove this 2, run the tests and passed... and also to make sure it wasn't cache or anything I changed the currentContentType from test to test123 and failed.

dotcms-sonarqube · 2023-12-05T15:41:05Z

Quality Gate passed

The SonarQube Quality Gate passed, but some issues were introduced.

1 New issue
0 Security Hotspots
0.0% 0.0% Coverage on New Code
0.0% 0.0% Duplication on New Code

See analysis details on SonarQube

dotcms-sonarqube · 2023-12-05T15:55:51Z

Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
0.0% 0.0% Duplication on New Code

See analysis details on SonarQube

jdotcms added 4 commits November 15, 2023 23:38

#26696 adding a jsp to render a custom field

b54ba7b

#26696 adding a mapping to the jsp

925994c

#26696 restricting the access only for BE logged users

0d86323

#26696 just some doc

0f35b8a

fmontes reviewed Nov 20, 2023

View reviewed changes

KevinDavilaDotCMS linked an issue Nov 20, 2023 that may be closed by this pull request

Edit Content: Create a Component to Render Custom Field (Legacy) #26698

Closed

4 tasks

jdotcms and others added 12 commits November 20, 2023 14:42

#26696 fixing a sintax error

e02307c

Added custom field to edit-content fields. Now renders existing fields

1809f62

#26696 removing unnecessary code

d4bb4e2

Merge branch 'issue-26696-legacy-custom-field' of github.com:dotCMS/c…

3ec1fc2

…ore into issue-26696-legacy-custom-field

#26696 removing unnecessary code

e80e2f2

#26696 removing unnecessary code

885fc09

Working on Custom Field

4c1b844

Merge branch 'issue-26696-legacy-custom-field' of https://github.com/…

452ebe5

…dotCMS/core into issue-26696-legacy-custom-field

Merged with master

af30881

Added Tests on Custom Field

f12757a

Changed import reference

1846920

Added reference to contentType for edit page.

4b20743

jdotcms commented Nov 27, 2023

View reviewed changes

KevinDavilaDotCMS self-assigned this Nov 27, 2023

KevinDavilaDotCMS closed this Nov 27, 2023

KevinDavilaDotCMS reopened this Nov 27, 2023

KevinDavilaDotCMS marked this pull request as ready for review November 27, 2023 21:37

KevinDavilaDotCMS requested review from fmontes, oidacra, rjvelazco and zJaaal November 27, 2023 22:42

zJaaal requested changes Nov 28, 2023

View reviewed changes

Fixed suggestions on PR. Removed comments

feaed6e

Added TurnOnFullscreen logic. Fixed PR suggestions

ce72aea

KevinDavilaDotCMS requested a review from fmontes November 28, 2023 23:36

KevinDavilaDotCMS added 3 commits November 28, 2023 18:57

Resolved conflicts

2fd71f3

Added CustomField to Fields module

5f4806e

Changed jasmine reference for jest on DotEditContentField test

9d29387

rjvelazco approved these changes Nov 29, 2023

View reviewed changes

zJaaal requested changes Nov 29, 2023

View reviewed changes

fmontes requested changes Nov 29, 2023

View reviewed changes

Unify turnOn and turnOff fullscreen events in toggleFullscreen event

0840d03

oidacra approved these changes Nov 30, 2023

View reviewed changes

KevinDavilaDotCMS requested review from fmontes and zJaaal November 30, 2023 15:36

Added new mechanism on Field Types Test. Removed nested syntax on cus…

479f886

…tom-field scss.

zJaaal requested changes Dec 1, 2023

View reviewed changes

Added new logic to create DotEditContent Fields TestBeds

296c69d

fmontes requested changes Dec 4, 2023

View reviewed changes

Changed DotIcon to DotButton

0b964e5

KevinDavilaDotCMS requested review from fmontes and zJaaal December 4, 2023 19:57

fmontes linked an issue Dec 5, 2023 that may be closed by this pull request

Edit Content: Create a jsp file to render a specific custom field #26696

Closed

2 tasks

fmontes requested changes Dec 5, 2023

View reviewed changes

KevinDavilaDotCMS added 2 commits December 5, 2023 10:26

Changed TestBed on DotEditContentField and DotEditContentCustomField

bf1bf0b

Merged with master. Resolved conflicted to PR

fc46f9f

KevinDavilaDotCMS requested a review from fmontes December 5, 2023 15:50

zJaaal approved these changes Dec 5, 2023

View reviewed changes

fmontes approved these changes Dec 5, 2023

View reviewed changes

fmontes merged commit b6c1b74 into master Dec 5, 2023

fmontes deleted the issue-26696-legacy-custom-field branch December 5, 2023 18:32

		mockProvider(DotContentTypeService),
		mockProvider(DotWorkflowActionsFireService)


		%>

		<%--

#26696 adding a jsp to render a custom field #26716

#26696 adding a jsp to render a custom field #26716

Uh oh!

Conversation

jdotcms commented Nov 16, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dotcms-sonarqube bot commented Dec 5, 2023

Quality Gate passed

Uh oh!

dotcms-sonarqube bot commented Dec 5, 2023

Quality Gate passed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants