Code

[3941] New Content Diff UX#4165

Code

Open

jvega190 wants to merge 147 commits intocraftercms:developcraftercms/studio-ui:developfrom jvega190:feature/3941-sidebarjvega190/studio-ui:feature/3941-sidebarCopy head branch name to clipboard

+3,887-820

Commits

Commits on Oct 18, 2023

• Make content diff better - initial work craftercms#3941

  jvega190

  committed
  b8c95e5

  Copy full SHA for b8c95e5

Commits on Oct 19, 2023

• Replace makeStyles with sx craftercms#3941

  jvega190

  committed
  043d874

  Copy full SHA for 043d874

• Styles, ContentInstanceComponents and MonacoWrapper updates craftercms#3941

  jvega190

  committed
  d4283ad

  Copy full SHA for d4283ad

Commits on Oct 20, 2023

• Merge branch 'develop' of https://github.com/craftercms/studio-ui into feature/3941

  jvega190

  committed
  7c8f210

  Copy full SHA for 7c8f210

• Compare Dialog updates, add compareTo action to versions in CompareVersions, ContentInstanceComponents updates craftercms#3941

  jvega190

  committed
  14f5545

  Copy full SHA for 14f5545

Commits on Oct 30, 2023

• Update unchaged accordion styles in ContentInstanceComponents craftercms#3941

  jvega190

  committed
  3783254

  Copy full SHA for 3783254

Commits on Nov 22, 2023

• Merge branch 'develop' of https://github.com/craftercms/studio-ui into feature/3941

  jvega190

  committed
  75f89e7

  Copy full SHA for 75f89e7

Commits on Nov 23, 2023

• Update diff for node-selector craftercms#3941

  jvega190

  committed
  246252f

  Copy full SHA for 246252f

Commits on Dec 6, 2023

• Merge branch 'develop' of https://github.com/craftercms/studio-ui into feature/3941

  Show description for 9448a71
  jvega190

  committed
  9448a71

  Copy full SHA for 9448a71

• Add/update rendering of diff for video, date-time, time, checkbox. Update arrayDiff util, initial work for checkbox-group #6247

  jvega190

  committed
  0780d9c

  Copy full SHA for 0780d9c

Commits on Dec 7, 2023

• Added checkbox group initial diff rendering, update monaco editor with html/text switch craftercms#3941

  jvega190

  committed
  28e5139

  Copy full SHA for 28e5139

Commits on Dec 20, 2023

• Add default compare render, validate empty fields and add a default for no content rendering craftercms#3941

  jvega190

  committed
  1b05c6c

  Copy full SHA for 1b05c6c

Commits on Dec 22, 2023

• Add xml comparison (global and for node-selector and repeating group), initial work for repeating group diff craftercms#3941

  jvega190

  committed
  21a8456

  Copy full SHA for 21a8456

Commits on Jul 3, 2024

• Merge branch 'develop' of https://github.com/craftercms/studio-ui into feature/3941

  Show description for b739a28
  jvega190

  committed
  b739a28

  Copy full SHA for b739a28

Commits on Aug 9, 2024

• Merge branch 'develop' of https://github.com/craftercms/studio-ui into feature/3941

  Show description for 5c977d3
  jvega190

  committed
  5c977d3

  Copy full SHA for 5c977d3

• [3941] Update after merge, restore leftActions in CompareVersionsDialog

  jvega190

  committed
  c0610ec

  Copy full SHA for c0610ec

Commits on Aug 12, 2024

• [3941] Show monaco editor for textarea diff, update time control timezone format to display content

  jvega190

  committed
  6a6573a

  Copy full SHA for 6a6573a

Commits on Aug 19, 2024

• [3941] Rep-groups diff

  jvega190

  committed
  6a9b9e9

  Copy full SHA for 6a9b9e9

Commits on Aug 23, 2024

• [3941] Refactor, enhance objects comparison in diff dialog, rep-groups items comparison only when they differ

  jvega190

  committed
  40d6336

  Copy full SHA for 40d6336

