This commit is contained in:
2024-09-28 17:37:29 +02:00
parent 8dfafa9404
commit fb4d566007
64 changed files with 32325 additions and 573 deletions
@@ -0,0 +1,93 @@
# Generated by Django 5.1.1 on 2024-09-28 07:37
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("items", "0002_item_custom_identifier_and_more"),
]
operations = [
migrations.AlterField(
model_name="item",
name="custom_identifier",
field=models.TextField(blank=True, max_length=2048, null=True),
),
migrations.AlterField(
model_name="itemrelation",
name="custom_identifier",
field=models.TextField(blank=True, max_length=2048, null=True),
),
migrations.AlterField(
model_name="itemrelation",
name="description",
field=models.TextField(blank=True, max_length=2048, null=True),
),
migrations.AlterField(
model_name="itemrelation",
name="name",
field=models.TextField(blank=True, max_length=2048, null=True),
),
migrations.AlterField(
model_name="itemtype",
name="custom_identifier",
field=models.TextField(blank=True, max_length=2048, null=True),
),
migrations.AlterField(
model_name="itemtype",
name="description",
field=models.TextField(blank=True, max_length=2048, null=True),
),
migrations.AlterField(
model_name="itemtype",
name="name",
field=models.TextField(blank=True, max_length=2048, null=True),
),
migrations.AlterField(
model_name="linkedproperty",
name="custom_identifier",
field=models.TextField(blank=True, max_length=2048, null=True),
),
migrations.AlterField(
model_name="linkedproperty",
name="description",
field=models.TextField(blank=True, max_length=2048, null=True),
),
migrations.AlterField(
model_name="linkedproperty",
name="name",
field=models.TextField(blank=True, max_length=2048, null=True),
),
migrations.AlterField(
model_name="property",
name="custom_identifier",
field=models.TextField(blank=True, max_length=2048, null=True),
),
migrations.AlterField(
model_name="property",
name="description",
field=models.TextField(blank=True, max_length=2048, null=True),
),
migrations.AlterField(
model_name="property",
name="name",
field=models.TextField(blank=True, max_length=2048, null=True),
),
migrations.AlterField(
model_name="relationproperty",
name="custom_identifier",
field=models.TextField(blank=True, max_length=2048, null=True),
),
migrations.AlterField(
model_name="relationproperty",
name="description",
field=models.TextField(blank=True, max_length=2048, null=True),
),
migrations.AlterField(
model_name="relationproperty",
name="name",
field=models.TextField(blank=True, max_length=2048, null=True),
),
]
@@ -0,0 +1,35 @@
# Generated by Django 5.1.1 on 2024-09-28 11:05
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("items", "0003_alter_item_custom_identifier_and_more"),
]
operations = [
migrations.AlterField(
model_name="property",
name="type",
field=models.CharField(
choices=[
("text", "Text"),
("date", "Date"),
("datetime", "Date & time"),
("time", "Time"),
("duration", "Duration"),
("uuid", "UUID"),
("number", "Number"),
("float", "Float"),
("boolean", "Boolean"),
("email", "Email"),
("ip", "IP address"),
("json", "JSON"),
],
default="text",
max_length=32,
),
),
]
+19 -18
View File
@@ -1,6 +1,8 @@
from app.utils.models import BaseModel
from django.contrib.auth.forms import gettext as _
from django.db import models
from app.utils.models import BaseModel
from users.models import UserSettings
@@ -16,21 +18,14 @@ class ItemBase(BaseModel):
class ItemType(ItemBase):
name = models.TextField(max_length=2048)
description = models.TextField(max_length=2048)
pass
class ItemRelation(ItemBase):
parent = models.ForeignKey(
"items.Item", on_delete=models.CASCADE, related_name="children"
)
child = models.ForeignKey(
"items.Item", on_delete=models.CASCADE, related_name="parents"
)
parent = models.ForeignKey("items.Item", on_delete=models.CASCADE, related_name="children")
child = models.ForeignKey("items.Item", on_delete=models.CASCADE, related_name="parents")
properties = models.ManyToManyField(
"items.Property", through="items.RelationProperty", related_name="relations"
)
properties = models.ManyToManyField("items.Property", through="items.RelationProperty", related_name="relations")
class Item(ItemBase):
@@ -54,13 +49,21 @@ class PropertyType(models.TextChoices):
TEXT = "text", _("Text")
DATE = "date", _("Date")
DATETIME = "datetime", _("Date & time")
TIME = "time", _("Time")
DURATION = "duration", _("Duration")
UUID = "uuid", _("UUID")
NUMBER = "number", _("Number")
FLOAT = "float", _("Float")
BOOLEAN = "boolean", _("Boolean")
EMAIL = "email", _("Email")
IP = "ip", _("IP address")
JSON = "json", _("JSON")
# TODO: Add more property types (location, etc)
class Property(ItemBase):
type = models.CharField(
max_length=32, choices=PropertyType.choices, default=PropertyType.TEXT
)
type = models.CharField(max_length=32, choices=PropertyType.choices, default=PropertyType.TEXT)
class BaseLinkedProperty(ItemBase):
@@ -74,9 +77,7 @@ class BaseLinkedProperty(ItemBase):
class LinkedProperty(BaseLinkedProperty):
item = models.ForeignKey(
Item, on_delete=models.CASCADE, null=True, related_name="linked_properties"
)
item = models.ForeignKey(Item, on_delete=models.CASCADE, null=True, related_name="linked_properties")
class RelationProperty(BaseLinkedProperty):
@@ -0,0 +1,51 @@
{% load i18n %}
<div>
<div class="card mt-4 pt-2 ps-lg-2">
<h5 class="card-header">{% trans "Properties" %} [[ this.$route.params.id ]]</h5>
<div class="card-body">
<PropertyList
:items="properties"
:items_headers="properties_headers"
:items_relations="{}"
:hidden_fields="[]"
group_by="type"
@deleteItem="deleteItem"
@createItem="createItem"
@editItem="editItem"
></PropertyList>
</div>
</div>
<div class="card mt-4 pt-2 ps-lg-2">
<h5 class="card-header">{% trans "Children" %}</h5>
<div class="card-body">
<ItemRelationList
:items="children"
:items_headers="children_headers"
:items_relations="{}"
:hidden_fields="['parent__name']"
group_by="type__name"
@deleteItem="deleteItem"
@createItem="createItem"
@editItem="editItem"
></ItemRelationList>
</div>
</div>
<div class="card mt-4 pt-2 ps-lg-2">
<h5 class="card-header">{% trans "Parents" %}</h5>
<div class="card-body">
<ItemRelationList
:items="parents"
:items_headers="parents_headers"
:items_relations="{}"
:hidden_fields="['child__name']"
group_by="type__name"
@deleteItem="deleteItem"
@createItem="createItem"
@editItem="editItem"
></ItemRelationList>
</div>
</div>
</div>
@@ -0,0 +1,97 @@
ItemDetail = {
template: "#ItemDetail",
router_path: "/ItemDetail/:id",
delimiters: ["[[", "]]"],
data: function() {
return {
properties: [],
linked_properties: [],
children: [],
parents: [],
// TODO: Also remove this tedious things
properties_headers: [],
linked_properties_headers: [],
children_headers: [],
parents_headers: [],
}
},
computed: {
// TODO: Remove this by a generic things at some points, this become tedious and repetitive
properties_efields: function() {
return this.properties_headers.filter(e => e.encrypted).map(e => e.value)
},
linked_properties_efields: function() {
return this.linked_properties_headers.filter(e => e.encrypted).map(e => e.value)
},
children_efields: function() {
return this.children_headers.filter(e => e.encrypted).map(e => e.value)
},
parents_efields: function() {
return this.parents_headers.filter(e => e.encrypted).map(e => e.value)
},
},
mounted: function() {
this.reload()
},
methods: {
async reload () {
try {
const response = await this.$http.get(Urls["items:details"](this.$route.params.id))
this.properties_headers = response.data.properties_headers
this.linked_properties_headers = response.data.linked_properties_headers
this.children_headers = response.data.children_headers
this.parents_headers = response.data.parents_headers
// TODO: TEDIOUUUUUS
response.data.parents.forEach(async e => {
this.parents.push(await this.decryptObject(this.parents_efields, e))
})
response.data.children.forEach(async e => {
this.children.push(await this.decryptObject(this.children_efields, e))
})
response.data.properties.forEach(async e => {
this.properties.push(await this.decryptObject(this.properties_efields, e))
})
response.data.linked_properties.forEach(async e => {
this.linked_properties.push(await this.decryptObject(this.linked_properties_efields, e))
})
} catch (err) {
Swal.fire({title: "{{_('Error during loading of items') | escapejs}}", icon: "error", position:"top-end", showConfirmButton: false, toast: true, timer: 1000})
throw err
}
},
async deleteItem () {
},
async createItem () {
},
async editItem() {
},
}
}
@@ -3,5 +3,6 @@
{% block component %}
{% define 'items' 'items' %}
{% define 'show_url' 'ItemDetail' %}
{{ block.super }}
{% endblock %}
@@ -0,0 +1 @@
<div>[[ this.$route.params.id ]]</div>
@@ -0,0 +1,26 @@
ItemRelationDetail = {
template: "#ItemRelationDetail",
router_path: "/ItemRelationDetail/:id",
delimiters: ["[[", "]]"],
data: function() {
return {
data: null
}
},
mounted: function() {
this.reload()
},
methods: {
async reload () {
const response = await this.$http.get(Urls["items:relation.details"](this.$route.params.id))
}
}
}
@@ -0,0 +1 @@
{% extends "base_components/glist/template.html" %}
@@ -0,0 +1,9 @@
{% extends "base_components/glist/vue.js" %}
{% load main %}
{% block component %}
{% define 'items' 'items' %}
{% define 'default_hidden_fields' 'name' 'description' %}
{% define 'show_url' 'ItemRelationDetail' %}
{{ block.super }}
{% endblock %}
@@ -6,10 +6,10 @@
<div class="card-body">
<ItemList
:crypto_key="crypto_key"
:items="items"
:items_headers="items_headers"
:items_relations="{'type': types}"
:hidden_fields="[]"
group_by="type__name"
@deleteItem="deleteItem"
@createItem="createItem"
@@ -24,10 +24,10 @@
<div class="card-body">
<ItemList
:crypto_key="crypto_key"
:items="types"
:items_headers="types_headers"
:items_relations="{}"
:hidden_fields="[]"
group_by="[]"
@deleteItem="deleteType"
@createItem="createType"
+107 -172
View File
@@ -1,17 +1,15 @@
ItemView = {
template: "#ItemView",
router_path: "/ItemView",
delimiters: ["[[", "]]"],
props: ["crypto_key"],
props: [],
data: function() {
return {
search: "",
items: [],
items_headers: [],
items_relations: [],
types: [],
types_headers: [],
types_relations: [],
}
},
@@ -20,262 +18,199 @@ ItemView = {
},
computed: {
items_encrypted_fields: function() {
items_efields: function() {
return this.items_headers.filter(e => e.encrypted).map(e => e.value)
},
types_encrypted_fields: function() {
types_efields: function() {
return this.types_headers.filter(e => e.encrypted).map(e => e.value)
},
},
methods: {
reload () {
async reload () {
var self = this
try {
const response = await this.$http.get(Urls["items:list"]())
this.$http.get(Urls["items:list"]()).then(response => {
this.items_headers = response.data.result.items_headers
this.types_headers = response.data.result.types_headers
Object.keys(response.data.result).forEach(name => {
self.$set(self, name, response.data.result[name])
// Decrypt all item the push
response.data.result.items.forEach(async item => {
const new_item = await this.decryptObject(this.items_efields, item)
this.items.push(new_item)
})
self.items.forEach(item => {
self.decryptObject(self.items_encrypted_fields, item)
// Decrypt all type the push
response.data.result.types.forEach(async type => {
const new_type = await this.decryptObject(this.types_efields, type)
this.types.push(new_type)
})
self.types.forEach(type => {
self.decryptObject(self.types_encrypted_fields, type)
})
}).catch(err => {
} catch (err) {
Swal.fire({title: "{{_('Error during loading of items') | escapejs}}", icon: "error", position:"top-end", showConfirmButton: false, toast: true, timer: 1000})
})
}
},
async aDecryptObject (encrypted_fields, obj) {
async object_edit(url_edit, url_create, encrypted_fields, method, obj) {
var self = this
let url = null
return new Promise((resolve) => {
if (obj.id == undefined || obj.id == null) {
url = Urls[url_create]()
} else {
url = Urls[url_edit](obj.id)
}
let promises = encrypted_fields.map(field => {
// Encrypt all necessary fields
if (obj[field] == null) {
return null
}
try {
return new Promise((resolve) => {
return decryptWithKey(self.crypto_key, obj[field]).then(dec => {
resolve({field: field, value: dec})
})
})
const newobj = await this.encryptObject(encrypted_fields, obj)
const response = await this.$http[method](url, newobj)
}).filter(e => e != null)
Promise.all(promises).then(values => {
values.forEach(value => {
obj[value.field] = value.value
})
resolve(obj)
})
})
},
decryptObject (encrypted_fields, obj) {
var self = this
return new Promise((resolve) => {
let promises = encrypted_fields.map(field => {
// Encrypt all necessary fields
if (obj[field] == null) {
return null
}
return new Promise((resolve) => {
return decryptWithKey(self.crypto_key, obj[field]).then(dec => {
resolve({field: field, value: dec})
})
})
}).filter(e => e != null)
Promise.all(promises).then(values => {
values.forEach(value => {
obj[value.field] = value.value
})
resolve(obj)
})
})
},
object_edition (url_edit, url_create, encrypted_fields, method, obj) {
// Return a Promise
var self = this
return new Promise((resolve) => {
let url = Urls[url_edit](obj.id)
if (obj.id == undefined || obj.id == null) {
url = Urls[url_create]()
if (method != "delete") {
return await this.decryptObject(encrypted_fields, response.data.object)
}
let promises = encrypted_fields.map(field => {
// Encrypt all necessary fields
if (obj[field] == null) {
return null
}
} catch (err) {
return new Promise((resolve) => {
return encryptWithKey(self.crypto_key, obj[field]).then(enc => {
resolve({field: field, value: enc})
})
})
let msg = "{{_('Error during edition') | escapejs}}"
if (method == "delete") {
msg = "{{_('Error during deletion') | escapejs}}"
}
}).filter(e => e != null)
Swal.fire({title: msg, icon: "error", position:"top-end", showConfirmButton: false, toast: true, timer: 1000})
Promise.all(promises).then(values => {
throw err
values.forEach(value => {
obj[value.field] = value.value
})
}
self.$http[method](url, obj).then(response => {
if (method == "delete") {
resolve()
} else {
self.decryptObject(encrypted_fields, response.data.object).then(new_obj => {
resolve(new_obj)
})
}
}).catch(err => {
let msg = "{{_('Error during edition') | escapejs}}"
if (method == "delete") {
msg = "{{_('Error during deletion') | escapejs}}"
}
Swal.fire({title: msg, icon: "error", position:"top-end", showConfirmButton: false, toast: true, timer: 1000})
})
})
})
},
item_edition (method, item) {
return this.object_edition("items:edit", "items:create", this.items_encrypted_fields, method, item)
return this.object_edit("items:edit", "items:create", this.items_efields, method, item)
},
type_edition (method, item) {
return this.object_edition("items:type.edit", "items:type.create", this.items_encrypted_fields, method, item)
return this.object_edit("items:type.edit", "items:type.create", this.types_efields, method, item)
},
createItem (item) {
async createItem (item) {
var self = this
try {
this.item_edition("post", item).then(new_item => {
self.items.push(new_item)
const new_item = await this.item_edition("post", item)
this.items.push(new_item)
Swal.fire({title: "{{_('Item successfully created!') | escapejs}}", icon: "success", position:"top-end", showConfirmButton: false, toast: true, timer: 1000})
})
} catch (err) {
}
},
editItem (index, item) {
async editItem (index, item) {
var self = this
try {
this.item_edition("post", item).then(new_item => {
// Remove the item
this.items.splice(index, 1)
// Remove the 'current' (non edited) item from the list
self.items.splice(index, 1)
self.items.push(new_item)
const new_item = await this.item_edition("post", item)
// Add the new item
this.items.push(new_item)
Swal.fire({title: "{{_('Item successfully edited') | escapejs}}", icon: "success", position:"top-end", showConfirmButton: false, toast: true, timer: 1000})
})
} catch (err) {
this.items.push(item)
}
},
deleteItem (index) {
async deleteItem (index) {
var self = this
var item = this.items[index]
this.item_edition("delete", item).then(() => {
self.items.splice(this.items.indexOf(item), 1)
try {
// Remove the item
this.items.splice(index, 1)
await this.item_edition("delete", item)
Swal.fire({title: "{{_('Item successfully deleted!') | escapejs}}", icon: "success", position:"top-end", showConfirmButton: false, toast: true, timer: 1000})
})
} catch (err) {
this.items.push(item)
}
},
createType (type) {
async createType (type) {
var self = this
try {
this.type_edition("post", type).then(new_type => {
self.types.push(new_type)
const new_type = await this.type_edition("post", type)
this.types.push(new_type)
Swal.fire({title: "{{_('Type successfully created!') | escapejs}}", icon: "success", position:"top-end", showConfirmButton: false, toast: true, timer: 1000})
})
} catch (err) {
}
},
editType (index, type) {
async editType (index, type) {
var self = this
try {
this.type_edition("post", type).then(new_type => {
this.types.splice(index, 1)
// Remove the 'current' (non edited) item from the list
self.types.splice(index, 1)
self.types.push(new_type)
const new_type = await this.type_edition("post", type)
this.types.push(new_type)
Swal.fire({title: "{{_('Type successfully edited') | escapejs}}", icon: "success", position:"top-end", showConfirmButton: false, toast: true, timer: 1000})
})
} catch (err) {
this.types.push(type)
}
},
deleteType (index) {
async deleteType (index) {
var self = this
var type = this.types[index]
this.type_edition("delete", type).then(() => {
self.types.splice(this.types.indexOf(type), 1)
try {
// Remove the type
this.types.splice(index, 1)
await this.type_edition("delete", type)
Swal.fire({title: "{{_('Type successfully deleted!') | escapejs}}", icon: "success", position:"top-end", showConfirmButton: false, toast: true, timer: 1000})
})
} catch (err) {
this.types.push(type)
}
},
},
@@ -0,0 +1 @@
<div>PropertyDetail</div>
@@ -0,0 +1,4 @@
PropertyDetail = {
template: "#PropertyDetail",
router_path: "/PropertyDetail/:id",
},
@@ -0,0 +1 @@
{% extends "base_components/glist/template.html" %}
@@ -0,0 +1,8 @@
{% extends "base_components/glist/vue.js" %}
{% load main %}
{% block component %}
{% define 'items' 'items' %}
{% define 'show_url' 'PropertyDetail' %}
{{ block.super }}
{% endblock %}
@@ -0,0 +1,22 @@
{% load i18n %}
<div>
<div class="card mt-4 pt-2 ps-lg-2">
<h5 class="card-header">{% trans "Your properties" %}</h5>
<div class="card-body">
<PropertyList
:items="properties"
:items_headers="properties_headers"
:items_relations="{}"
:hidden_fields="[]"
group_by="type"
@deleteItem="deleteItem"
@createItem="createItem"
@editItem="editItem"
></PropertyList>
</div>
</div>
</div>
@@ -0,0 +1,183 @@
PropertyView = {
template: "#PropertyView",
router_path: "/PropertyView",
delimiters: ["[[", "]]"],
props: [],
data: function() {
return {
properties: [],
properties_headers: [],
}
},
mounted: function() {
this.reload()
},
computed: {
properties_encrypted_fields: function() {
return this.properties_headers.filter(e => e.encrypted).map(e => e.value)
},
properties_relations: function() {
return this.properties_headers.filter(e => e.choices != null)
},
},
methods: {
async reload () {
try {
const response = await this.$http.get(Urls["items:property.list"]())
this.properties_headers = response.data.result.properties_headers
// Decrypt all item the push
response.data.result.properties.forEach(async item => {
const new_item = await this.decryptObject(this.properties_encrypted_fields, item)
this.properties.push(new_item)
})
} catch (err) {
Swal.fire({title: "{{_('Error during loading of properties') | escapejs}}", icon: "error", position:"top-end", showConfirmButton: false, toast: true, timer: 1000})
throw err
}
},
async decryptObject (encrypted_fields, obj) {
// Decrypt all fields and return a new object
var newobj = {}
await Promise.all(Object.keys(obj).map(async field => {
if (encrypted_fields.includes(field) && obj[field] != null) {
newobj[field] = await this.decrypt(obj[field])
} else {
newobj[field] = obj[field]
}
}))
return newobj
},
async encryptObject (encrypted_fields, obj) {
// Encrypt all fields and return a new object
var newobj = {}
await Promise.all(Object.keys(obj).map(async field => {
if (encrypted_fields.includes(field) && obj[field] != null) {
newobj[field] = await this.encrypt(obj[field])
} else {
newobj[field] = obj[field]
}
}))
return newobj
},
async object_edit(url_edit, url_create, encrypted_fields, method, obj) {
let url = null
if (obj.id == undefined || obj.id == null) {
url = Urls[url_create]()
} else {
url = Urls[url_edit](obj.id)
}
try {
const newobj = await this.encryptObject(encrypted_fields, obj)
const response = await this.$http[method](url, newobj)
if (method != "delete") {
return await this.decryptObject(encrypted_fields, response.data.object)
}
} catch (err) {
let msg = "{{_('Error during edition') | escapejs}}"
if (method == "delete") {
msg = "{{_('Error during deletion') | escapejs}}"
}
Swal.fire({title: msg, icon: "error", position:"top-end", showConfirmButton: false, toast: true, timer: 1000})
throw err
}
},
property_edition (method, item) {
return this.object_edit("items:property.edit", "items:property.create", this.properties_encrypted_fields, method, item)
},
async createItem (item) {
try {
const new_item = await this.property_edition("post", item)
this.properties.push(new_item)
Swal.fire({title: "{{_('Item successfully created!') | escapejs}}", icon: "success", position:"top-end", showConfirmButton: false, toast: true, timer: 1000})
} catch (err) {
}
},
async editItem (index, item) {
try {
// Remove the item
this.properties.splice(index, 1)
const new_item = await this.property_edition("post", item)
// Add the new item
this.properties.push(new_item)
Swal.fire({title: "{{_('Item successfully edited') | escapejs}}", icon: "success", position:"top-end", showConfirmButton: false, toast: true, timer: 1000})
} catch (err) {
this.properties.push(item)
}
},
async deleteItem (index) {
var item = this.properties[index]
try {
// Remove the item
this.properties.splice(index, 1)
await this.property_edition("delete", item)
Swal.fire({title: "{{_('Item successfully deleted!') | escapejs}}", icon: "success", position:"top-end", showConfirmButton: false, toast: true, timer: 1000})
} catch (err) {
this.properties.push(item)
}
},
},
}
+17 -2
View File
@@ -1,12 +1,27 @@
from django.urls import path
from items.views import item_view, type_view
from items.views import item_view, property_view, relation_view, type_view
app_name = "items"
urlpatterns = [
path("", item_view.item_list, name="list"),
# Item
path("list", item_view.item_list, name="list"),
path("<uuid:id>", item_view.item_edit, name="edit"),
path("<uuid:id>/details", item_view.item_details, name="details"),
path("create", item_view.item_edit, {"id": None}, name="create"),
# Type
path("type/<uuid:id>", type_view.type_edit, name="type.edit"),
path("type/create", type_view.type_edit, {"id": None}, name="type.create"),
# Property
path("property/list", property_view.property_list, name="property.list"),
path("property/<uuid:id>", property_view.property_edit, name="property.edit"),
path("property/create", property_view.property_edit, {"id": None}, name="property.create"),
# Relations
# path("relation/list", relation_view.relation_list, name="relation.list"),
# path("relation/<uuid:id>", relation_view.relation_edit, name="relation.edit"),
path("relation/<uuid:id>/details", relation_view.relation_details, name="relation.details"),
# path("relation/create", relation_view.relation_edit, {"id": None}, name="relation.create"),
]
+65
View File
@@ -0,0 +1,65 @@
from django.db import models
from django.db.models.fields.related import RelatedField
from django.http.response import JsonResponse
import json
def generic_edit(model, request, id=None):
"""Create/edit generic object view."""
if id:
item = model.objects.filter(id=id, author=request.user.setting).first()
else:
item = model(author=request.user.setting)
if not item:
return JsonResponse({}, status=404)
if request.method == "DELETE":
try:
item.delete()
except Exception:
return JsonResponse({"error": "INVALID_DELETE"}, status=401)
return JsonResponse({})
if request.method != "POST":
return JsonResponse({}, status=405)
try:
data = json.loads(request.body)
except Exception:
return JsonResponse({"error": "INVALID_DATA"}, status=401)
for field in item._meta.fields:
if field.name in item.Serialization.excluded_fields_edit:
continue
if isinstance(field, RelatedField):
# For now, disregard related field (fk, m2m, 1-1)
if isinstance(field, models.ForeignKey):
setattr(item, f"{field.name}_id", data[field.name])
continue
if field.name not in data:
continue
setattr(item, field.name, data[field.name])
try:
item.save()
except Exception:
return JsonResponse({"error": "DATA_INVALID"}, status=401)
return JsonResponse(
{
"object": item.serialize(),
}
)
+20 -51
View File
@@ -1,11 +1,10 @@
import json
from django.contrib.auth.decorators import login_required
from django.http import JsonResponse
from app.utils.api.api_list import header_for_table
from django.contrib.auth.decorators import login_required
from django.db import models
from django.db.models.fields.related import RelatedField
from django.http import JsonResponse
from items.models import Item, ItemType
from items.models import Item, ItemRelation, ItemType, LinkedProperty, Property
from items.views.base import generic_edit
@login_required
@@ -31,57 +30,27 @@ def item_list(request):
def item_edit(request, id=None):
"""Create/edit item view."""
if id:
item = Item.objects.filter(id=id, author=request.user.setting).first()
return generic_edit(Item, request, id)
else:
item = Item(author=request.user.setting)
@login_required
def item_details(request, id):
item = Item.objects.filter(author=request.user.setting, id=id).first()
if not item:
return JsonResponse({}, status=404)
if request.method == "DELETE":
try:
item.delete()
except Exception:
return JsonResponse({"error": "INVALID_DELETE"}, status=401)
return JsonResponse({})
if request.method != "POST":
return JsonResponse({}, status=405)
try:
data = json.loads(request.body)
except Exception:
return JsonResponse({"error": "INVALID_DATA"}, status=401)
for field in item._meta.fields:
if field.name in item.Serialization.excluded_fields_edit:
continue
if isinstance(field, RelatedField):
# For now, disregard related field (fk, m2m, 1-1)
if isinstance(field, models.ForeignKey):
setattr(item, f"{field.name}_id", data[field.name])
continue
if field.name not in data:
continue
setattr(item, field.name, data[field.name])
try:
item.save()
except Exception:
return JsonResponse({"error": "DATA_INVALID"}, status=401)
return JsonResponse(
{
"object": Item.objects.filter(id=item.id).serialize().first(),
"object": item.serialize(),
"parents": list(item.parents.serialize()),
"parents_headers": header_for_table(ItemRelation),
"children": list(item.children.serialize()),
"children_headers": header_for_table(ItemRelation),
"properties": list(item.properties.serialize()),
"properties_headers": header_for_table(Property),
"linked_properties": list(item.linked_properties.serialize()),
"linked_properties_headers": header_for_table(LinkedProperty),
}
)
+30
View File
@@ -0,0 +1,30 @@
from django.contrib.auth.decorators import login_required
from django.http import JsonResponse
from app.utils.api.api_list import header_for_table
from items.models import Property
from items.views.base import generic_edit
@login_required
def property_list(request):
items = Property.objects.filter(author=request.user.setting)
return JsonResponse(
{
"result": {
"properties": list(items.serialize()),
"properties_headers": header_for_table(Property),
},
"count": items.count(),
}
)
@login_required
def property_edit(request, id=None):
"""Create/edit property view."""
return generic_edit(Property, request, id)
+29
View File
@@ -0,0 +1,29 @@
from django.contrib.auth.decorators import login_required
from django.http import JsonResponse
from app.utils.api.api_list import header_for_table
from items.models import Item, ItemRelation, Property, RelationProperty
@login_required
def relation_details(request, id):
relation = ItemRelation.objects.filter(author=request.user.setting, id=id).first()
if not relation:
return JsonResponse({}, status=404)
return JsonResponse(
{
"object": relation.serialize(),
"parent": relation.parent.serialize(),
"parent_headers": header_for_table(Item),
"child": relation.child.serialize(),
"child_headers": header_for_table(Item),
"properties": list(relation.properties.serialize()),
"properties_headers": header_for_table(Property),
"relation_properties": list(relation.relation_properties.serialize()),
"relation_properties_headers": header_for_table(RelationProperty),
}
)
+4 -59
View File
@@ -1,67 +1,12 @@
import json
from django.contrib.auth.decorators import login_required
from django.db import models
from django.db.models.fields.related import RelatedField
from django.http import JsonResponse
from items.models import ItemType
from items.views.base import generic_edit
@login_required
def type_edit(request, id=None):
"""Create/edit type view."""
if id:
item = ItemType.objects.filter(id=id, author=request.user.setting).first()
else:
item = ItemType(author=request.user.setting)
if not item:
return JsonResponse({}, status=404)
if request.method == "DELETE":
try:
item.delete()
except Exception:
return JsonResponse({"error": "INVALID_DELETE"}, status=401)
return JsonResponse({})
if request.method != "POST":
return JsonResponse({}, status=405)
try:
data = json.loads(request.body)
except Exception:
return JsonResponse({"error": "INVALID_DATA"}, status=401)
for field in item._meta.fields:
if field.name in item.Serialization.excluded_fields_edit:
continue
if isinstance(field, RelatedField):
# For now, disregard related field (fk, m2m, 1-1)
if isinstance(field, models.ForeignKey):
setattr(item, f"{field.name}_id", data[field.name])
continue
if field.name not in data:
continue
setattr(item, field.name, data[field.name])
try:
item.save()
except Exception:
return JsonResponse({"error": "DATA_INVALID"}, status=401)
return JsonResponse(
{
"object": ItemType.objects.filter(id=item.id).serialize().first(),
}
)
return generic_edit(ItemType, request, id)