update imports

generation/scheme.go

@@ -15,8 +15,6 @@ import (
 //go:embed templates/scheme.tmpl
 var SchemeTemplate string
 
-const GolangServicesPath = "../../bindings/app/internal/services"
-
 type Dependency struct {
 	ImportName  string
 	ServiceName string
@@ -27,7 +25,6 @@ type Dependency struct {
 type TemplateData struct {
 	StructName   string
 	LowerName    string
-	GolangServicesPath string
 	Fields       []model.Field
 	Dependencies []Dependency
 }
@@ -36,7 +33,6 @@ func GenerateScheme(model *model.Model, mkPath string) {
 	data := TemplateData{
 		StructName:   model.Name,
 		LowerName:    strings.ToLower(model.Name),
-		GolangServicesPath: GolangServicesPath,
 		Fields:       model.Fields,
 		Dependencies: processDependencies(model.Fields),
 	}

generation/service.go

@@ -18,7 +18,6 @@ var ServiceTemplate string
 type ServiceTemplateContext struct {
 	LowerModelName string
 	ModelName      string
-	ServicesPath   string
 }
 
 func GenerateService(model *model.Model, mkPath string) {
@@ -38,7 +37,6 @@ func GenerateService(model *model.Model, mkPath string) {
 	context := ServiceTemplateContext{
 		LowerModelName: strings.ToLower(model.Name),
 		ModelName:      model.Name,
-		ServicesPath:   GolangServicesPath,
 	}
 
 	serviceTemplate, err := template.New("service").Parse(ServiceTemplate)

generation/templates/scheme.tmpl

@@ -4,7 +4,7 @@ import { onMounted, reactive } from 'vue'
 import { getDefaultValues } from '../utils/structs/defaults.util'
 import Service from './{{.LowerName}}.service'
 import type { Scheme } from '../types/scheme.type'
-import { {{.StructName}} } from '{{.GolangServicesPath}}'
+import { {{.StructName}} } from '../../bindings/wails_tables/internal/services'
 import { ref } from 'vue'
 import type { Validate } from "../types/validate.type";
 import { getDefaultSortOptions } from "../utils/structs/default-sort-options.util";

generation/templates/service.tmpl

@@ -1,5 +1,5 @@
-import { GetAll, Create, Delete, GetById, Update, Count, SortedByOrder, SearchByAllTextFields } from "../../bindings/app/internal/services/{{.LowerModelName}}service"
-import type { {{.ModelName}} } from "{{.ServicesPath}}"
+import { GetAll, Create, Delete, GetById, Update, Count, SortedByOrder, SearchByAllTextFields } from "../../bindings/wails_tables/internal/services/{{.LowerModelName}}service";
+import type { {{.ModelName}} } from "../../bindings/wails_tables/internal/models";
 import type { IService } from "../types/service.type"
 import type { SortOptions } from "../types/sort-options.type";
 
@@ -33,7 +33,16 @@ export default class {{.ModelName}}Service implements IService<{{.ModelName}}> {
 		return await SearchByAllTextFields(input) as {{ .ModelName }}[]
 	}
 
-	async sort(options: SortOptions<{{ .ModelName }}>) {
-		return await SortedByOrder(Object.entries(options).map(item => ({Name: item[0], Order: item[1]}))) as {{ .ModelName }}[]
+	async sort(options: SortOptions<{{.ModelName}}>) {
+    return (await SortedByOrder(
+      Object.entries(options).map((item) => {
+        if (item[1] !== 'NONE') {
+          return ({
+            Name: item[0],
+            Order: item[1],
+          })
+        }
+      }).filter(item => !!item)
+    )) as {{.ModelName}}[];
   }
 }