Skip to content

Commit

Permalink
Issue 22114 22.06 integration (#22310)
Browse files Browse the repository at this point in the history
Integrating core-web to core.

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

* #19837 Upgrade NX, Angular y PrimeNG (#1842)

* Clean

* Run nx migrate to 12

* Update Storybook to 6.2.X
Because the NX migration was need it in order to use Webpack 5

* Runned: nx migrate --run-migrations

* Fix circular dependecies in dotcms-models

* Fix the build for dotcms-webcomponents

Had to edit the angular.json to add the outputPath in the dotcms-webcomponents due the following error:

> nx run dotcms-webcomponents:build --verbose --no-cache
The "path" argument must be of type string. Received undefined
TypeError [ERR_INVALID_ARG_TYPE]: The "path" argument must be of type string. Received undefined
    at validateString (internal/validators.js:124:11)
    at join (path.js:1039:7)
    at /Users/fmontes/Developer/core-web/node_modules/@nxext/stencil/src/executors/stencil-runtime/stencil-config.js:26:77
    at Generator.next (<anonymous>)
    at /Users/fmontes/Developer/core-web/node_modules/tslib/tslib.js:117:75
    at new Promise (<anonymous>)
    at __awaiter (/Users/fmontes/Developer/core-web/node_modules/tslib/tslib.js:113:16)
    at initializeStencilConfig (/Users/fmontes/Developer/core-web/node_modules/@nxext/stencil/src/executors/stencil-runtime/stencil-config.js:15:34)
    at /Users/fmontes/Developer/core-web/node_modules/@nxext/stencil/src/executors/build/executor.js:36:96
    at Generator.next (<anonymous>)

* Fix dotcms-ui build

* Fix storybook for dotcms-block-editor

* Fix dotcms-ui storybook
Knobs are deprecated: storybookjs/storybook#15060

* Fix SASS warning to use math.div

* Remove migrations.json file because it gets generated by nx

* Migrate to latest and run-migrations

* Remove dot-site-browser

This module was breaking the angular build for "DOMError" not found.

Since we are not using this module at all instead of fixing this error I just remove the module, if we need something we can get it from the git story

* Unify package.json version caret

* Make Storybook run!

First I had this error and I fixed by "cleaning" nx cache:

rm -rf ./node_modules/.cache/nx

(node:41972) UnhandledPromiseRejectionWarning: TypeError: Cannot read property 'data' of undefined
    at ProjectHasher.<anonymous> (/Users/fmontes/Developer/core-web/node_modules/@nrwl/workspace/src/core/hasher/hasher.js:246:55)
    at Generator.next (<anonymous>)
    at /Users/fmontes/Developer/core-web/node_modules/tslib/tslib.js:117:75
    at new Promise (<anonymous>)
    at __awaiter (/Users/fmontes/Developer/core-web/node_modules/tslib/tslib.js:113:16)
    at /Users/fmontes/Developer/core-web/node_modules/@nrwl/workspace/src/core/hasher/hasher.js:241:93
    at new Promise (<anonymous>)
    at ProjectHasher.<anonymous> (/Users/fmontes/Developer/core-web/node_modules/@nrwl/workspace/src/core/hasher/hasher.js:241:50)
    at Generator.next (<anonymous>)
    at /Users/fmontes/Developer/core-web/node_modules/tslib/tslib.js:117:75
(Use `node --trace-warnings ...` to show where the warning was created)
(node:41972) UnhandledPromiseRejectionWarning: Unhandled promise rejection. This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). To terminate the node process on unhandled promise rejection, use the CLI flag `--unhandled-rejections=strict` (see https://nodejs.org/api/cli.html#cli_unhandled_rejections_mode). (rejection id: 1)
(node:41972) [DEP0018] DeprecationWarning: Unhandled promise rejections are deprecated. In the future, promise rejections that are not handled will terminate the Node.js process with a non-zero exit code.

Then run into this issue. The problem here is that we have multiple webpack versions (some package use v4) so we added to the package.json

    "resolutions": {
        "weboack": "^5.65.0"
    }

(node:42076) UnhandledPromiseRejectionWarning: TypeError: The 'compilation' argument must be an instance of Compilation
    at Function.getCompilationHooks (/Users/fmontes/Developer/core-web/node_modules/@angular-devkit/build-angular/node_modules/webpack/lib/javascript/JavascriptModulesPlugin.js:141:10)
    at SourceMapDevToolModuleOptionsPlugin.apply (/Users/fmontes/Developer/core-web/node_modules/@angular-devkit/build-angular/node_modules/webpack/lib/SourceMapDevToolModuleOptionsPlugin.js:50:27)
    at /Users/fmontes/Developer/core-web/node_modules/@angular-devkit/build-angular/node_modules/webpack/lib/SourceMapDevToolPlugin.js:163:53
    at Hook.eval [as call] (eval at create (/Users/fmontes/Developer/core-web/node_modules/@storybook/builder-webpack5/node_modules/tapable/lib/HookCodeFactory.js:19:10), <anonymous>:297:1)
    at Hook.CALL_DELEGATE [as _call] (/Users/fmontes/Developer/core-web/node_modules/@storybook/builder-webpack5/node_modules/tapable/lib/Hook.js:14:14)
    at Compiler.newCompilation (/Users/fmontes/Developer/core-web/node_modules/@storybook/builder-webpack5/node_modules/webpack/lib/Compiler.js:1055:26)
    at /Users/fmontes/Developer/core-web/node_modules/@storybook/builder-webpack5/node_modules/webpack/lib/Compiler.js:1099:29
    at _next0 (eval at create (/Users/fmontes/Developer/core-web/node_modules/@storybook/builder-webpack5/node_modules/tapable/lib/HookCodeFactory.js:33:10), <anonymous>:23:1)
    at eval (eval at create (/Users/fmontes/Developer/core-web/node_modules/@storybook/builder-webpack5/node_modules/tapable/lib/HookCodeFactory.js:33:10), <anonymous>:35:1)
    at processTicksAndRejections (internal/process/task_queues.js:93:5)
(Use `node --trace-warnings ...` to show where the warning was created)
(node:42076) UnhandledPromiseRejectionWarning: Unhandled promise rejection. This error originated either by throwing inside of an async function without a catch block, or by rejecting a promise which was not handled with .catch(). To terminate the node process on unhandled promise rejection, use the CLI flag `--unhandled-rejections=strict` (see https://nodejs.org/api/cli.html#cli_unhandled_rejections_mode). (rejection id: 1)
(node:42076) [DEP0018] DeprecationWarning: Unhandled promise rejections are deprecated. In the future, promise rejections that are not handled will terminate the Node.js process with a non-zero exit code.

* Fix the stories path to show all in dotcms-ui storybook

* Run dotcms-webcomponents storybook

At this points run but since knobs were deprecated we need to replace all the stories with controls

https://storybook.js.org/docs/react/essentials/controls

Also we might want to take this apporach:

https://mokkapps.de/blog/run-build-and-deploy-stencil-and-storybook-from-one-repository/

* Make typedoc build dotcms and dotcms-models docs again

* Update workspace to version 2

We were in version 1 of the worspace that uses inline configuration in the angular.json, that's no longer recommended so to do the migration:

1. Update angular.json version to 2
2. Run nx format
3. Run nx g convert-to-nx-project --all

And that did all the changes in this commit to do that migration:

https://nx.dev/configuration/projectjson#workspace-json

* Add vscode settings

* Update .prettierignore

* Update primeng, primeflex and primeicons

* Fix run tests locally

* Update nodejs in tests github action and add engiges to the package.json

* Fix tests round 1

* Fix tests round 2

* Fix tests round 3

* Remove fit

* #19837 Update node version in cicd (#1853)

* #19837 Trigger build (#1854)

* CI: bumps version to 22.3.0-next.7 [skip ci]

* #21122 Replace What's changed with the htmldiff js library (#1855)

* replace backend library

* cleanup

* tests

* cleanup

* error handler

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

* #19837 Fix storybook build (#1859)

* Make dot-card-contentlet story run with controls

* Clean up console.logs

* Add args and docs

* FIx dot-card-view

* Update dot-binary-file.stories

* Update dot-checkbox.stories

* Update dot-date.stories

* Update dot-date-range.stories

* Update dot-error-message and clean up

* Update dot-form

* Update dot-input-calendar

* Update dot-key-value

* Update dot-multi-select

* Update dot-radio

* Update dot-select

* Update dot-tags

* Update dot-textarea

* Update dot-textfield

* Update dot-time

* Update dot-asset-drop-zone.stories

* Update dot-context-menu

* dot-data-view-button.stories

* dot-select-button stories

* dot-badge stories

* dot-card stories

* dot-contentlet-icon stories

* dot-contentlet-lock-icon stories

* dot-contentlet-thumbnail stories

* dot-material-icon-picker stories

* dot-state-icon stories

* Fix documentation of web-components

* Update build story book

* CI: bumps version to 22.3.0-next.4 [skip ci]

* #19837 Not run two angular storybooks at the same time (#1860)

* Not run two angular storybooks at the same time

* Update build command

* Fix the docs build, compose storybook

* Add refs to storybook

* Remove refs because is not supportted by github pages

* Add absolute links

* Sort stories

* CI: bumps version to 22.3.0-next.8 [skip ci]

* #21600 Remove "Unsaved changes" from auto saving

* #21240  Show global message on inline editing (#1861)

* dotCMS/core #21436 Prevent the redirect of the page when we are in edit mode

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

* Release 22.02 to master (#1864)

* update release version for dotcms-ui & dotcms-webcomponents

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

* #21504 Template designer: container selector breaks while there are "Unsave Changes"

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

* #21436 Enable the bring back button (#1846)

* CI: bumps version to 22.2.0-rc.3 [skip ci]

* #21540 Add a form from the Contentlet palette in edit page is not working

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

* #21122 Replace What's changed with the htmldiff js library (#1855)

* replace backend library

* cleanup

* tests

* cleanup

* error handler

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

* #21600 Remove "Unsaved changes" from auto saving

* #21240  Show global message on inline editing (#1861)

* dotCMS/core #21436 Prevent the redirect of the page when we are in edit mode

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

* Fix tests

* CI: bumps version to 22.3.0-next.9 [skip ci]

Co-authored-by: victoralfaro-dotcms <[email protected]>
Co-authored-by: Rafael Velazco <[email protected]>
Co-authored-by: Humberto Morera <[email protected]>

* Add State Management to palette #21507 (#1856)

* progress

* #21507 add state management to Dot Palette

* feedback

* more feedback

* more feedback

* CI: bumps version to 22.3.0-next.10 [skip ci]

* #21599 Push Publishing Workflow Dialog is missing timezoneId

* CI: bumps version to 22.2.0-rc.7 [skip ci]

* #19837 Fix lint - Step 1 (#1866)

* #19837 Fix lint

* Fix circular dependecies in dotcms-js

* Update eslint

* Disable 'any' errors in spec file

* Allow _ args

* Fix round 1

* any fix

* Fix empty contructor

* Find and replace fix round 2

* Make tests run

* Skip empty function in .spec.ts

* Fix tests

* Fix tests 2

* Fix DotContainerSelectorLayoutComponent tests

* Fix DotTemplatePropsComponent tests

* Fix DotTemplateAdvancedComponent test

* Fix DotEditContentComponent test

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

* #19837 Fix PrimeNG class name change (#1869)

* CI: bumps version to 22.3.0-next.11 [skip ci]

* #21552 Avoid trigger the original form submit event (#1862)

* #21552 Add forms from content palette error  (#1868)

* initial progress

* cleanup

* test updates

* test updates

* feedback

* rename functions

* CI: bumps version to 22.2.0-rc.8 [skip ci]

* #21656 Once a fileAsset is saved. the file itself can not be replaced using Save (#1872)

* CI: bumps version to 22.2.0-rc.3 [skip ci]

* #21558 Edit Template Properties Modal makes changes get lost (#1865)

* fix: Must supply a value for form control with name: 'title'

* remove dot-template store service from Dot Template Advanced Component

* fix: Edit Template Properties Modal makes changes get lost on advance template

* fix: Edit Template Properties Modal makes changes get lost on design template

* update template design

* clean up

* feedback

* clean up

* fix dot-template store tests

* fix tests on dot-template-create-edit

* fix dot-template-builder tests

* fix dot-template tests

* fix DotEditLayoutComponent

* clean up

* rename saveDraft to updateTemplate

* add docs

* feedback

* feedback

* clean up

* feedback

* clean up

* fix doc

* CI: bumps version to 22.2.0-rc.9 [skip ci]

* #21660 Add backdrop-filter to our popup overlay background (#1870)

* CI: bumps version to 22.3.0-next.12 [skip ci]

* Update package

* Update package-lock

* Clean up

* Fix conflicts

* CI: bumps version to 22.3.0-next.13 [skip ci]

* #21659 fix Invalidate localstorage messages keys when dotc… (#1875)

* #21659 fix Invalidate localstorage messages keys when dotcms updates

* feedback

* clean up

* CI: bumps version to 22.3.0-next.13 [skip ci]

* fix unit tests in master (#1876)

* fix unit tests in master

* 2nd try

* CI: bumps version to 22.3.0-next.14 [skip ci]

* Release 22.02 to master (#1874)

* update release version for dotcms-ui & dotcms-webcomponents

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

* #21504 Template designer: container selector breaks while there are "Unsave Changes"

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

* #21436 Enable the bring back button (#1846)

* CI: bumps version to 22.2.0-rc.3 [skip ci]

* #21540 Add a form from the Contentlet palette in edit page is not working

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

* #21122 Replace What's changed with the htmldiff js library (#1855)

* replace backend library

* cleanup

* tests

* cleanup

* error handler

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

* #21600 Remove "Unsaved changes" from auto saving

* #21240  Show global message on inline editing (#1861)

* dotCMS/core #21436 Prevent the redirect of the page when we are in edit mode

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

* #21599 Push Publishing Workflow Dialog is missing timezoneId

* CI: bumps version to 22.2.0-rc.7 [skip ci]

* #21552 Avoid trigger the original form submit event (#1862)

* #21552 Add forms from content palette error  (#1868)

* initial progress

* cleanup

* test updates

* test updates

* feedback

* rename functions

* CI: bumps version to 22.2.0-rc.8 [skip ci]

* #21656 Once a fileAsset is saved. the file itself can not be replaced using Save (#1872)

* CI: bumps version to 22.2.0-rc.3 [skip ci]

* #21558 Edit Template Properties Modal makes changes get lost (#1865)

* fix: Must supply a value for form control with name: 'title'

* remove dot-template store service from Dot Template Advanced Component

* fix: Edit Template Properties Modal makes changes get lost on advance template

* fix: Edit Template Properties Modal makes changes get lost on design template

* update template design

* clean up

* feedback

* clean up

* fix dot-template store tests

* fix tests on dot-template-create-edit

* fix dot-template-builder tests

* fix dot-template tests

* fix DotEditLayoutComponent

* clean up

* rename saveDraft to updateTemplate

* add docs

* feedback

* feedback

* clean up

* feedback

* clean up

* fix doc

* CI: bumps version to 22.2.0-rc.9 [skip ci]

* Update package

* Update package-lock

* Clean up

* Fix conflicts

* CI: bumps version to 22.3.0-next.13 [skip ci]

Co-authored-by: victoralfaro-dotcms <[email protected]>
Co-authored-by: Rafael Velazco <[email protected]>
Co-authored-by: Humberto Morera <[email protected]>
Co-authored-by: Freddy Rodriguez <[email protected]>

* Revert "Release 22.02 to master (#1874)" (#1881)

This reverts commit d1315d5.

* CI: bumps version to 22.3.0-next.15 [skip ci]

* CI: bumps version to 22.3.0-next.6 [skip ci]

* Bump version (#1883)

* Bump version dotcms-webcomponents (#1884)

* CI: bumps version to 22.3.0-next.7 [skip ci]

* Release 22.02 to master final (#1888)

* #21558 Edit Template Properties Modal makes changes get lost (#1873)

* fix save template on save properties - design template

* clean up

* feedback

* CI: bumps version to 22.2.0-rc.10 [skip ci]

* dont try to apply a content if ther is no placeholder

* Revert "dont try to apply a content if ther is no placeholder"

This reverts commit 4cdda81ca381f6b85b7e4d9054b8bfedf4f1995d.

* #21552 Don't try to apply a content if there is no placeholder (#1877)

* CI: bumps version to 22.2.0-rc.11 [skip ci]

* Bump version (#1880)

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

* #21552 Add forms from content palette error  (#1885)

* return null when inputs are undefined

* doc

* doc update

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

* CI: bumps version to 22.2.0-rc.12 [skip ci]

* Publish Release

* Publish Release

* CI: bumps version to 22.3.0-next.16 [skip ci]

Co-authored-by: Rafael Velazco <[email protected]>
Co-authored-by: victoralfaro-dotcms <[email protected]>
Co-authored-by: hmoreras <[email protected]>
Co-authored-by: Humberto Morera <[email protected]>

* update release version for dotcms-ui & dotcms-webcomponents

* CI: bumps version to 22.3.0-rc.3 [skip ci]

* #21612 fix Template Publish UI Suggestion (#1887)

* CI: bumps version to 22.3.0-next.17 [skip ci]

* Fix responsive table listing (#1893)

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

* #19837 Lint fixes - part 3  (#1889)

* progress

* progress

* shutdow event

* progress

* crumbtrail

* wizard - dotAddEditEvent

* edit content types

* compare store

* tests fix part 1

* test update round 2

* clean up

* change event names in html

* fix test after evetns

* Alfredo feedback

* Alfredo feedback

* CI: bumps version to 22.3.0-next.18 [skip ci]

* #19837 Lint updates part one (#1890)

* fix lint - first

* progress

* add new types

* progress

* add types

* add types

* progress

* feedback

* progress

* fix crud service type

* add types

* add types

* paginator service

* dot workflow event handler service

* remove any

* feedback

* clean up

* CI: bumps version to 22.3.0-next.19 [skip ci]

* #19837 Lint part 2 (#1892)

* Round 1

* Round 2

* Fix tests

* Fix dot-event

* Fix dot-function-info

* Remove pageview because is not being used

* Fix DotContentTypesEditComponent for the submit event in content-type-form

* Update dot-page-model

* Remove namespace

* Fix core-web service MOCK

* Round 3

* Round 4

* login-service.mock.ts had a lot of work

* login-service.mock.ts round 5

* dot-action-button fix

* dot-action-menu-button fix

* Round 6

* dot-dropdown-component fix

* Round 7

* Fix build

* Clean up

* Fix docs

* Feedback 1

* Fix build

* Fix build

* CI: bumps version to 22.3.0-next.20 [skip ci]

* #19837 Lint 2 (#1894)

* Round 1

* Round 2

* FIx test

* CI: bumps version to 22.3.0-next.21 [skip ci]

* #19837 Lint updates part 4.1 (#1896)

* progess

* progress

* progress

* progress

* progress

* progress

* progress

* progress

* clean up

* format on save

* CI: bumps version to 22.3.0-next.22 [skip ci]

* #19837 Lint updates part 5 (#1897)

* CI: bumps version to 22.3.0-next.23 [skip ci]

* #19837 Run lint in pre-push and CICD (#1895)

* Add husky

* Run in pre-push

* Run lint at the very start

* Change the script to disable husky in cicd

* Test without removing Husky

* Move run list after npm install

* Testing slack messages

* Testing slack messages

* Set colors to lint

* Make lint fail

* Create a new job

* Fix typo

* Only run build if lint

* Try to get the message

* Check if cache action works

* Fix lint to test both jobs

* Adding node to the build step

* Run both jobs no cache

* Add more info to slack

* Add more info to slack 2

* Update slack message

* Add the action url to slack

* Fix lint

* Prevent husky in cicd

* Test husky

* Test husky 2

* Test husky 3

* Test husky 4

* #19837 Update angular to latest version (#1899)

* #19837 Update angular to latest version

* Fix line spaces

* Fix dotcms-webcomponents build

* Fix content types margin in checkboxes and radio buttons (#1906)

* Fix content types checkbox and radio buttons margins

* Fix inline radio

* CI: bumps version to 22.3.0-rc.3 [skip ci]

* #21369 Custom bubble menu for Image block (#1837)

* CI: bumps version to 22.3.0-next.24 [skip ci]

* CI: bumps version to 22.3.0-next.25 [skip ci]

* Fix publish dotcms-ui (#1907)

* #19562 add white list feature to key value webcomponent (#1900)

* dot-key-value: Added reorder functionality

* #19562 Allow whitelist key-values in dot-key-value webcomponent

* Feedback

* CI: bumps version to 22.3.0-next.8 [skip ci]

* #21701 fix When editing a piece of content, update the pag… (#1904)

* #21701 fix When editing a piece of content, update the page title with the content title

* Feedback

* CI: bumps version to 22.3.0-next.26 [skip ci]

* #21815 UI problems with notifications

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

* #21509 Refactor create dynamic component (#1908)

* test image extension

* align image && add link

* clean up

* working

* better naming

* clean up

* feedback

* progress

* clean up

* add types

* working

* fix alignment

* clean up

* CI: bumps version to 22.3.0-next.27 [skip ci]

* CI: bumps version to 22.3.0-next.28 [skip ci]

* fix: bad import (#1910)

* CI: bumps version to 22.3.0-next.29 [skip ci]

* Update actions/checkout@v3 and fix build (#1911)

* Update actions/checkout@v3 and fix build

* Test with branch

* Bring back path

* Trigger build

* CI: bumps version to 22.3.0-.29 [skip ci]

Co-authored-by: victoralfaro-dotcms <[email protected]>

* Fix publish_dotcms_ui.yml build (#1912)

* Update actions/checkout@v3 and fix build

* Test with branch

* Bring back path

* Trigger build

* Remove tests branch

* #20919 Add "Change to" to the contextual menu  (#1901)


* align image && add link

* hear keydown on angular component

* working

* better naming

* clean up

* feedback

* suggestion options onSelection

* fix suggestion commands overlapping

* hide the dropdown when the block can't be changed. 

Co-authored-by: Rafael <[email protected]>

* CI: bumps version to 22.3.0-next.30 [skip ci]

* CI: bumps version to 22.3.0-next.31 [skip ci]

* bump version (#1914)

* CI: bumps version to 22.4.0-next.10 [skip ci]

* fix missing on webcomponents lib publish (#1915)

* line change to fire the worflow (#1916)

* CI: bumps version to 22.4.0-next.11 [skip ci]

* bump version on master (#1919)

* bump version on master - added blank space to activate lib publish (#1920)

* CI: bumps version to 22.4.0-next.1 [skip ci]

* bump version on master - removed prepare.js command in package.json (#1921)

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

* Update package.json

* Update package.json

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

* Issue 21474 update contentlet block design (#1913)

* improve contentlet-block styles

* configure web components on block editor project

* progress

* update block contentlet style

* add mockdata

* feedback

* fix thumbnail

* feedback

* feedback

* show 'contentType'

* fix: drag && feedback

* CI: bumps version to 22.4.0-next.4 [skip ci]

* #21483 Update contentlet suggestions result (#1923)

* improve contentlet-block styles

* configure web components on block editor project

* progress

* update block contentlet style

* feedback

* working

Co-authored-by: Rafael <[email protected]>

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

* #21612 Make Publish button be enabled when template has not been published (#1926)

* CI: bumps version to 22.4.0-next.6 [skip ci]

* hide drag on start & remove dependecy of ComponentFactoryResolver (#1925)

* CI: bumps version to 22.4.0-next.7 [skip ci]

* #21861 Content is being cloned when dropping an image

* CI: bumps version to 22.4.0-next.8 [skip ci]

* update release version for dotcms-ui & dotcms-webcomponents

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

* update master bumped version for dotcms-ui & dotcms-webcomponents

* CI: bumps version to 22.5.0-next.13 [skip ci]

* #21701 Change page title when new content is created (#1927)

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

* #21884 Add margin between contentlet and image blocks  (#1930)

* add maring

* more margin

* #21878 Tippys are being cut off

* CI: bumps version to 22.4.0-rc.7 [skip ci]

* #18019 fix Update dot-binary-file web component to support maxFileLength attr (#1917)

* #18019 fix Update dot-binary-file web component to support maxFileLength attr

* fix error msg display on dot-binary-file

* Feedback

* CI: bumps version to 22.5.0-next.14 [skip ci]

* #21857 Make Husky work

* #21885 Using binary = true to avoid multiple selection in CHeckbox (#1936)

* CI: bumps version to 22.4.0-rc.8 [skip ci]

* #21894 Unordered and ordered list not showing bullets (#1937)

* basic styles - prevent js errors

* css clean up

* font increase

* Update css vertical rhythm

* Update code font size

* Style lists

Co-authored-by: Freddy Montes <[email protected]>

* CI: bumps version to 22.4.0-rc.9 [skip ci]

* #18312 tags-not-working-on-contact-us-form (#1938)

* CI: bumps version to 22.5.0-next.15 [skip ci]

* #21789 Add a ability to copy a content type

* Issue 21789 add a ability to clone a content type

* Issue 21789 change to load dynamic load component, rename clone to copy

* Issue 21789 fix comments

* Issue 21789 fix test

* Fix effect test

Co-authored-by: Freddy Montes <[email protected]>

* CI: bumps version to 22.4.0-rc.10 [skip ci]

* Update package.json

* Update package.json

* Update package-lock

* CI: bumps version to 22.5.0-next.10 [skip ci]

* #21968 Error when no results in contentlets (#1941)

* CI: bumps version to 22.4.0-rc.11 [skip ci]

* #21897 Tippy is showing unnecessarily (#1939)

* fix: bubble menu is shown on edit contentlet

* attach drag handler to editor parent

* create dropdown tippy

* refactor dropdown

* fix: form link tippy position

* remove bubble change dropdown files

* feedback

* feedback v2

* clean up

* fix: dragHandler

* fix link form position on images

Co-authored-by: hmoreras <[email protected]>

* CI: bumps version to 22.4.0-rc.12 [skip ci]

* #21789 Fix double save on Keypress Enter

* CI: bumps version to 22.4.0-rc.13 [skip ci]

* #21979 Content type contextual menu cutting off

* CI: bumps version to 22.4.0-rc.14 [skip ci]

* #21789 Add autofocus to form input (#1946)

* CI: bumps version to 22.4.0-rc.15 [skip ci]

* #21839 Create content type modal needs some styling help to show the required license message Open (#1945)

* fix margin and restore col class

* add class

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

* CI: bumps version to 22.5.0-next.16 [skip ci]

* Issue 21695 problems pushing entire sites (#1948)

* #21695 theme is not going to be required anymor for the template

* Running test

* Removing unsed variable

* CI: bumps version to 22.4.0-rc.17 [skip ci]

* #19562 fix disabled on dot-key-values allowing to drag and… (#1942)

* #19562 fix disabled on dot-key-values allowing to drag and drop

* added test to disabled drag and drop

* added error msg when duplicated key is trying to be added

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

* #22009 Add row option menu is CSS broken

* fix row option menu is CSS broken

* fix comments

* CI: bumps version to 22.4.0-rc.18 [skip ci]

* #22015 The image on load is not centered

* CI: bumps version to 22.4.0-rc.19 [skip ci]

* #19562 fix dot-key-value-should-hide-form-and-delete-button-when-disabled (#1952)

* CI: bumps version to 22.4.0-rc.7 [skip ci]

* #22029 Doing a selection moving up is broken (#1953)

* #22029 Doing a selection moving up is broken

* Show bubble on keyup if shouldShow is true

* Clean up

* CI: bumps version to 22.4.0-rc.20 [skip ci]

* #22029 Fix broken selection (#1956)

* CI: bumps version to 22.4.0-rc.21 [skip ci]

* #22038 Add decoration with instructions on empty editor and block (#1957)

* hide-duplicated-error-message-when-key-is-changed (#1958)

* CI: bumps version to 22.4.0-rc.8 [skip ci]

* #22066 Remove the 40 limit in the content types request

* CI: bumps version to 22.4.0-rc.22 [skip ci]

* #22058 Update all the tiptap and other related packages (#1961)

* update packages

* clean up

* CI: bumps version to 22.5.0-next.11 [skip ci]

* Update package-lock

* Update components.d

* CI: bumps version to 22.5.0-next.12 [skip ci]

* Issue 21797 add to menu to content type v2 (#1955)

* progress

* progress - almost working

* progress working

* cleanup

* fix menu active was not openning on specific place added & feedback

* #21797 Add to contentType to Menu

* fix broken test

* PR Feedback

* feedback

* tests fix

* CI: bumps version to 22.5.0-next.13 [skip ci]

* add missing extention (#1964)

* #21915 Add inline edit to content type name and Icon (#1963)

* #21915 Add inline edit to content type name and Icon

* Feedback

* CI: bumps version to 22.5.0-next.14 [skip ci]

* Release 22.4 is now 22.5, so next should target 22.6

* CI: bumps version to 22.6.0-next.1 [skip ci]

* Triggering npm publish for next 22.6

* CI: bumps version to 22.6.0-next.1 [skip ci]

* #22016 Allow keyboard filtering while adding blocks  (#1959)

* progress- testing

* both using suggestion

* cleanup

* cleanup

* cleanup

* remove query when filtering

* show content block and update first item on filter

* clean up

* feddback

* clear filter on Content block selection + feedback

* feedback and cover missing scenarios

* feedback - no results - typpi sugestion position

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

* #22104 fix dot-md-icon-selector-being-activated-on-form-submit (#1970)

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

* #21747 fix style-add-form-dialog-edit-page (#1967)

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

* #22044 Filter content types in suggestions  (#1971)

* filter content types

* simulate request filtering

* CI: bumps version to 22.6.0-next.4 [skip ci]

* #22140 Contentlet loosing in the page after layout change (#1972)

* fix: losing changes asfter layout change

* clean up

* feedback

* feedback v2

* clean up

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

* Merge 22.05 into master 20220506 (#1974)

* #22066 Remove the 40 limit in the content types request

* CI: bumps version to 22.4.0-rc.23 [skip ci]

* Renaming release 22.04 to 22.05

* CI: bumps version to 22.5.0-rc.1 [skip ci]

* Triggering npm publish for release 22.05

* CI: bumps version to 22.5.0-rc.1 [skip ci]

* Publish Release

Co-authored-by: Humberto Morera <[email protected]>
Co-authored-by: victoralfaro-dotcms <[email protected]>
Co-authored-by: nollymar <[email protected]>
Co-authored-by: Freddy Montes <[email protected]>

* #22045 Filter contentlets in suggestions  (#1973)

* initla progress

* clean up

* filter behavior

* used ENUM when clearing filter

* CI: bumps version to 22.6.0-next.6 [skip ci]

* #21307 fix personas-portlet-not-showing-require-license (#1977)

* CI: bumps version to 22.6.0-next.7 [skip ci]

* update release version for dotcms-ui & dotcms-webcomponents

* CI: bumps version to 22.6.0-rc.3 [skip ci]

* update master bumped version for dotcms-ui & dotcms-webcomponents

* CI: bumps version to 22.7.0-next.4 [skip ci]

* #22094 fix noHtml-regex-invalidates-period-on-contentType-title (#1980)

* CI: bumps version to 22.6.0-rc.3 [skip ci]

* #22159 Respect the Contentlet language to search (#1979)

* add lang attribute to use the contentlet language in the suggestions requests

* removed TODO, not necesary

* comments fixed

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

* #22017 Add delete block to bubble menu in images and contentlets (#1982)

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

* #22039 Control what contentlet types you can add (#1975)

* initial progress

* working

* feddback

* enpoint rename

* params changes

* #22018 Paste images to create external images blocks (#1981)

* fix: paste image

* clean up

* clean up v2

* feedback

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

* CI: bumps version to 22.7.0-next.9 [skip ci]

* dummy change to fix-dotcms-webcomponents-release-lib-published (#1985)

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

* #22186 fix rules-do-not-display-custom-request-header (#1983)

* #22186 fix rules-do-not-display-custom-request-header

* feedback

* CI: bumps version to 22.7.0-next.10 [skip ci]

* #22216 Disable system template row in the listing (#1987)

* dev: disabled system template v1

* test: SYSTEM_TEMPLATE row v1

* clean up

* test: SYSTEM_TEMPLATE row v2

* dev: disabled system template editing v2

* test: fix redirect system template v2

* Revert "#22216 Disable system template row in the listing (#1987)" (#1990)

This reverts commit d4c0953.

* CI: bumps version to 22.7.0-next.11 [skip ci]

* #22216 Disable system template row in the listing (#1991)

* dev: disabled system template v1

* test: SYSTEM_TEMPLATE row v1

* clean up

* test: SYSTEM_TEMPLATE row v2

* dev: disabled system template editing v2

* test: fix redirect system template v2

* feedback v1

* CI: bumps version to 22.6.0-rc.7 [skip ci]

* CI: bumps version to 22.7.0-next.12 [skip ci]

* Update old package and fix
- markdown package
- monaco editor to supporr ng 13
- Fix the test npm script to point to nx
- update karma
- remove build-ng-packagr

* Generate fresh package-lock

* Fix border in template because new monaco component

* Fix test

* Fix ValuesPropertyComponent test

* Merge release 22.06 to master (#1999)

* #22017 Delete by range in case of select more than 1 node (#1988)

* CI: bumps version to 22.6.0-rc.8 [skip ci]

* #22198 We are changing the relationship selection once that you create the field

* CI: bumps version to 22.6.0-rc.9 [skip ci]

* #22039 Fix the back button when empty results in the suggestion search

* #21818 Reload contentlet on edit using #editContentlet macro (#1989)

* delay in call

* delay in call

* reduce timeout

* CI: bumps version to 22.6.0-rc.10 [skip ci]

* Issue 21797 fix force menu to load and hide add to menu for host in content type (#1995)

* #21797 fix force-menu-to-load-and-hide-add-to-menu-for-host-content-type

* Support other error msg handling from backend

* #21797 fix when creating a new toolgroup in add-to-menu we need to concatenate the viewMode to make it unique

* Feedback

* CI: bumps version to 22.6.0-rc.11 [skip ci]

* #21915 fix-layout-broken-when-changed-CT-name (#1998)

* CI: bumps version to 22.6.0-rc.12 [skip ci]

* #22204 We are not notifying the UI about the bad request error changing password

Co-authored-by: Arcadio Quintero A <[email protected]>
Co-authored-by: victoralfaro-dotcms <[email protected]>
Co-authored-by: Humberto Morera <[email protected]>
Co-authored-by: alfredo-dotcms <[email protected]>

* (#issue-22114): Adding module matcher action to evaluate if workflow should run based on commits changes

* Preparing for monorepo merge

* Adjusting core - core-web merge before push

Co-authored-by: Freddy Montes <[email protected]>
Co-authored-by: Humberto Morera <[email protected]>
Co-authored-by: Rafael Velazco <[email protected]>
Co-authored-by: alfredo-dotcms <[email protected]>
Co-authored-by: Freddy Montes <[email protected]>
Co-authored-by: Freddy Rodriguez <[email protected]>
Co-authored-by: hmoreras <[email protected]>
Co-authored-by: Daniel Silva <[email protected]>
Co-authored-by: Arcadio Quintero A <[email protected]>
Co-authored-by: Nollymar Longa <[email protected]>
Co-authored-by: nollymar <[email protected]>
  • Loading branch information
12 people authored May 27, 2022
1 parent ce4d942 commit 4e7f4b8
Show file tree
Hide file tree
Showing 2,296 changed files with 514,236 additions and 8 deletions.
105 changes: 105 additions & 0 deletions .cicd/github.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
#!/bin/bash

TEST_RESULTS="test-results-core-web"
GITHUB="github.com"
GITHACK="raw.githack.com"
GITHUB_TEST_RESULTS_PATH="DotCMS/${TEST_RESULTS}"
DOT_CICD_TARGET="core-web"
GITHUB_USER="victoralfaro-dotcms"
GITHUB_USER_EMAIL="[email protected]"

if [[ $IS_PULL_REQUEST == true ]]; then
CURRENT_BRANCH=${HEAD_REF}
else
CURRENT_BRANCH=${GITHUB_REF##*/}
fi

DOT_CICD_PATH="./dotcicd"
OUTPUT_FOLDER="ui/karma_html"
export GITHUB_TEST_RESULTS_HOST_PATH="${GITHUB}/${GITHUB_TEST_RESULTS_PATH}"
export GITHUB_TEST_RESULTS_URL="https://${GITHUB_TEST_RESULTS_HOST_PATH}"
export GITHACK_TEST_RESULTS_URL="https://${GITHACK}/${GITHUB_TEST_RESULTS_PATH}"
export GITHUB_TEST_RESULTS_REPO="${GITHUB_TEST_RESULTS_URL}.git"
export GITHUB_TEST_RESULTS_BROWSE_URL="${GITHACK_TEST_RESULTS_URL}/${CURRENT_BRANCH}/projects/${DOT_CICD_TARGET}/${GITHUB_SHA::8}"
export GITHUB_TEST_RESULTS_REMOTE="https://${GITHUB_USER}:${GH_TOKEN}@${GITHUB_TEST_RESULTS_HOST_PATH}"
export GITHUB_TEST_RESULTS_REMOTE_REPO="https://${GITHUB_USER}:${GH_TOKEN}@${GITHUB_TEST_RESULTS_HOST_PATH}.git"


function existsOrCreateAndSwitch {
local results=${1}
if [[ ! -d $results ]]; then
mkdir -p $results
fi

cd $results
}

function gitConfig {
git config --global user.email "${GITHUB_USER_EMAIL}"
git config --global user.name "${GITHUB_USER}"
git config pull.rebase false
git config -l | grep user
}

function addResults {
local results=${1}
if [[ -z "$results" ]]; then
echo "Cannot add results since its empty, ignoring"
exit 1
fi

local targetFolder=${results}
mkdir -p ${targetFolder}
echo "Adding test results to: ${targetFolder}"
echo "output: ${OUTPUT_FOLDER}/* target:${targetFolder}"
cp -r "${GITHUB_WORKSPACE}/${OUTPUT_FOLDER}/." ${targetFolder}
}


function persistResults {
TEST_RESULTS_PATH=${DOT_CICD_PATH}/${TEST_RESULTS}
gitConfig

if [[ ! -d dotcicd/test-results ]]; then
echo "Cloning ${GITHUB_TEST_RESULTS_REPO} to ${TEST_RESULTS_PATH}"
git clone ${GITHUB_TEST_RESULTS_REPO} ${TEST_RESULTS_PATH}
fi

existsOrCreateAndSwitch ${TEST_RESULTS_PATH}/projects/${DOT_CICD_TARGET}

git fetch --all

remoteBranch=$(git ls-remote --heads ${GITHUB_TEST_RESULTS_REMOTE_REPO} ${CURRENT_BRANCH} | wc -l | tr -d '[:space:]')
localBranch=$(git show-ref --heads ${CURRENT_BRANCH} | wc -l | tr -d '[:space:]')

if [[ ${remoteBranch} == 1 ]]; then
if [[ ${localBranch} == 1 ]]; then
git checkout ${CURRENT_BRANCH}
else
echo "git checkout -b ${CURRENT_BRANCH} --track origin/${CURRENT_BRANCH}"
git checkout -b ${CURRENT_BRANCH} --track origin/${CURRENT_BRANCH}
fi
else
git checkout -b ${CURRENT_BRANCH}
fi

if [[ $? != 0 ]]; then
echo "Error checking out branch '${CURRENT_BRANCH}', continuing with master"
git pull origin master
else
if [[ ${remoteBranch} == 1 ]]; then
echo "git pull origin ${CURRENT_BRANCH}"
git pull origin ${CURRENT_BRANCH}
fi
fi

addResults ./${GITHUB_SHA::8}
git add .
git commit -m "Adding tests results for ${GITHUB_SHA::8} from ${CURRENT_BRANCH}"
git push ${GITHUB_TEST_RESULTS_REMOTE}
git status
}

function logResults {
echo "${GITHUB_TEST_RESULTS_BROWSE_URL}/report.html"
}
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# exclude package-lock from github diffs
package-lock.json -diff
4 changes: 4 additions & 0 deletions .github/actions/module-matcher/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
dist/
lib/
node_modules/
src/@types/
17 changes: 17 additions & 0 deletions .github/actions/module-matcher/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"plugins": ["@typescript-eslint", "github", "jest"],
"extends": ["plugin:github/typescript"],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 9,
"sourceType": "module",
"project": "./tsconfig.json"
},
"rules": {
},
"env": {
"node": true,
"es6": true,
"jest/globals": true
}
}
3 changes: 3 additions & 0 deletions .github/actions/module-matcher/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dist/
lib/
node_modules/
11 changes: 11 additions & 0 deletions .github/actions/module-matcher/.prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"printWidth": 80,
"tabWidth": 2,
"useTabs": false,
"semi": false,
"singleQuote": true,
"trailingComma": "none",
"bracketSpacing": false,
"arrowParens": "avoid",
"parser": "typescript"
}
38 changes: 38 additions & 0 deletions .github/actions/module-matcher/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: 'Workflow router'
description: 'Based on event (push or pull request) gather the involved commits to determine if workflow is allowed run'
author: 'victoralfaro-dotcms'
inputs:
current:
description: 'Current module'
required: true
modules:
description: 'Modules configuration, space delimited list of modules'
required: true
default: |
[
{
"module": "core",
"folder": ".",
"main": true
},
{
"module": "ui"
},
{
"module": "enterprise"
}
]
pull_request:
description: 'Pull request id'
required: false
default: ${{ github.event.number }}
commit:
description: 'Commit SHA'
required: true
default: ${{ github.sha }}
outputs:
module_found:
description: 'Boolean result: true for ound, otherwise false'
runs:
using: 'node16'
main: 'dist/index.js'
Loading

0 comments on commit 4e7f4b8

Please sign in to comment.