Commits on Aug 27, 2024

• [3941] CompareVersions updates, ViewVersionDialog work

  jvega190

  committed
  8e83ed1

  Copy full SHA for 8e83ed1

• [3941] Fix issue comparing possible null content (instead of empty object)

  jvega190

  committed
  4956acc

  Copy full SHA for 4956acc

Commits on Aug 28, 2024

• [3941] Validate empty content before doing a map

  jvega190

  committed
  c5e79b8

  Copy full SHA for c5e79b8

• [3941] Update to consider systemProps

  jvega190

  committed
  7483ec8

  Copy full SHA for 7483ec8

Commits on Sep 10, 2024

• [3941] Validate possible non-existing contentA or contentB (no item set in rep-group)

  jvega190

  committed
  44979ea

  Copy full SHA for 44979ea

• Merge branch 'develop' of https://github.com/craftercms/studio-ui into feature/3941

  Show description for b9a1983
  jvega190

  committed
  b9a1983

  Copy full SHA for b9a1983

• [3941] CompareVersions, update after merge

  jvega190

  committed
  2316ac3

  Copy full SHA for 2316ac3

Commits on Sep 11, 2024

• [3941] Sidebar view, single field view

  jvega190

  committed
  b4586df

  Copy full SHA for b4586df

• [3941] Filter fields in CompareVersionsDialogContainer, update height settings for Dialog body and MonacoWrapper

  jvega190

  committed
  9659a91

  Copy full SHA for 9659a91

Commits on Sep 12, 2024

• [3941] Pre-select first diff field

  jvega190

  committed
  58f773c

  Copy full SHA for 58f773c

• [3941] Update CompareVersionsDialog height

  jvega190

  committed
  e1bac5c

  Copy full SHA for e1bac5c

• [3941] automaticLayout option in mocaco editor to handle window resizing

  jvega190

  committed
  485c086

  Copy full SHA for 485c086

• [3941] Adjust dialog content height for content to display properly

  jvega190

  committed
  dbd5b56

  Copy full SHA for dbd5b56

Commits on Sep 13, 2024

• [3941] Design updates, components restructure

  jvega190

  committed
  36f3404

  Copy full SHA for 36f3404

• [3941] Remove contextmenu from monacoWrapper

  jvega190

  committed
  a052bb7

  Copy full SHA for a052bb7

• [3941] Add content-type info in CompareVersionsDialogContainer

  jvega190

  committed
  9305dc1

  Copy full SHA for 9305dc1

• [3941] Add info icon to diff view toolbar

  jvega190

  committed
  5aaf377

  Copy full SHA for 5aaf377

• [3941] CompareVersionsDialog actions update

  jvega190

  committed
  1d7a8dd

  Copy full SHA for 1d7a8dd

Commits on Sep 16, 2024

• [3941] ContentInstance and RepeatGroup diff components updates

  jvega190

  committed
  1c80e9c

  Copy full SHA for 1c80e9c

• [3941] Image diff layout updates

  jvega190

  committed
  15a5ea5

  Copy full SHA for 15a5ea5

• [3941] Update components to handle a subDialog for repeating group diff

  jvega190

  committed
  fee1bf8

  Copy full SHA for fee1bf8

Commits on Sep 17, 2024

• [3941] Update enhancedDialog to support text in header actions, remove custom styles in compare button in CompareFieldPanel

  jvega190

  committed
  486cabd

  Copy full SHA for 486cabd

Commits on Sep 18, 2024

• [3941] Add compare 'subdialog' to CompareVersionsDialog, update ViewItem according to new design

  jvega190

  committed
  c7c953c

  Copy full SHA for c7c953c

• [3941] ViewVersionDialog design updates, created FieldVersionToolbar for diff/view dialogs

  jvega190

  committed
  a4ad9f1

  Copy full SHA for a4ad9f1

• [3941] ViewVersionDialog updates to support pre-fetched data

  jvega190

  committed
  dd4a10f

  Copy full SHA for dd4a10f

• [3941] RepeatGroupItems updates to view single item version, simplify items rendering

  jvega190

  committed
  b8a7b86

  Copy full SHA for b8a7b86

Commits on Sep 19, 2024

• [3941] RepeatGroupItems updates, use cx, update hover/select styles

  jvega190

  committed
  1d97d1a

  Copy full SHA for 1d97d1a

• [3941] ContentInstanceComponents open embedded components diff when there are changes

  jvega190

  committed
  0a6b863

  Copy full SHA for 0a6b863

• [3941] Add backdrop to CompareVersionsDialog when sub view is open, click outside to close

  jvega190

  committed
  b2dc9f7

  Copy full SHA for b2dc9f7

• [3941] Fix wrapping of texts in FieldVersionToolbar and Node Selector diff items, add FieldVersionToolbar actions in ViewField

  jvega190

  committed
  e0790ff

  Copy full SHA for e0790ff

• [3941] Update MonacoWrapper to use monaco-editor/react

  jvega190

  committed
  51c25ed

  Copy full SHA for 51c25ed

Commits on Sep 20, 2024

• [3941] Refactor and created new component for item's diff state

  jvega190

  committed
  7c25706

  Copy full SHA for 7c25706

Commits on Sep 23, 2024

• [3941] Update jsdiff

  jvega190

  committed
  ed48536

  Copy full SHA for ed48536

• [3941] Fix View/Compare sub panels not showing content in xml view

  jvega190

  committed
  dc7e378

  Copy full SHA for dc7e378

• [3941] RepeatGroup items diff view, fix comparison between 2 multi-side items

  jvega190

  committed
  c9f8cd7

  Copy full SHA for c9f8cd7

• [3941] Monaco editor diff enhancements

  jvega190

  committed
  33429bb

  Copy full SHA for 33429bb

Commits on Sep 24, 2024

• [3941] Monaco diff editor/FieldVersionToolbar actions updates

  jvega190

  committed
  dc5e1b8

  Copy full SHA for dc5e1b8

• [3941] useMonacoOptions hook update, Update ItemViewVersion to use the hook

  jvega190

  committed
  00125e3

  Copy full SHA for 00125e3

• [3941] Remove diffArrays util

  jvega190

  committed
  35d3f98

  Copy full SHA for 35d3f98

• [3941] Add subViewPanel in ViewVersionDialog

  jvega190

  committed
  a0d224b

  Copy full SHA for a0d224b

• [3941] Fix comparison between embedded components with one of them null

  jvega190

  committed
  cca627f

  Copy full SHA for cca627f

Commits on Sep 25, 2024

• [3941] align viewField content to center, fix monaco editor options not applying to all editors

  jvega190

  committed
  3307b49

  Copy full SHA for 3307b49

• [3941] Disable compare option in HistoryDialog if only 1 version

  jvega190

  committed
  baa93fa

  Copy full SHA for baa93fa

• [3941] Fix Disable field not showing in Compare Versions Dialog

  jvega190

  committed
  2367ae2

  Copy full SHA for 2367ae2

• [3941] CompareVersionsDialog, unmount SubPanels content when closed

  jvega190

  committed
  1bc780a

  Copy full SHA for 1bc780a

Commits on Sep 26, 2024

• [3941] Enhance error handling (be able to recover) in compareVersionsDialogContainer

  jvega190

  committed
  2eabd33

  Copy full SHA for 2eabd33

• [3941] Revert getContentInstanceValueFromProp update as it is not needed

  jvega190

  committed
  da62b6f

  Copy full SHA for da62b6f

• [3941] Subpanel open, close only subpanel on escape

  jvega190

  committed
  9f2036d

  Copy full SHA for 9f2036d

• [3941] Update to show all fields in CompareVersionsDialog, highlight fields with changes, show ViewVersion for fields with no changes

  jvega190

  committed
  f0d7830

  Copy full SHA for f0d7830

• [3941] Allow viewing item version of unchanged items in node-selector and repeating group (CompareVersionsDialog)

  jvega190

  committed
  cc5586a

  Copy full SHA for cc5586a

• [3941] Show 'no content set' for empty node-selector

  jvega190

  committed
  7c39def

  Copy full SHA for 7c39def

• [3941] Update, send proper xml content to ViewField

  jvega190

  committed
  abafd0c

  Copy full SHA for abafd0c

Commits on Sep 27, 2024

• [3941] Add mechanics for displaying only fields with changes, include internal fields in diff

  jvega190

  committed
  a49deee

  Copy full SHA for a49deee

• [3941] include internal fields in view version dialog

  jvega190

  committed
  f9b0f27

  Copy full SHA for f9b0f27

Commits on Sep 30, 2024

• [3941] Show all fields in diff (with and without changes and add toggle button for it. Added accordion view with toggle button

  jvega190

  committed
  901df43

  Copy full SHA for 901df43

• View layout option buttons placement

  rart

  committed
  1da6dad

  Copy full SHA for 1da6dad

• [3941] Fix node selector embedded components issue with one of them being null

  jvega190

  committed
  5fa51aa

  Copy full SHA for 5fa51aa

• Ternary conditions flipped, small layout refactors, expand all accordions by default, remove accordion max height, remove sidebar secondary text bold for changed fields, button label updates

  rart

  committed
  c682efb

  Copy full SHA for c682efb

• [3941] Update disabled field parsing

  jvega190

  committed
  d095f16

  Copy full SHA for d095f16

• [3941] Rename convertTimeToTimezone util to convertUtcTimeToTimezone

  jvega190

  committed
  3f2092b

  Copy full SHA for 3f2092b

• [3941] Update convertUtcTimeToTimezone param names

  jvega190

  committed
  6eab358

  Copy full SHA for 6eab358

• [3941] Rename ViewField component to ContentFieldView

  jvega190

  committed
  b84a11c

  Copy full SHA for b84a11c

Commits on Oct 2, 2024

• Code refactors and design updates

  rart

  committed
  f89c1bf

  Copy full SHA for f89c1bf

• Unused var clean up

  rart

  committed
  505d139

  Copy full SHA for 505d139

• [3941] Make first selected field aware of all fields/changed fields selection

  jvega190

  committed
  1d14492

  Copy full SHA for 1d14492

• [3941] Keep selected field when changing between changed/all fields if they are still in list

  jvega190

  committed
  c77e22f

  Copy full SHA for c77e22f

• [3941] Move between fields with keyboard arrows (single field view)

  jvega190

  committed
  061c415

  Copy full SHA for 061c415

Commits on Oct 3, 2024

• [3941] Filter fields if showing only changed fields

  jvega190

  committed
  98e0566

  Copy full SHA for 98e0566

• [3941] Initial work to refactor toolbar for it to be able to be usable at accordion header

  jvega190

  committed
  059955d

  Copy full SHA for 059955d

• [3941] Move in-dialog slide-out panel to CompareVersionsDialog, check if crafter content before adding internalFields

  jvega190

  committed
  730ddb2

  Copy full SHA for 730ddb2

• [3941] Refactor toolbar to be able to be usable at the accordion header

  jvega190

  committed
  19beea7

  Copy full SHA for 19beea7

• [3941] Move viewVersionsContext to a separate file and use it in ViewVersionsDialog

  jvega190

  committed
  ec07a7d

  Copy full SHA for ec07a7d

• [3941] Fix editors not taking 100% height in single view, remove unused useMonacoOptions hook

  jvega190

  committed
  ce253d6

  Copy full SHA for ce253d6

• [3941] Update FieldAccordionPanel, so it can be used by ViewVersionDialog, add accordion mode to ViewVersionDialog

  jvega190

  committed
  57351a0

  Copy full SHA for 57351a0

• [3941] Update typings

  jvega190

  committed
  c4e3ef0

  Copy full SHA for c4e3ef0

• [3941] Allow ArrowUp/ArrowDown to change selected field in View/Compare Versions Dialog

  jvega190

  committed
  6b087ed

  Copy full SHA for 6b087ed

Commits on Oct 4, 2024

• [3941] Update var names

  jvega190

  committed
  5c04512

  Copy full SHA for 5c04512

• [3941] Add compare/view version dialogs view preferences to localStorage

  jvega190

  committed
  d6c3280

  Copy full SHA for d6c3280

• [3941] types

  jvega190

  committed
  2c18a5a

  Copy full SHA for 2c18a5a

• [3941] Add paths to image diff, fix layout

  jvega190

  committed
  a7f748e

  Copy full SHA for a7f748e

• [3941] Fix monacoEditorHeight not set properly on ContentFieldView

  jvega190

  committed
  0c8f02b

  Copy full SHA for 0c8f02b

Commits on Oct 7, 2024

• [3941] Update view version dialog to properly use viewSubDialogState

  jvega190

  committed
  6b6874b

  Copy full SHA for 6b6874b

• [3941] Update useVersionsDialogContext error message

  jvega190

  committed
  ef4004c

  Copy full SHA for ef4004c

• [3941] remove setExpanded dep from effect in FieldAccordionPanel

  jvega190

  committed
  8cd4320

  Copy full SHA for 8cd4320

• [3941] Update to use optional chaining

  jvega190

  committed
  82bb76f

  Copy full SHA for 82bb76f

• [3941] Update DiffCollectionItem prop names

  jvega190

  committed
  ebedd51

  Copy full SHA for ebedd51

• [3941] Update getContentInstanceValueFromProp to properly retrieve fileName value

  jvega190

  committed
  79969ae

  Copy full SHA for 79969ae

• [3941] Simplify getContentInstanceFileName

  jvega190

  committed
  72aa216

  Copy full SHA for 72aa216

• [3941] Update systemPropList and getContentInstanceValueFromProp to remove non-xml studio props

  jvega190

  committed
  a68c4b0

  Copy full SHA for a68c4b0

• [3941] Move default fields views components to their own files

  jvega190

  committed
  1e6ff0b

  Copy full SHA for 1e6ff0b

• [3941] Add docs in code

  jvega190

  committed
  6eda4c7

  Copy full SHA for 6eda4c7

• [3941] Update var name

  jvega190

  committed
  2c339ae

  Copy full SHA for 2c339ae

• [3941] Update VersionsDialogContext

  jvega190

  committed
  b438bfa

  Copy full SHA for b438bfa

Commits on Oct 8, 2024

• [3941] Remove areObjectsEqual util/usages and compare xml

  jvega190

  committed
  991aa80

  Copy full SHA for 991aa80

• [3941] Rollback contentTypeFields into VersionsDialogContext

  jvega190

  committed
  45a68e9

  Copy full SHA for 45a68e9

• [3941] Add controls for types views, modify default view for types view

  jvega190

  committed
  8881163

  Copy full SHA for 8881163

• [3941] Add controls for types diff views

  jvega190

  committed
  22be475

  Copy full SHA for 22be475

• [3941] Remove MonacoWrapper and create TextView and TextDiffView

  jvega190

  committed
  26a0cf2

  Copy full SHA for 26a0cf2

Commits on Oct 9, 2024

• [3941] Update viewComponents to receive xml instead of parsed content

  jvega190

  committed
  5a00561

  Copy full SHA for 5a00561

• [3941] Update viewDiffComponents to receive xml instead of parsed content, remove areObjectsEqual util

  jvega190

  committed
  4f41106

  Copy full SHA for 4f41106

• [3941] Add ViewComponentProps

  jvega190

  committed
  bdc3d89

  Copy full SHA for bdc3d89

• [3941] Add FileNameView and FileNameDiffView, remove/resolve some TODOs

  jvega190

  committed
  9d831b2

  Copy full SHA for 9d831b2

• [3941] Fix internalFields not showing in ViewVersionDialog

  jvega190

  committed
  b9a4471

  Copy full SHA for b9a4471

• [3941] Fix image view styles

  jvega190

  committed
  665fe60

  Copy full SHA for 665fe60

• [3941] Properly map field types to monaco editor languages in TextView/TextDiffView

  jvega190

  committed
  56d6c3b

  Copy full SHA for 56d6c3b

• [3941] Rollback showOnlyChanges and accordionView from Context as they can't be shared between dialog and slideouts

  jvega190

  committed
  738f716

  Copy full SHA for 738f716

• [3941] Rollback accordionView from Context - ViewVersionDialog update

  jvega190

  committed
  756709f

  Copy full SHA for 756709f

• [3941] Validate editorProps on TextDiffView

  jvega190

  committed
  5e29707

  Copy full SHA for 5e29707

• [3941] Disable keyboard navigation for root dialog when opening slideout

  jvega190

  committed
  972fa8a

  Copy full SHA for 972fa8a

• [3941] Fix embedded content showing as 'changed' when they were 'new' or 'deleted' in Node selector diff

  jvega190

  committed
  af5091a

  Copy full SHA for af5091a

Commits on Oct 10, 2024

• [3941] Check for valid date in DateTimeView

  jvega190

  committed
  d2b19e3

  Copy full SHA for d2b19e3

• [3941] Add emptyState for no changes in content-type fields, update View/Compare Dialogs and slideouts content/xml modes actions

  jvega190

  committed
  7b681bf

  Copy full SHA for 7b681bf

• [3941] Update no content diff emptyState message

  jvega190

  committed
  e279127

  Copy full SHA for e279127

• [3941] Pass editorProps to TextDiffView in DefaultDiffView

  jvega190

  committed
  3707a12

  Copy full SHA for 3707a12

Commits on Oct 28, 2024

• [3941] Import react in fields view components

  jvega190

  committed
  70620bf

  Copy full SHA for 70620bf

• [3941] Support assets diff

  jvega190

  committed
  4386328

  Copy full SHA for 4386328

Commits on Oct 29, 2024

• [3941] Add CompareAssetPanel and PDFView files

  jvega190

  committed
  b75c614

  Copy full SHA for b75c614

Commits on Nov 6, 2024

• Merge branch 'develop' of https://github.com/craftercms/studio-ui into feature/3941-sidebar

  Show description for e4313f7
  jvega190

  committed
  e4313f7

  Copy full SHA for e4313f7

• [3941] Yarn.lock update (build after merge)

  jvega190

  committed
  3a30691

  Copy full SHA for 3a30691

Commits on Nov 14, 2024

• Merge branch 'develop' of https://github.com/craftercms/studio-ui into feature/3941-sidebar

  Show description for f18b374
  jvega190

  committed
  f18b374

  Copy full SHA for f18b374

• [3941] Build after merge, update @types/diff

  jvega190

  committed
  13e472e

  Copy full SHA for 13e472e

• [3941] Update getEmbeddedVersions to return null if version doesn't exist

  jvega190

  committed
  62a4326

  Copy full SHA for 62a4326

• [3941] center align assets comparison

  jvega190

  committed
  83a31c3

  Copy full SHA for 83a31c3

Commits on Nov 19, 2024

• Merge branch 'develop' of https://github.com/craftercms/studio-ui into feature/3941-sidebar

  Show description for 7f680e0
  jvega190

  committed
  7f680e0

  Copy full SHA for 7f680e0

Commits on Nov 20, 2024

• [3941] Send proper embedded xml in onViewEmbedded

  jvega190

  committed
  9ec09e5

  Copy full SHA for 9ec09e5

• [7123] Center ImageDiffView content

  jvega190

  committed
  3cd4780

  Copy full SHA for 3cd4780

• [3941] Close other slides when opening new

  jvega190

  committed
  198355f

  Copy full SHA for 198355f

• [3941] Validate possible field not existing in TextView

  jvega190

  committed
  afbbaa2

  Copy full SHA for afbbaa2