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

release(v0.63.0): merge to production #1726

Merged
merged 22 commits into from
Dec 6, 2023
Merged

release(v0.63.0): merge to production #1726

merged 22 commits into from
Dec 6, 2023

Conversation

seaerchin
Copy link
Contributor

What's Changed

Full Changelog: v0.62.0...v0.63.0

dcshzj and others added 19 commits November 28, 2023 15:30
* feat(tiptap): add card grid block

* feat(cards): add basic bubble menu

* feat(cards): adjust editor commands to support creation
* feat(tiptap): add card grid block

* feat(cards): adjust editor commands to support creation

* feat(cards): introduce drawer to support sub-editing
* feat(tiptap): allow inserting of complex blocks

* feat(tiptap): add card grid block

* feat(cards): add basic bubble menu

* feat(cards): adjust editor commands to support creation

* feat(cards): introduce drawer to support sub-editing

* feat(cards): allow editing of cards within drawer

* feat(cards): support undo/redo of cards editing

* feat(cards): render preview the same way as template

* fix(cards): update inputs when switching card positions

* fix(cards): insert node instead of replace

* fix(cards): force update display image checkbox

* fix(cards): avoid using useEffect and use callback

* fix(cards): add link validation and delete confirmation

* styles(card): support hover for node view

* fix(cards): trigger form validation and update preview

* docs(cards): add info on how setCardsContent works

* fix(cards): use Editor CSS module instead

* styles(card): add bottom margin if not last item
* fix(editor): improve embed functionality

* fix(embed): change placement of bubble menu
* feat: select modal revamp for existing functionality

* feat: add tab for inserting external images

* feat: add validation for external images

* fix: maintain errors on blur

* fix: selection of image after clicking into external tab

* fix: ux issues

* fix: rerendering issue

* fix: change search to debounced real time

* fix: styling issues

* chore: searchbar copy

* chore: remove search in all button

* fix: drop onExternalProceed for mediaModal

* chore: shift folderBreadcrumb and debounce time

* chore: remove unnecessary conditional

* fix: remove unused components

* fix(mediasselectmodal): add 1px top padding

---------

Co-authored-by: seaerchin <[email protected]>
## Problem

Basic Accordion Block 


