Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(hosts) : retrieve live version if a host has live and working versions #30358

Merged
merged 32 commits into from
Nov 12, 2024
Merged

fix(hosts) : retrieve live version if a host has live and working versions #30358

merged 32 commits into from
Nov 12, 2024

Conversation

dsolistorres
Copy link
Contributor

@dsolistorres dsolistorres commented Oct 15, 2024 •
edited by github-actions bot
Loading

#Closes #28362

Proposed Changes

  • For the sites portlet, if a site has live and working versions, the live version is shown.
  • When resolving a site by name, id or alias, the live version of the site is retrieved for front-end users.

Checklist

  • Tests

This PR fixes: #28362

@dsolistorres dsolistorres self-assigned this Oct 15, 2024
@dsolistorres dsolistorres force-pushed the issue-28362-save-site-shouldnt-deactivate-site branch from 3922462 to 2fd2c97 Compare October 15, 2024 23:38
@github-actions github-actions bot mentioned this pull request Oct 15, 2024
Closed
@semgrep-code-dotcms-test
Copy link

Semgrep found 11 CUSTOM_INJECTION-2 findings:

The method identified is susceptible to injection. The input should be validated and properly
escaped.

Ignore this finding from CUSTOM_INJECTION-2.

@dsolistorres dsolistorres force-pushed the issue-28362-save-site-shouldnt-deactivate-site branch 4 times, most recently from 1b5819f to 4f82822 Compare October 23, 2024 00:20
@erickgonzalez erickgonzalez removed the request for review from jgambarios October 28, 2024 14:36
@dsolistorres dsolistorres force-pushed the issue-28362-save-site-shouldnt-deactivate-site branch from 070a3dc to e2e3e34 Compare October 29, 2024 16:42
KevinDavilaDotCMS and others added 6 commits November 4, 2024 18:25
@KevinDavilaDotCMS @zJaaal @dsolistorres
feat(sdk-angular): Fixed texts on README (#30481)
ca055ec 
This pull request includes minor updates to the
`core-web/libs/sdk/angular/README.md` file to correct grammatical errors
and improve clarity.

Documentation improvements:

* Corrected a typo in the description of Angular components for dotCMS
page rendering and editor integration.
(`core-web/libs/sdk/angular/README.md`)
* Fixed a grammatical error in the reference to the dotCMS Client
documentation link. (`core-web/libs/sdk/angular/README.md`)

Co-authored-by: Jalinson Diaz <[email protected]>
@jdotcms @dsolistorres
#30477 adding references and count (#30478)
8f46bc7 
Adding the references and references count endpoint to the content
resource v1
@dsolistorres
fix(vanity-urls): fixed url parse regex to include slash character in…
e7d2ffd 
… fragments (#30450)

Closes #30130

### Proposed Changes
* change 1
This pull request changes the regex pattern for URL parsing for vanity
URLS to handle fragments correctly when the fragment includes the slash
character (/).

### Checklist
- [x] Tests
@wezell @erickgonzalez @dsolistorres
Exclude old assets in starter generation (#30458)
4d68cc8 
We do not need old assets included in the starter.

Co-authored-by: erickgonzalez <[email protected]>
@wezell @dsolistorres
Update README.md (#30431)
b7c40c2 
This pull request includes a small change to the `README.md` file. The
change updates the URL of the dotCMS logo image to a new location.

*
[`README.md`](diffhunk://#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5L1-R1):
Updated the URL of the dotCMS logo image to
`https://www2.dotcms.com/dA/99fe3769-d649/256w/dotcms.png` from
`https://www.dotcms.com/dA/99fe3769-d649/256w/dotcms.png`.
@hmoreras @dsolistorres
implementation (Content Analytics Search): #30427 Apply updated Design (
031593a 
#30492)

### Proposed Changes
* Apply new design updates, using the `p-splitter`
* Json format validation before be able to make the request




### Additional Info
** any additional useful context or info **

### Screenshots

<img width="1323" alt="image"
src="https://github.com/user-attachments/assets/daaed8ce-7285-4aa5-88ad-894a2a520df3">

<img width="1301" alt="image"
src="https://github.com/user-attachments/assets/c62ce545-4ddb-417e-9643-e4e1434db905">

<img width="1359" alt="image"
src="https://github.com/user-attachments/assets/edb41833-aebf-471f-aba9-cea22c9c7d0e">
zJaaal and others added 11 commits November 4, 2024 18:25
@zJaaal @dsolistorres
feat(uve): Support editContentlet custom action (#30456)
41d06e7 
This pull request includes several updates to the
`DotEmaDialogComponent` and its related files, focusing on renaming the
`payload` property to `actionPayload` and adding a new `clientAction`
property. These changes aim to improve code clarity and functionality.

### Updates to `DotEmaDialogComponent`:

* Renamed the `payload` property to `actionPayload` across various
methods (`addContentlet`, `addForm`, `addWidget`, `editContentlet`,
`createContentlet`, `createContentletFromPalette`).
[[1]](diffhunk://#diff-90ca5d45502430e9bc18da8661aa443a9530d1dfe57c907854decf65176194b0L96-R112)
[[2]](diffhunk://#diff-90ca5d45502430e9bc18da8661aa443a9530d1dfe57c907854decf65176194b0L121-R141)
[[3]](diffhunk://#diff-90ca5d45502430e9bc18da8661aa443a9530d1dfe57c907854decf65176194b0L188-R190)
[[4]](diffhunk://#diff-90ca5d45502430e9bc18da8661aa443a9530d1dfe57c907854decf65176194b0L202-R209)
* Added the `clientAction` property to the component's state and related
method calls.
[[1]](diffhunk://#diff-90ca5d45502430e9bc18da8661aa443a9530d1dfe57c907854decf65176194b0L337-R340)
[[2]](diffhunk://#diff-90ca5d45502430e9bc18da8661aa443a9530d1dfe57c907854decf65176194b0L409-R414)

### Updates to `dot-ema-dialog.component.spec.ts`:

* Updated test cases to reflect the renaming of `payload` to
`actionPayload` and the addition of `clientAction`.
[[1]](diffhunk://#diff-74bc5b082cc3e4a13573517796b104be728b49d58d3cede278110b75cd7944f4R18)
[[2]](diffhunk://#diff-74bc5b082cc3e4a13573517796b104be728b49d58d3cede278110b75cd7944f4L181-R187)
[[3]](diffhunk://#diff-74bc5b082cc3e4a13573517796b104be728b49d58d3cede278110b75cd7944f4L203-R210)
[[4]](diffhunk://#diff-74bc5b082cc3e4a13573517796b104be728b49d58d3cede278110b75cd7944f4L334-R337)
[[5]](diffhunk://#diff-74bc5b082cc3e4a13573517796b104be728b49d58d3cede278110b75cd7944f4L355-R358)
[[6]](diffhunk://#diff-74bc5b082cc3e4a13573517796b104be728b49d58d3cede278110b75cd7944f4L382-R385)
[[7]](diffhunk://#diff-74bc5b082cc3e4a13573517796b104be728b49d58d3cede278110b75cd7944f4L421-R427)
[[8]](diffhunk://#diff-74bc5b082cc3e4a13573517796b104be728b49d58d3cede278110b75cd7944f4L440-R445)

### Updates to `dot-ema-dialog.store.spec.ts`:

* Modified test cases to use `actionPayload` instead of `payload` and
added checks for the `clientAction` property.
[[1]](diffhunk://#diff-30064cf2e49d8544c8ed19f040b93774175d47edff3b01ce2b7782c3bbcd506eR5)
[[2]](diffhunk://#diff-30064cf2e49d8544c8ed19f040b93774175d47edff3b01ce2b7782c3bbcd506eL47-R52)
[[3]](diffhunk://#diff-30064cf2e49d8544c8ed19f040b93774175d47edff3b01ce2b7782c3bbcd506eL60-R62)
[[4]](diffhunk://#diff-30064cf2e49d8544c8ed19f040b93774175d47edff3b01ce2b7782c3bbcd506eL69-R71)
[[5]](diffhunk://#diff-30064cf2e49d8544c8ed19f040b93774175d47edff3b01ce2b7782c3bbcd506eL85-R92)
[[6]](diffhunk://#diff-30064cf2e49d8544c8ed19f040b93774175d47edff3b01ce2b7782c3bbcd506eL117-R157)
[[7]](diffhunk://#diff-30064cf2e49d8544c8ed19f040b93774175d47edff3b01ce2b7782c3bbcd506eL148-R189)
[[8]](diffhunk://#diff-30064cf2e49d8544c8ed19f040b93774175d47edff3b01ce2b7782c3bbcd506eL162-R200)
[[9]](diffhunk://#diff-30064cf2e49d8544c8ed19f040b93774175d47edff3b01ce2b7782c3bbcd506eL171-R214)
[[10]](diffhunk://#diff-30064cf2e49d8544c8ed19f040b93774175d47edff3b01ce2b7782c3bbcd506eL190-R234)

### Additional notes:

* Added a comment in `dot-contentlet.model.ts` to highlight the
potential issues with using a flexible type for storing any kind of data
and suggested a possible refactor.
[[1]](diffhunk://#diff-6ee53bb90f1585590095ab955fc6f356346bf4ce0b4f4919e37a68489d92d48bR1-R2)
[[2]](diffhunk://#diff-6ee53bb90f1585590095ab955fc6f356346bf4ce0b4f4919e37a68489d92d48bR41)
@dcolina @dsolistorres
fix(deployment): Publish Starter deployment failure due to incorrect …
718f150 
…credentials (#30482) (#30509)

### Proposed Changes
* Fixing all the environment references to 'starter'.
* A new option to include or not old assets.

### Additional Info
Related to #30482 (Publish Starter deployment failure due to incorrect
credentials).
@jcastro-dotcms @dsolistorres
chore(Telemetry) #30079 : Move telemetry plugin into core - Part 1 (#…
eea18cc 
…30520)

### Proposed Changes
* Migrates all the code from the `Telemetry` plug-in into our `core`
project.
* This is the first part of the process, so it just takes the code "as
is" from the plugin, and places it inside the `core` project. It only
includes a few adjustments on some Javadoc, code formatting, and the
addition of the `toString()` method in a few classes.
* These changes can safely co-exist with the current `Telemetry` plugin.
* In order to have a more effective Code Review process, the goal is to
have two pull requests:
  * The first one with the existing code from the plugin -- this one.
* The second one with the code changes in `core` that effectively add
the REST Endpoint, Web Interceptor, and Quartz Job which are currently
being added via the `Activator` class.
@jdotcms @dsolistorres
#30519 adding history and comments (#30527)
8a45e5f 
Adding the workflow task history and comments for edit contenlet
@jgambarios @dsolistorres
Fix (CLI): Adding back builder to properly handle content type base t…
965c996 
…ypes. (#30537)

This pull request introduces a custom builder for
`SaveContentTypeRequest` to handle the `typeInf` attribute and updates
relevant tests and methods to use this new builder. The most important
changes include adding the custom builder class, updating test cases,
and modifying methods to utilize the new builder.

### Enhancements to `SaveContentTypeRequest`:

* Added a custom `Builder` class to `AbstractSaveContentTypeRequest` to
handle the `typeInf` attribute.
(`tools/dotcms-cli/api-data-model/src/main/java/com/dotcms/model/contenttype/AbstractSaveContentTypeRequest.java`)

### Updates to Test Cases:

* Updated imports and added new test methods in `ContentTypeAPIIT` to
test the new builder functionality.
(`tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/ContentTypeAPIIT.java`)
[[1]](diffhunk://#diff-f2101fd155aefd1a94a63ecac9b5675e464720447b556c8b05c60c1d52648de6R24-R30)
[[2]](diffhunk://#diff-f2101fd155aefd1a94a63ecac9b5675e464720447b556c8b05c60c1d52648de6R148-R191)
* Modified existing test methods to use the new
`AbstractSaveContentTypeRequest.builder().of(contentType).build()`
pattern.
(`tools/dotcms-cli/api-data-model/src/test/java/com/dotcms/api/ContentTypeAPIIT.java`)
[[1]](diffhunk://#diff-f2101fd155aefd1a94a63ecac9b5675e464720447b556c8b05c60c1d52648de6L237-R283)
[[2]](diffhunk://#diff-f2101fd155aefd1a94a63ecac9b5675e464720447b556c8b05c60c1d52648de6L361-R407)
[[3]](diffhunk://#diff-f2101fd155aefd1a94a63ecac9b5675e464720447b556c8b05c60c1d52648de6L626-R675)
[[4]](diffhunk://#diff-f2101fd155aefd1a94a63ecac9b5675e464720447b556c8b05c60c1d52648de6L952-R1001)

### Codebase Simplification:

* Updated `ContentTypePushHandler` to use the new builder for creating
and editing content types.
(`tools/dotcms-cli/cli/src/main/java/com/dotcms/api/client/push/contenttype/ContentTypePushHandler.java`)
[[1]](diffhunk://#diff-ed28cb0bb540c2c7a442107ec9cf370696bc98f1b411311b3c2817b0c78d0968R8)
[[2]](diffhunk://#diff-ed28cb0bb540c2c7a442107ec9cf370696bc98f1b411311b3c2817b0c78d0968L81-R83)
@jdotcms @dsolistorres
#30472 adding postman to check shortyId (#30514)
2cb5173 
Adding postman to check if shortyId is there
@dcolina @dsolistorres
feat: Create deployartifactjavadoc composite action base (#28550) (#3…
b60dd0f 
…0535)

### Proposed Changes
* This Pull Request introduces a new composite action named
deploy-javadoc, based on the Generate/Push Javadoc step from
maven-release-process.yml. The main objective of this action is to
modularize the behavior for generating and deploying Javadocs, providing
a more reusable and consistent solution within the CI/CD workflow.

### Key changes:
- Integration with the maven-job action to reuse artifacts from previous
stages.
- Use of Maven cache to optimize performance.
- Availability of Java classes generated during the compilation process,
essential for creating immutable objects.

### Additional Info
This PR resolves #28550 (Create deploy-javadoc composite action base).
@freddyDOTCMS @wezell @dsolistorres
Issue 30468 remove calls to elastic read only command and disable es …
d3b8f06 
…read only monitor job (#30471)

### Proposed Changes
* Remove all the Used of the ES Read Only Monitor, we still are not
removing all the logic

---------

Co-authored-by: Will Ezell <[email protected]>
@rjvelazco @zJaaal @dsolistorres
SDK: Unable to Edit Unpublished Page in Angular Example (#30542)
74e0c68 
This pull request includes several updates to the `DotCMSPagesComponent`
in the Angular example application. The changes primarily focus on
integrating editor-related functionality and improving code formatting.

### Editor Integration:

* Added `DOTCMS_CLIENT_TOKEN` import and injected it into the
`DotCMSPagesComponent` to enable editor-related functionalities.
[[1]](diffhunk://#diff-db19dde961c6af3dbddd86db7544e4ea4ff42baae9095cee4e3017c1d4dcb395L20-R26)
[[2]](diffhunk://#diff-db19dde961c6af3dbddd86db7544e4ea4ff42baae9095cee4e3017c1d4dcb395R66-R85)
* Implemented a new method `#listenToEditorChanges` to handle editor
changes and update the component state accordingly.

### Code Formatting:

* Reformatted the import statements for better readability and
maintainability.
* Adjusted the method signature formatting for `#setPageContent` to be
consistent with the rest of the codebase.

### Video


https://github.com/user-attachments/assets/7ee487ce-412f-4504-8ff1-f92dac86beee

---------

Co-authored-by: Jalinson Diaz <[email protected]>
@zJaaal @rjvelazco @dsolistorres
fix(examples): Update naming (#30540)
0ee4b8b 
This pull request includes several changes to improve code consistency,
readability, and correctness across different files. The most important
changes involve import statement adjustments, formatting improvements,
and updating action names.

### Import Statement Adjustments:
*
[`examples/angular/src/app/pages/pages.component.ts`](diffhunk://#diff-db19dde961c6af3dbddd86db7544e4ea4ff42baae9095cee4e3017c1d4dcb395L7-R7):
Combined multiple imports from `@dotcms/angular` into a single line and
updated `CUSTOMER_ACTIONS` to `CLIENT_ACTIONS` from `@dotcms/client`.
[[1]](diffhunk://#diff-db19dde961c6af3dbddd86db7544e4ea4ff42baae9095cee4e3017c1d4dcb395L7-R7)
[[2]](diffhunk://#diff-db19dde961c6af3dbddd86db7544e4ea4ff42baae9095cee4e3017c1d4dcb395L20-R16)
*
[`examples/astro/src/react/hooks/usePageAsset.ts`](diffhunk://#diff-15921ced32cc4a42067d2c1f36400763b0d8c40193419af67ed8c8d77751c9eaL3-R3):
Updated `CUSTOMER_ACTIONS` to `CLIENT_ACTIONS` from `@dotcms/client`.
*
[`examples/nextjs/src/hooks/usePageAsset.js`](diffhunk://#diff-8fa464b336a283f1eec51ffef29c76c8ae0f2d19f32d8829851694636472b4aaL1-R4):
Updated `CUSTOMER_ACTIONS` to `CLIENT_ACTIONS` from `@dotcms/client` and
adjusted import formatting.
[[1]](diffhunk://#diff-8fa464b336a283f1eec51ffef29c76c8ae0f2d19f32d8829851694636472b4aaL1-R4)
[[2]](diffhunk://#diff-8fa464b336a283f1eec51ffef29c76c8ae0f2d19f32d8829851694636472b4aaL18-R14)
[[3]](diffhunk://#diff-8fa464b336a283f1eec51ffef29c76c8ae0f2d19f32d8829851694636472b4aaL28-R30)

### Formatting Improvements:
*
[`examples/angular/src/app/pages/pages.component.ts`](diffhunk://#diff-db19dde961c6af3dbddd86db7544e4ea4ff42baae9095cee4e3017c1d4dcb395L44-R43):
Improved formatting for better readability by aligning code and removing
unnecessary spaces.
[[1]](diffhunk://#diff-db19dde961c6af3dbddd86db7544e4ea4ff42baae9095cee4e3017c1d4dcb395L44-R43)
[[2]](diffhunk://#diff-db19dde961c6af3dbddd86db7544e4ea4ff42baae9095cee4e3017c1d4dcb395L58-R54)
[[3]](diffhunk://#diff-db19dde961c6af3dbddd86db7544e4ea4ff42baae9095cee4e3017c1d4dcb395L68-R69)
[[4]](diffhunk://#diff-db19dde961c6af3dbddd86db7544e4ea4ff42baae9095cee4e3017c1d4dcb395R85-R120)
*
[`examples/angular/src/app/pages/services/page.service.ts`](diffhunk://#diff-c28435c294bcf4c2159724ac9f83e80369fc594d661684535e1b1a770320b9c8L22-R22):
Improved formatting and alignment for better readability.
[[1]](diffhunk://#diff-c28435c294bcf4c2159724ac9f83e80369fc594d661684535e1b1a770320b9c8L22-R22)
[[2]](diffhunk://#diff-c28435c294bcf4c2159724ac9f83e80369fc594d661684535e1b1a770320b9c8L36-R43)
[[3]](diffhunk://#diff-c28435c294bcf4c2159724ac9f83e80369fc594d661684535e1b1a770320b9c8L56-R59)
[[4]](diffhunk://#diff-c28435c294bcf4c2159724ac9f83e80369fc594d661684535e1b1a770320b9c8L74-R76)
[[5]](diffhunk://#diff-c28435c294bcf4c2159724ac9f83e80369fc594d661684535e1b1a770320b9c8L95-R88)

### Action Name Updates:
* Updated `CUSTOMER_ACTIONS.CLIENT_READY` to
`CLIENT_ACTIONS.CLIENT_READY` in various files to ensure consistency
with the action naming convention.
[[1]](diffhunk://#diff-db19dde961c6af3dbddd86db7544e4ea4ff42baae9095cee4e3017c1d4dcb395L20-R16)
[[2]](diffhunk://#diff-db19dde961c6af3dbddd86db7544e4ea4ff42baae9095cee4e3017c1d4dcb395R85-R120)
[[3]](diffhunk://#diff-15921ced32cc4a42067d2c1f36400763b0d8c40193419af67ed8c8d77751c9eaL27-R27)
[[4]](diffhunk://#diff-8fa464b336a283f1eec51ffef29c76c8ae0f2d19f32d8829851694636472b4aaL28-R30)

---------

Co-authored-by: Rafael Velazco <[email protected]>
@dsolistorres
#28362 : changed HostSearchOptions class to Search Type enum for clarity
92d2804
@dsolistorres dsolistorres requested a review from a team as a code owner November 5, 2024 00:25
@erickgonzalez erickgonzalez removed the request for review from a team November 6, 2024 15:17
@erickgonzalez erickgonzalez added this pull request to the merge queue Nov 7, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 7, 2024
@erickgonzalez erickgonzalez added this pull request to the merge queue Nov 7, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 7, 2024
@erickgonzalez erickgonzalez added this pull request to the merge queue Nov 11, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 11, 2024
@dotcms-sonarqube dotCMS-sonarqube
Copy link

Quality Gate passed Quality Gate passed

Issues
24 New issues
11 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

@erickgonzalez erickgonzalez added this pull request to the merge queue Nov 12, 2024
Merged via the queue into main with commit 4c5d2c5 Nov 12, 2024
37 checks passed
@erickgonzalez erickgonzalez deleted the issue-28362-save-site-shouldnt-deactivate-site branch November 12, 2024 17:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wezell wezell wezell left review comments

@gortiz-dotcms gortiz-dotcms gortiz-dotcms approved these changes

@jdotcms jdotcms jdotcms approved these changes

@jcastro-dotcms jcastro-dotcms jcastro-dotcms approved these changes

@erickgonzalez erickgonzalez erickgonzalez approved these changes

Assignees

@dsolistorres dsolistorres

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Saving a site instead of hitting Save/Activate deactivates the site entirely