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.

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

#22857 refreshing block editor contentlet reference #22867

Merged
merged 27 commits into from
Nov 9, 2022

Conversation

jdotcms
Copy link
Contributor

@jdotcms jdotcms commented Aug 26, 2022

Initial draft - refreshing block editor contentlets

@github-actions
Copy link

github-actions bot commented Aug 26, 2022

Postman Tests Report

     63 files  1 273 suites   2h 56m 1s ⏱️
   553 tests    540 ✔️ 0 💤 13
2 103 runs  2 076 ✔️ 0 💤 27

For more details on these failures, see this check.

Results for commit 11571ef.

♻️ This comment has been updated with latest results.

@github-actions
Copy link

github-actions bot commented Aug 26, 2022

Unit Tests Report

1 343 tests   1 333 ✔️  3m 0s ⏱️
   132 suites       10 💤
   132 files           0

Results for commit 11571ef.

♻️ This comment has been updated with latest results.

@github-actions
Copy link

github-actions bot commented Aug 27, 2022

Integration Tests [postgres] Report

   399 files     399 suites   1h 11m 45s ⏱️
3 822 tests 3 799 ✔️ 23 💤 0
3 841 runs  3 818 ✔️ 23 💤 0

Results for commit 11571ef.

♻️ This comment has been updated with latest results.

@github-actions
Copy link

github-actions bot commented Aug 27, 2022

Integration Tests [mssql] Report

   398 files     398 suites   1h 26m 40s ⏱️
3 817 tests 3 786 ✔️ 23 💤 8
3 836 runs  3 805 ✔️ 23 💤 8

For more details on these failures, see this check.

Results for commit 11571ef.

♻️ This comment has been updated with latest results.

@jdotcms jdotcms changed the title #22857 initial draft and ideas #22857 refreshing block editor contentlet reference Aug 29, 2022
@jdotcms jdotcms marked this pull request as ready for review September 1, 2022 16:42
" }\n" +
" }\n" +
" ]\n" +
" }";

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe we can move this json into a json file

});
}

return Tuple.of(refreshed.booleanValue(), contentlet);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should the method throw a exception if contentlet is null?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe include a Precondition that content can't be null

return Tuple.of(refreshed.booleanValue(), contentlet);
}
@Override
public Tuple2<Boolean, Object> refreshStoryBlockValueReferences(final Object storyBlockValue) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CloseDB?

@@ -24,7 +24,7 @@
import java.util.Objects;
import java.util.stream.Collectors;