![Screenshot 2023-11-28 at 10.02.39 AM.png](https://graphite-user-uploaded-assets-prod.s3.amazonaws.com/4JosFH65rhzwIvkZw2J6/f06ba7c6-2c9d-48dd-9425-1a2fa9380c09.png)

## New env var
TIPTAP_PRO_TOKEN: needed to get the private npm package
During deployment, please update Netlify

NOT DONE: 
Differing background colour 

Conversion from Old Accordion code to the newer format

Checking in with design on hover for the plus button in the editor 

Checking in with Design on the margins for accordion
## Problem

Add background colours 

Note: quite a bit of code was taken from @dcshzj's PR here #1705. (ps still learning how use graphite, will attempt to cherry pick in the future) 


The toggle is still a bit flaky, will be documenting in a notion doc

<div class='graphite__hidden'>
          <div>🎥 Video uploaded on Graphite:</div>
            <a href="https://app.graphite.dev/media/video/4JosFH65rhzwIvkZw2J6/33ec7c00-6253-4ff9-b1a8-abc1cc25dcab.mov">
              <img src="https://app.graphite.dev/api/v1/graphite/video/thumbnail/4JosFH65rhzwIvkZw2J6/33ec7c00-6253-4ff9-b1a8-abc1cc25dcab.mov">
            </a>
          </div>
<video src="https://graphite-user-uploaded-assets-prod.s3.amazonaws.com/4JosFH65rhzwIvkZw2J6/33ec7c00-6253-4ff9-b1a8-abc1cc25dcab.mov">Screen Recording 2023-11-28 at 4.47.19 PM.mov</video>
* fix(markdowneditpage): fix styling on big screens (1920+)

* fix(blockwrapper): update outline to border to prevent bottom border disappearing on drag

* refactor(editpage): shift out editor call

* feat(imageview): add wrapper for image view

* feat(iframeview): add wrapper

* refactor(views): add blockwrapper to embeds

* fix(usetiptapeditor): add trailing ode

* refactor(views): update formsg/instagram to show embed only
## Problem
The old embed view is very different from how the rest of our editor looks like due to it not using our theme colours/styling.

## Solution
Change the design to a design approved design!

## Screenshots
<img width="599" alt="Screenshot 2023-12-05 at 3 09 54 PM" src="https://github.com/isomerpages/isomercms-frontend/assets/44049504/9792b585-1d18-4d0b-a7a6-6ffcf3d6c0ce">
* feat(table): add initial table view

* refactor(blockwrapper): add new draghandle

* fix(editor/table): update stylings
* feat(editor): feature flag complex blocks

* chore: fix typo

* fix(editor): simplify isHidden prop
Copy link

mergify bot commented Dec 5, 2023

⚠️ The sha of the head commit of this PR conflicts with #1725. Mergify cannot evaluate rules on this PR. ⚠️

@seaerchin
Copy link
Contributor Author

wtf alot of changes sia

@seaerchin
Copy link
Contributor Author

seaerchin commented Dec 5, 2023

@seaerchin #1697 - ignoring, cannot see

cards
@seaerchin #1701 (no tests)
@seaerchin #1704 (no tests)
@seaerchin #1705 (no tests)
@seaerchin #1706 (no tests)
@seaerchin #1707 (no tests)

accordion
@seaerchin #1709 (no tests)
@seaerchin #1713 (no tests)

@seaerchin #1716
@seaerchin #1717
@kishore03109 #1719 (adding rn monkas)
@seaerchin #1714 (tested -> works fine with content, PR merged to fix insertion of image on empty line, verified on staging)
@kishore03109 #1718 (adding rn monkas)
@kishore03109 #1724 (adding rn monkas)
@kishore03109 #1723 (adding rn monkas)
@kishore03109 #1722 (adding rn monkas)
@seaerchin #1721 (adding rn monkas)
@kishore03109 #1720 (adding rn monkas)

reverting #1715

Copy link

cypress bot commented Dec 5, 2023

65 failed tests on run #453 ↗︎

65 43 1 22 Flakiness 0

Details:

release(v0.63.0): merge to production
Project: isomercms-frontend Commit: b38ff5be9d
Status: Failed Duration: 17:02 💡
Started: Dec 6, 2023 4:15 AM Ended: Dec 6, 2023 4:33 AM
Failed  editPage.spec.ts • 14 failed tests

View Output Video

Test Artifacts
editPage.spec > Edit unlinked page > Edit page (unlinked) should have correct colour Screenshots Video
editPage.spec > Edit unlinked page > Edit page (unlinked) should have name of title Screenshots Video
editPage.spec > Edit unlinked page > Edit page (unlinked) should provide a warning to users when navigating away Screenshots Video
editPage.spec > Edit unlinked page > Edit page (unlinked) should allow user to modify and save content Screenshots Video
editPage.spec > Edit unlinked page > Edit page (unlinked) should allow user to add existing image Screenshots Video
editPage.spec > Edit unlinked page > Edit page (unlinked) should allow user to upload and add new image Screenshots Video
editPage.spec > Edit unlinked page > Edit page (unlinked) should allow user to upload and add new file Screenshots Video
editPage.spec > Edit unlinked page > Edit page (unlinked) should allow user to add existing file Screenshots Video
editPage.spec > Edit unlinked page > Edit page (unlinked) should allow user to add link Screenshots Video
editPage.spec > Edit unlinked page > Edit page (unlinked) should allow users to add Instagram embed script Screenshots Video
The first 10 failed tests are shown, see all 14 tests in Cypress Cloud.
Failed  files.spec.ts • 10 failed tests

View Output Video

Test Artifacts
Files > Create file, delete file, edit file settings in Files > Files should contain Directories and Ungrouped Files Screenshots Video
Files > Create file, delete file, edit file settings in Files > Should be able to create new file with valid title Screenshots Video
Files > Create file, delete file, edit file settings in Files > Should be able to edit a file Screenshots Video
Files > Create file, delete file, edit file settings in Files > Should not be able to create file with invalid title Screenshots Video
Files > Create file, delete file, edit file settings in Files > Should not be able to edit file and save with invalid title Screenshots Video
Files > Create file, delete file, edit file settings in Files > Should be able to delete file Screenshots Video
Files > Create file directory, delete file directory, edit file directory settings in Files > Should be able to create new file directory Screenshots Video
Files > Create file directory, delete file directory, edit file directory settings in Files > Should be able to edit file directory name Screenshots Video
Files > Create file directory, delete file directory, edit file directory settings in Files > Should be able to delete file directory Screenshots Video
Files > Create file, delete file, edit file settings, and move files in file directories > Should be able to add file to file directory Screenshots Video
Failed  folders.spec.ts • 11 failed tests

View Output Video

Test Artifacts
Folders flow > Create subfolder, rename subfolder, delete subfolder from Folders > Should be able to create a new sub-folder within a valid folder name with one page Screenshots Video
Folders flow > Create subfolder, rename subfolder, delete subfolder from Folders > Should be able to rename a sub-folder Screenshots Video
Folders flow > Create subfolder, rename subfolder, delete subfolder from Folders > Should be able to delete a sub-folder with a page Screenshots Video
Folders flow > Create subfolder, rename subfolder, delete subfolder from Folders > Should be able to delete a sub-folder without page Screenshots Video
Folders flow > Create page, delete page, edit page settings in folder > Should be able to create a new page with valid title and permalink Screenshots Video
Folders flow > Create page, delete page, edit page settings in folder > Should not be able to create page with invalid title Screenshots Video
Folders flow > Create page, delete page, edit page settings in folder > Should not be able to create page with invalid permalink Screenshots Video
Folders flow > Create page, delete page, edit page settings in folder > Should be able to edit existing page details with Chinese title and valid permalink Screenshots Video
Folders flow > Create page, delete page, edit page settings in folder > Should be able to edit existing page details with Tamil title and valid permalink Screenshots Video
Folders flow > Create page, delete page, edit page settings in folder > Should be able to delete existing page in folder Screenshots Video
The first 10 failed tests are shown, see all 11 tests in Cypress Cloud.
Failed  homepage.spec.ts • 6 failed tests

View Output Video

Test Artifacts
Homepage > Block editing > should display the site notification correctly Screenshots Video
Homepage > Block editing > should only allow up to 4 highlights for the hero section Screenshots Video
Homepage > Block editing > should remove the button in preview when the hero button content is not given Screenshots Video
Homepage > Block editing > should preserve content when swapping between highlights and dropdown for hero section Screenshots Video
Homepage > Block editing > should limit users to a single resource component Screenshots Video
Homepage > Block editing > should rearrange the blocks correctly and the preview should also reflect the new order Screenshots Video
Failed  images.spec.ts • 1 failed test

View Output Video

Test Artifacts
Images > Create album, delete album, edit album settings in Images > Should be able to create new album Screenshots Video

The first 5 failed specs are shown, see all 10 specs in Cypress Cloud.

Review all test suite changes for PR #1726 ↗︎

@kishore03109
Copy link
Contributor

kishore03109 commented Dec 5, 2023

@kishore03109 #1719 (adding rn monkas) [done]

@kishore03109 #1718 (adding rn monkas)
@kishore03109 #1724 (adding rn monkas) [done]
@kishore03109 #1723 (adding rn monkas) [done]
@kishore03109 #1722 (adding rn monkas) [done]
@kishore03109 #1720 (adding rn monkas) [done]

@kishore03109
Copy link
Contributor

kishore03109 commented Dec 5, 2023

Current issues

Backspace on table + embed gives weird output
https://github.com/isomerpages/isomercms-frontend/assets/42832651/7931bd22-86ca-4b42-a121-9f8dbe4df6e0

Adding image to a newly created page throws an error
https://github.com/isomerpages/isomercms-frontend/assets/42832651/906d344e-91a8-40df-aacd-cedbb0a31090

Embed currently doesnt have the bubble menu to change link/ unable to change link on click. (not sure if this was deprioritised)

* fix(blockwrapper): remove padding oops

* fix(styles): update to onlyk shiow placeholder for first empty p

* fix(image): update insertion logic

* fix(formsg): remove formsg ext to use default iframe; fix regex for embeds
@seaerchin
Copy link
Contributor Author

seaerchin commented Dec 6, 2023

@kishore03109 thanks for catching

the embed issues are specifically formsg embeds specific because we (in the form of tiptap extensions) differentiate between iframe/insta/formsg embeds.

i tested w/ all 3 for the backspace + the embed menu -> no issue

the insert image one is fixed with slightly wonk semantics, as follows:

  1. if there's a selection (user highlights) - we insert after the ending range of the selection.
  2. if there's no selection and line empty: retain empty line, insert after (dedicated 15 mins, couldn't find a good enough solution. technically deducting 1 works but then idk how to check if line's empty)
  3. if there's no selection and line has content: insert at cursor position.

Video

video of new behaviour for formsg embed (technically this is just a normal embed to tiptap now) -> we strip the div as there's no extension supported -> we still retain the text content of the div (the behaviour is we still parse the child -> tiptap understands raw text + a tags so this is retained) but div itself is removed. For formsg, the div only contains styling stuff - padding/margin etc, which i don't care about.

Screen.Recording.2023-12-06.at.11.47.57.AM.mov

seaerchin and others added 2 commits December 6, 2023 13:11
* fix(embed-views): add a max width

* fix(image): remove image resize otion
Copy link

mergify bot commented Dec 6, 2023

⚠️ The sha of the head commit of this PR conflicts with #1725. Mergify cannot evaluate rules on this PR. ⚠️

@seaerchin seaerchin merged commit 632d72c into master Dec 6, 2023
15 of 23 checks passed
@mergify mergify bot deleted the release/v0.63.0 branch December 6, 2023 05:39
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.

4 participants