Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't generate entries for Abstract Models in more areas (Fixes #194) #197

Merged
merged 6 commits into from
Jun 20, 2023
Merged

Don't generate entries for Abstract Models in more areas (Fixes #194) #197

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
938929e
api_py: filter out abstract models
GeoMaciolek Jun 12, 2023
5e9e7b4
Don't include abstract models in urls.py
GeoMaciolek Jun 15, 2023
2e5035d
no abstract models: index_htm, htmx_html, serializers
GeoMaciolek Jun 15, 2023
dee5efb
style fix
GeoMaciolek Jun 15, 2023
826416c
?? no abstract models in const apps ??
GeoMaciolek Jun 15, 2023
b84652c
Create get_concrete_models(), replace filters everywheree
GeoMaciolek Jun 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 23 additions & 25 deletions src/django/rendering.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ class Renderer {

if (app == undefined) return

const models = this.get_models(app_id)
const models = this.get_concrete_models(app_id)

let model_templates = []

Expand Down Expand Up @@ -455,6 +455,12 @@ class Renderer {
return this.store.getters.ordered_models(appid)
}

// Only return non-abstract models, so Django won't try to use
// abstract models in admin panel (admin.py), serialize.py, etc.
get_concrete_models(appid) {
return this.get_models(appid).filter(model => !model.abstract)
}

get_fields(model) {
return keys(model.fields).map((field) => {
return this.store.getters.fields()[field] ? this.store.getters.fields()[field].data() : [];
Expand Down Expand Up @@ -615,7 +621,7 @@ CHANNEL_LAYERS = {

apps.forEach((app) => {
output += `\n<div class="m-2"><h4>${app.name}</h4></div>`
this.get_models(app.id).forEach((model) => {
this.get_concrete_models(app.id).forEach((model) => {
output += `\n<div class="m-2"><a class="btn btn-light" href="{% url '${app.name}_${model.name}_list' %}">${model.name} Listing</a></div>`
})
})
Expand All @@ -639,7 +645,7 @@ CHANNEL_LAYERS = {
const apps = this.get_apps(projectid);
let htmx_body = ""
apps.forEach((app) => {
const models = this.get_models(app.id)
const models = this.get_concrete_models(app.id)
models.forEach((model) => {
htmx_body += `
<div class="col col-lg-6">
Expand Down Expand Up @@ -907,7 +913,7 @@ CHANNEL_LAYERS = {
urls += '\n\n'
urls += 'router = routers.DefaultRouter()\n'

const models = this.get_models(appid)
const models = this.get_concrete_models(appid)

models.forEach((model) => {
urls += 'router.register("' + model.name + '", api.' + model.name + 'ViewSet)\n'
Expand Down Expand Up @@ -965,7 +971,8 @@ CHANNEL_LAYERS = {
api += 'from . import serializers\n'
api += 'from . import models\n'

const models = this.get_models(appid)
const models = this.get_concrete_models(appid)


models.forEach((model) => {
api += '\n\n'
Expand All @@ -984,7 +991,7 @@ CHANNEL_LAYERS = {
serializers += '\n'
serializers += 'from . import models\n'

const models = this.get_models(appid)
const models = this.get_concrete_models(appid)

models.forEach((model) => {
const fields = this.get_fields(model)
Expand Down Expand Up @@ -1014,7 +1021,7 @@ CHANNEL_LAYERS = {
admin += 'from . import models\n'
admin += '\n\n'

const models = this.get_models(appid).filter(model => !model.abstract);
const models = this.get_concrete_models(appid)

models.forEach((model) => {
admin += 'class ' + model.name + 'AdminForm(forms.ModelForm):\n'
Expand Down Expand Up @@ -1188,10 +1195,8 @@ CHANNEL_LAYERS = {
}

views_py(projectid, appid) {
const models = this.get_models(appid).filter((modelData)=> {
// Do not include abstract models in form views
return !modelData.abstract
})
// Do not include abstract models in form views
const models = this.get_concrete_models(appid)

const appData = this.store.getters.appData(appid)

Expand Down Expand Up @@ -1228,10 +1233,8 @@ CHANNEL_LAYERS = {
htmx_py (projectid, appid) {
const appData = this.store.getters.appData(appid)

const models = this.get_models(appid).filter((modelData)=> {
// Do not include abstract models in form views
return !modelData.abstract
})
// Do not include abstract models in form views
const models = this.get_concrete_models(appid)

let htmx_views = 'from django.views import generic\n'
htmx_views += 'from django.urls import reverse_lazy\n'
Expand Down Expand Up @@ -1268,10 +1271,8 @@ CHANNEL_LAYERS = {
}

forms_py(projectid, appid) {
const models = this.get_models(appid).filter((modelData)=> {
// Do not include abstract models in forms
return !modelData.abstract
})
// Do not include abstract models in forms
const models = this.get_concrete_models(appid)

let forms = 'from django import forms'

Expand Down Expand Up @@ -1372,9 +1373,7 @@ CHANNEL_LAYERS = {
const extra_imports = new Set()

apps.forEach((app) => {
const models = this.get_models(app.id).filter((modelData)=> {
return !modelData.abstract
})
const models = this.get_concrete_models(app.id)
models.forEach((model) => {
const parent_user_models = []
const parent_django_models = []
Expand Down Expand Up @@ -1457,9 +1456,8 @@ CHANNEL_LAYERS = {
tests += '\n\n'
tests += 'pytestmark = [pytest.mark.django_db]\n'

const models = this.get_models(appid).filter((modelData)=> {
return !modelData.abstract
})
const models = this.get_concrete_models(appid)

models.forEach((model) => {
tests += '\n\n'

Expand Down