public class Metadata implements Serializable {
public class Metadata implements Serializable {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this can be removed

@fmontes fmontes closed this Oct 25, 2022
@fmontes fmontes reopened this Nov 8, 2022
@fmontes fmontes changed the base branch from master to release-22.11 November 8, 2022 14:32
@fmontes fmontes changed the base branch from release-22.11 to release-22.10.1 November 8, 2022 15:22
…7-refresh-content-editor

# Conflicts:
#	dotCMS/src/integration-test/java/com/dotcms/MainSuite.java
#	dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentFactoryImpl.java
#	dotCMS/src/main/webapp/html/portlet/ext/contentlet/field/edit_field.jsp
@fmontes fmontes merged commit c4ad2ff into release-22.10.1 Nov 9, 2022
@fmontes fmontes deleted the issue-22857-refresh-content-editor branch November 9, 2022 18:16
fmontes added a commit that referenced this pull request Nov 14, 2022
* #22857 refreshing block editor contentlet reference (#22867)

* #22857 initial draft and ideas

* #22857 final changes

* ˜#22857 adding the story block api

* #22857 the refresh happens now even on cached contentlets

* #22857 adding some minor changes

* #22857 adding unit test for update references

* #22857 unit test for getDependencies

* #22857 adding feedback

* #22857 adding more feedback

* #22857 rolling back some config

* #22857 adding some logging

* Rename var

* #22857 adding a fix for searching by query when need to refresh the block editor dependencies

* #22857 adding some flag to control when refresh or not

Co-authored-by: Freddy Montes <freddymontes@gmail.com>
Co-authored-by: Jose Castro <jose.castro@dotcms.com>

* CI: bumps version to 22.12.0-rc.0 [skip ci]

* Fix of versions after running code freeze against the release-22.10 branch

* Fixing submodules branch

* Updating enterprise branch

* Revert "Updating enterprise branch"

This reverts commit fab861d.

* Setting correct dorcmsReleaseVersion property

* Updating core-web versions

* Publish Release

* Update package.json

* Update gradle.properties

* Update .gitmodules

* CI: bumps version to 22.12.0-next.5 [skip ci]

Co-authored-by: Jonathan <jonathan.sanchez@dotcms.com>
Co-authored-by: Jose Castro <jose.castro@dotcms.com>
Co-authored-by: victoralfaro-dotcms <victor.alfaro@dotcms.com>
jcastro-dotcms added a commit that referenced this pull request Nov 14, 2022
* #22857 initial draft and ideas

* #22857 initial draft and ideas

* #22857 initial draft and ideas

* #22857 initial draft and ideas

* #22857 initial draft and ideas

* #22857 initial draft and ideas

* #22857 final changes

* ˜#22857 adding the story block api

* #22857 the refresh happens now even on cached contentlets

* #22857 adding some minor changes

* #22857 adding unit test for update references

* #22857 unit test for getDependencies

* #22857 unit test for getDependencies

* #22857 adding feedback

* #22857 adding more feedback

* #22857 adding more feedback

* #22857 rolling back some config

* #22857 rolling back some config

* #22857 adding some logging

* Rename var

* #22857 adding a fix for searching by query when need to refresh the block editor dependencies

* #22857 adding some flag to control when refresh or not

Co-authored-by: Freddy Montes <freddymontes@gmail.com>
Co-authored-by: Jose Castro <jose.castro@dotcms.com>
jdotcms added a commit that referenced this pull request Nov 28, 2022
fmontes pushed a commit that referenced this pull request Dec 1, 2022
* #22867 cherry pick done

* fixing unit test, a value missing in a msg format
fmontes added a commit that referenced this pull request Dec 5, 2022
* Fixing artifact plgin invocation. Need to use Gralde version 6.9.3 in order for this to work.

* #22864 Categories - $contentlet.categories can be slow

* #22864 adding cache for pullAllCategoryChildren

* #22864 adding cache for pullAllCategoryChildren

* #22864 adding cache for pullAllCategoryChildren

* #22864 adding cache for pullAllCategoryChildren

* #22864 much faster

* Fixing Postman Test: `VanityURL.postman_collection.json`

* Removing infinite loop call.

Co-authored-by: Jose Castro <jose.castro@dotcms.com>

* Trigger builds

* CI: bumps version to 22.11.0-rc.5 [skip ci]

* CI: bumps version to 22.11.0-rc.16 [skip ci]

* #23056 : REVERT - Reverting changes in `docker-compose` files. (#23425)

Reverting changes in `docker-compose` files to avoid overwriting important changes already present in `master` branch. Additionally, adding a fix provided by Todd which would add the appropriate `LANG` environment variable when applying the config defaults.

* #23296 Bug: WYSIWYG NPE if it finds an invalid data-elements

* #23401 Insure zip file integrity

* #22857 Keep the contentlets references up to date in the block editor

* #22867 cherry pick done

* fixing unit test, a value missing in a msg format

* CI: bumps version to 22.11.0-rc.6 [skip ci]

* Increase version

* CI: bumps version to 22.12.0-rc.2 [skip ci]

* CI: bumps version to 22.12.0-rc.2 [skip ci]

* Increase version rc (#23486)

* Increase version rc

* Increase version rc

* CI: bumps version to 22.12.0-rc.4 [skip ci]

* CI: bumps version to 22.13.0-next.3 [skip ci]

* CI: bumps version to 23.1.0-next.2 [skip ci]

* Fixing merge conflicts in docker-compose files.

* Bringing LANG variable back.

* CI: bumps version to 23.1.0-next.3 [skip ci]

Co-authored-by: Victor Alfaro <victor.alfaro@dotcms.com>
Co-authored-by: Will Ezell <will@dotcms.com>
Co-authored-by: Jose Castro <jose.castro@dotcms.com>
Co-authored-by: Jonathan <jonathan.sanchez@dotcms.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants