From e04189b802abe33167293f37b86f25d883d1411e Mon Sep 17 00:00:00 2001 From: LukasBoll Date: Thu, 6 Jul 2023 18:10:22 +0200 Subject: [PATCH 1/7] change path to JSON pointer --- .../library/layouts/array-layout.renderer.ts | 2 +- .../src/library/other/master-detail/master.ts | 7 ++- .../src/library/other/table.renderer.ts | 2 +- .../test/master-detail.spec.ts | 6 +- packages/core/src/i18n/i18nUtil.ts | 3 +- packages/core/src/reducers/core.ts | 16 +++-- packages/core/src/reducers/i18n.ts | 26 ++++++++- packages/core/src/store/jsonFormsCore.ts | 2 +- packages/core/src/util/errors.ts | 12 +--- packages/core/src/util/path.ts | 42 ++++++++++---- packages/core/src/util/resolvers.ts | 2 +- packages/core/src/util/util.ts | 5 +- packages/core/test/i18n/i18nUtil.test.ts | 20 +++---- packages/core/test/mappers/cell.test.ts | 12 ++-- packages/core/test/mappers/renderer.test.ts | 15 ++--- packages/core/test/reducers/core.test.ts | 58 +++++++++---------- packages/core/test/util/path.test.ts | 46 +++++++-------- packages/core/test/util/resolvers.test.ts | 2 +- packages/examples/src/examples/object.ts | 9 ++- .../complex/MaterialArrayControlRenderer.tsx | 2 +- .../src/complex/MaterialEnumArrayRenderer.tsx | 2 +- .../src/complex/MaterialTableControl.tsx | 6 +- .../renderers/MaterialBooleanCell.test.tsx | 33 ++++++----- .../MaterialBooleanToggleCell.test.tsx | 28 ++++----- .../test/renderers/MaterialDateCell.test.tsx | 26 ++++----- .../test/renderers/MaterialEnumCell.test.tsx | 2 +- .../renderers/MaterialEnumControl.test.tsx | 2 +- .../renderers/MaterialIntegerCell.test.tsx | 28 ++++----- .../renderers/MaterialNumberCell.test.tsx | 28 ++++----- .../renderers/MaterialOneOfEnumCell.test.tsx | 2 +- .../test/renderers/MaterialTextCell.test.tsx | 44 +++++++------- .../test/renderers/MaterialTimeCell.test.tsx | 22 +++---- packages/react/test/JsonFormsContext.test.tsx | 4 +- .../src/complex/TableArrayControl.tsx | 12 ++-- .../test/renderers/BooleanCell.test.tsx | 28 ++++----- .../test/renderers/DateCell.test.tsx | 26 ++++----- .../test/renderers/DateTimeCell.test.tsx | 28 ++++----- .../test/renderers/EnumCell.test.tsx | 22 +++---- .../test/renderers/IntegerCell.test.tsx | 28 ++++----- .../test/renderers/NumberCell.test.tsx | 28 ++++----- .../test/renderers/SliderCell.test.tsx | 28 ++++----- .../test/renderers/TextAreaCell.test.tsx | 44 +++++++++----- .../test/renderers/TextCell.test.tsx | 46 +++++++-------- .../test/renderers/TimeCell.test.tsx | 28 ++++----- 44 files changed, 453 insertions(+), 381 deletions(-) diff --git a/packages/angular-material/src/library/layouts/array-layout.renderer.ts b/packages/angular-material/src/library/layouts/array-layout.renderer.ts index 3106d8ab1..2be91554d 100644 --- a/packages/angular-material/src/library/layouts/array-layout.renderer.ts +++ b/packages/angular-material/src/library/layouts/array-layout.renderer.ts @@ -243,7 +243,7 @@ export class ArrayLayoutRenderer } return { schema: this.scopedSchema, - path: Paths.compose(this.propsPath, `${index}`), + path: Paths.compose(this.propsPath, `/${index}`), uischema, }; } diff --git a/packages/angular-material/src/library/other/master-detail/master.ts b/packages/angular-material/src/library/other/master-detail/master.ts index d50d4f092..6bce50391 100644 --- a/packages/angular-material/src/library/other/master-detail/master.ts +++ b/packages/angular-material/src/library/other/master-detail/master.ts @@ -94,7 +94,7 @@ export const removeSchemaKeywords = (path: string) => {