Skip to content

Commit 644f851

Browse files
czwe-01czwe-01
committed
Merge branch 'main' into thulasizwe/en/panel
2 parents 55fe772 + 08e52a4 commit 644f851

File tree

75 files changed

+573
-2105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+573
-2105
lines changed

‎shesha-reactjs/src/components/buttonGroupConfigurator/itemGroupSettings.ts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ export const getGroupSettings = (data) => {
3434
.addSettingsInputRow({
3535
id: 'label-tooltip-s4gmBg31azZC0UjZjpfTm',
3636
parentId: 's4gmBg31azZC0UjZjpfTm',
37-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
3837
inputs: [
3938
{
4039
id: "A-qcRVk-qlnGDLtFvK-2X",
@@ -58,7 +57,6 @@ export const getGroupSettings = (data) => {
5857
.addSettingsInputRow({
5958
id: 'icon-drop-icon-s4gmBg31azZC0UjZjpfTm',
6059
parentId: 's4gmBg31azZC0UjZjpfTm',
61-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
6260
inputs: [
6361
{
6462
id: "XZ_7OvzMkfC3GEzzrduwu",
@@ -97,7 +95,6 @@ export const getGroupSettings = (data) => {
9795
.addSettingsInputRow({
9896
id: '12d700d6-ed4d-49d5-9cfd-fe8f0060f3b6',
9997
parentId: 's4gmBg31azZC0UjZjpfTm',
100-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
10198
inputs: [
10299
{
103100
type: 'editModeSelector',
@@ -133,7 +130,6 @@ export const getGroupSettings = (data) => {
133130
id: '6Vw9iiDw9d0MD_Rh5cbIn',
134131
components: [...new DesignerToolbarSettings()
135132
.addSettingsInput({
136-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
137133
id: '1adea529-1f0c-4def-bd41-ee166a5dfcd7',
138134
inputType: 'permissions',
139135
propertyName: 'permissions',

‎shesha-reactjs/src/components/buttonGroupConfigurator/itemSettings.ts‎

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ export const getItemSettings = (data) => {
6363
.addSettingsInputRow({
6464
id: 'name-8b38-4b82-b192-563259afc159',
6565
parentId: 'common-button-settings-container',
66-
readOnly: data?.readOnly,
6766
inputs: [{
6867
id: 'name-8b38-4b82-b192-563259afc159',
6968
type: 'textField',
@@ -78,7 +77,6 @@ export const getItemSettings = (data) => {
7877
.addSettingsInputRow({
7978
id: 'label-tooltip-s4gmBg31azZC0UjZjpfTm',
8079
parentId: 'common-button-settings-container',
81-
readOnly: data?.readOnly,
8280
hidden: data?.itemSubType !== 'button',
8381
inputs: [
8482
{
@@ -134,12 +132,10 @@ export const getItemSettings = (data) => {
134132
} as any
135133
},
136134
],
137-
readOnly: data.readOnly,
138135
})
139136
.addSettingsInputRow({
140137
id: '12d700d6-ed4d-49d5-9cfd-fe8f0060f3b6',
141138
parentId: 'common-button-settings-container',
142-
readOnly: data?.readOnly,
143139
inputs: [
144140
{
145141
type: 'editModeSelector',
@@ -173,7 +169,7 @@ export const getItemSettings = (data) => {
173169
.addSettingsInputRow({
174170
id: 'dynamic-items-config-8b38-4b82-b192-563259afc159',
175171
parentId: 's4gmBg31azZC0UjZjpfTm',
176-
readOnly: false,
172+
177173
hidden: {
178174
_code: 'return getSettingValue(data?.itemSubType) !== "dynamic";',
179175
_mode: 'code',
@@ -236,8 +232,7 @@ export const getItemSettings = (data) => {
236232
parentId: 'fontStylePnl',
237233
inline: true,
238234
propertyName: 'font',
239-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
240-
inputs: [
235+
inputs: [
241236
{
242237
type: 'dropdown',
243238
id: 'fontFamily-s4gmBg31azZC0UjZjpfTm',
@@ -301,8 +296,7 @@ export const getItemSettings = (data) => {
301296
id: 'dimensionsStyleRowWidth',
302297
parentId: 'dimensionsStylePnl',
303298
inline: true,
304-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
305-
inputs: [
299+
inputs: [
306300
{
307301
type: 'textField',
308302
id: 'dimensionsStyleRowWidth',
@@ -337,8 +331,7 @@ export const getItemSettings = (data) => {
337331
id: 'dimensionsStyleRowHeight',
338332
parentId: 'dimensionsStylePnl',
339333
inline: true,
340-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
341-
inputs: [
334+
inputs: [
342335
{
343336
type: 'textField',
344337
id: 'dimensionsStyleRowHeight',
@@ -388,7 +381,6 @@ export const getItemSettings = (data) => {
388381
id: `borderStyleRow`,
389382
parentId: 'borderStylePnl',
390383
hidden: { _code: 'return !getSettingValue(data?.border?.hideBorder);', _mode: 'code', _value: false } as any,
391-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
392384
inputs: [
393385
{
394386
type: 'button',
@@ -439,8 +431,7 @@ export const getItemSettings = (data) => {
439431
defaultValue: "color",
440432
tooltip: "Select a type of background",
441433
buttonGroupOptions: backgroundTypeOptions,
442-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
443-
})
434+
})
444435
.addSettingsInputRow({
445436
id: "backgroundStyleRow-color",
446437
parentId: "backgroundStylePnl",
@@ -453,8 +444,7 @@ export const getItemSettings = (data) => {
453444
jsSetting: false,
454445
}],
455446
hidden: { _code: 'return getSettingValue(data?.background?.type) !== "color";', _mode: 'code', _value: false } as any,
456-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
457-
})
447+
})
458448
.addSettingsInputRow({
459449
id: "backgroundStyle-gradientColors",
460450
parentId: "backgroundStylePnl",
@@ -468,8 +458,7 @@ export const getItemSettings = (data) => {
468458
],
469459
hidden: { _code: 'return getSettingValue(data?.background?.type) !== "gradient";', _mode: 'code', _value: false } as any,
470460
hideLabel: true,
471-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
472-
})
461+
})
473462
.addSettingsInputRow({
474463
id: "backgroundStyle-url",
475464
parentId: "backgroundStylePnl",
@@ -481,8 +470,7 @@ export const getItemSettings = (data) => {
481470
label: "URL",
482471
}],
483472
hidden: { _code: 'return getSettingValue(data?.background?.type) !== "url";', _mode: 'code', _value: false } as any,
484-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
485-
})
473+
})
486474
.addSettingsInputRow({
487475
id: "backgroundStyle-image",
488476
parentId: 'backgroundStylePnl',
@@ -494,14 +482,12 @@ export const getItemSettings = (data) => {
494482
jsSetting: false,
495483
}],
496484
hidden: { _code: 'return getSettingValue(data?.background?.type) !== "image";', _mode: 'code', _value: false } as any,
497-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
498-
})
485+
})
499486
.addSettingsInputRow({
500487
id: "backgroundStyleRow-storedFile",
501488
parentId: 'backgroundStylePnl',
502489
hidden: { _code: 'return getSettingValue(data?.background?.type) !== "storedFile";', _mode: 'code', _value: false } as any,
503-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
504-
inputs: [
490+
inputs: [
505491
{
506492
type: 'textField',
507493
id: 'backgroundStyle-storedFile',
@@ -516,8 +502,7 @@ export const getItemSettings = (data) => {
516502
parentId: 'backgroundStyleRow',
517503
inline: true,
518504
hidden: { _code: 'return getSettingValue(data?.background?.type) === "color";', _mode: 'code', _value: false } as any,
519-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
520-
inputs: [
505+
inputs: [
521506
{
522507
type: 'customDropdown',
523508
id: 'backgroundStyleRow-size',
@@ -541,8 +526,7 @@ export const getItemSettings = (data) => {
541526
.addSettingsInputRow({
542527
id: 'backgroundStyleRow-repeat',
543528
parentId: 'backgroundStyleRow',
544-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
545-
inputs: [{
529+
inputs: [{
546530
type: 'radio',
547531
id: 'backgroundStyleRow-repeat-radio',
548532
label: 'Repeat',
@@ -573,8 +557,7 @@ export const getItemSettings = (data) => {
573557
id: 'shadowStyleRow',
574558
parentId: 'shadowStylePnl',
575559
inline: true,
576-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
577-
inputs: [
560+
inputs: [
578561
{
579562
type: 'numberField',
580563
id: 'shadowStyleRow-offsetX',
@@ -660,8 +643,7 @@ export const getItemSettings = (data) => {
660643
id: 'stylePnl-M500-911MFR',
661644
components: [...new DesignerToolbarSettings()
662645
.addSettingsInput({
663-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
664-
id: 'custom-css-412c-8461-4c8d55e5c073',
646+
id: 'custom-css-412c-8461-4c8d55e5c073',
665647
inputType: 'codeEditor',
666648
propertyName: 'style',
667649
hideLabel: false,
@@ -680,7 +662,6 @@ export const getItemSettings = (data) => {
680662
id: '6Vw9iiDw9d0MD_Rh5cbIn',
681663
components: [...new DesignerToolbarSettings()
682664
.addSettingsInput({
683-
readOnly: data.readOnly,
684665
id: '1adea529-1f0c-4def-bd41-ee166a5dfcd7',
685666
inputType: 'permissions',
686667
propertyName: 'permissions',

‎shesha-reactjs/src/components/configurableSidebarMenu/configurator/groupSettings.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ export const getGroupSettings = (data: any) => {
6868
id: securityTabId,
6969
components: [...new DesignerToolbarSettings()
7070
.addSettingsInput({
71-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
7271
id: nanoid(),
7372
inputType: 'permissions',
7473
propertyName: 'requiredPermissions',

‎shesha-reactjs/src/components/configurableSidebarMenu/configurator/itemSettings.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ export const getItemSettings = (data: any) => {
115115
id: securityTabId,
116116
components: [...new DesignerToolbarSettings()
117117
.addSettingsInput({
118-
readOnly: { _code: 'return getSettingValue(data?.readOnly);', _mode: 'code', _value: false } as any,
119118
id: nanoid(),
120119
inputType: 'permissions',
121120
propertyName: 'requiredPermissions',

0 commit comments

Comments
 (0)