Skip to content

Commit bf92e2a

Browse files
[#464] Improve js
1 parent 2577dae commit bf92e2a

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/objects/js/components/admin/permissions/permission-form.js

+5-6
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@ const PermissionForm = ({objectFields, tokenChoices, objecttypeChoices, modeChoi
1313
values["fields"] = "{}"
1414
}
1515

16-
const [fields, setFields] = useState( JSON.parse(values["fields"]) || {})
16+
const [fields, setFields] = useState( JSON.parse(values["fields"]) || {} )
1717
const [dataFieldChoices, setDataFieldChoices] = useState(dataFieldChoices);
1818

1919
const fetchObjecttypeVersions = (objecttype_id) => {
20-
fetch(`/admin/core/objecttype/`+ objecttype_id +`/versions/`, {
20+
fetch(`/admin/core/objecttype/${objecttype_id}/_versions/`, {
2121
method: 'GET',
2222
})
2323
.then(response => response.json())
2424
.then(response_data => {
25-
if (response_data?.results?.length > 0) {
25+
if (response_data?.length > 0) {
2626
const objecttypes = {
27-
[objecttype_id]: response_data.results.reduce((acc, version) => {
27+
[objecttype_id]: response_data.reduce((acc, version) => {
2828
const properties = Object.keys(version?.jsonSchema?.properties || {});
2929
acc[version.version] = properties.reduce((propsAcc, prop) => {
3030
propsAcc[prop] = `record__data__${prop}`;
@@ -69,7 +69,6 @@ const PermissionForm = ({objectFields, tokenChoices, objecttypeChoices, modeChoi
6969
errors={errors["object_type"]}
7070
onChange={(value) => {
7171
setObjectType(value);
72-
fetchObjecttypeVersions(value);
7372
setFields({});
7473
}}
7574
/>
@@ -98,7 +97,7 @@ const PermissionForm = ({objectFields, tokenChoices, objecttypeChoices, modeChoi
9897
name="use_fields"
9998
id="id_use_fields"
10099
label="Use field-based authorization"
101-
disabled={!mode || mode === "read_and_write"}
100+
disabled={!mode || mode === "read_and_write" || Object.keys(dataFieldChoices || {}).length === 0}
102101
value={useFields}
103102
onChange={(value) => {setUseFields(value)}}
104103
/>

0 commit comments

Comments
 (0)