Improves sorting

tjayrush · tjayrush · commit 98be3f8ca23f · 2024-11-28T04:54:44.000-05:00
diff --git a/code_gen/templates/generators/types/app_data+type.go.tmpl b/code_gen/templates/generators/types/app_data+type.go.tmpl
@@ -6,7 +6,6 @@
 {{ $embedType := .EmbedType }}
 {{ $members := .Members }}
 
-{{ $hasSorts := .HasSorts }}
 {{ $hasEmbed := and (gt (len .EmbedName) 0) true }}
 
 {{ $isHistory := eq $class "History" }}
@@ -26,14 +25,6 @@
 	{{ $appData = $routeLower }}
 {{ end }}
 
-{{ $sorts := "" }}
-{{ if $hasSorts }}
-	{{ $sorts = print `	if err := sdk.Sort` $routeName `(` $appData `.Items, ` $appData `.Sorts); err != nil {
-			a.emitErrorMsg(err, nil)
-		}
-`}}
-{{ end }}
-
 {{ $param1 := ""}}
 {{ if $isHistory }}
 	{{ $param1 = "address" }}
@@ -130,7 +121,7 @@ func (a *App) load{{$routeName}}(wg *sync.WaitGroup, errorChan chan error) error
 		if err := {{$appData}}.Sort(); err != nil {
 			a.emitErrorMsg(err, nil)
 		}
-		{{ $sorts }} a.emitLoadingMsg(messages.Loaded, "{{$routeLower}}")
+		a.emitLoadingMsg(messages.Loaded, "{{$routeLower}}")
 	}
 
 	return nil
diff --git a/code_gen/templates/generators/types/pkg_types_types+containertype.go.tmpl b/code_gen/templates/generators/types/pkg_types_types+containertype.go.tmpl
@@ -194,5 +194,11 @@ func (s *{{$class}}Container) ForEveryItem(process Every{{$itemName}}Fn, data an
 	return true
 }
 
+func (s *{{$class}}Container) Sort() (err error) {
+	// EXISTING_CODE
+	// EXISTING_CODE
+	return
+}
+
 // EXISTING_CODE
 // EXISTING_CODE
diff --git a/pkg/types/types_containerabi.go b/pkg/types/types_containerabi.go
@@ -185,8 +185,11 @@ func (s *AbiContainer) ForEveryItem(process EveryAbiFn, data any) bool {
 	return true
 }
 
-func (s *AbiContainer) Sort() error {
-	return sdk.SortAbis(s.Items, s.Sorts)
+func (s *AbiContainer) Sort() (err error) {
+	// EXISTING_CODE
+	err = sdk.SortAbis(s.Items, s.Sorts)
+	// EXISTING_CODE
+	return
 }
 
 // EXISTING_CODE
diff --git a/pkg/types/types_containerconfig.go b/pkg/types/types_containerconfig.go
@@ -178,8 +178,11 @@ func (s *ConfigContainer) ForEveryItem(process EveryChainFn, data any) bool {
 	return true
 }
 
-func (s *ConfigContainer) Sort() error {
-	return sdk.SortChains(s.Items, s.Sorts)
+func (s *ConfigContainer) Sort() (err error) {
+	// EXISTING_CODE
+	err = sdk.SortChains(s.Items, s.Sorts)
+	// EXISTING_CODE
+	return
 }
 
 // EXISTING_CODE
diff --git a/pkg/types/types_containerdaemon.go b/pkg/types/types_containerdaemon.go
@@ -162,9 +162,11 @@ func (s *DaemonContainer) ForEveryItem(process EveryNothingFn, data any) bool {
 	return true
 }
 
-func (s *DaemonContainer) Sort() error {
+func (s *DaemonContainer) Sort() (err error) {
+	// EXISTING_CODE
 	// TODO: Is there anything to sort for daemons?
-	return nil
+	// EXISTING_CODE
+	return
 }
 
 // EXISTING_CODE
diff --git a/pkg/types/types_containerhistory.go b/pkg/types/types_containerhistory.go
@@ -186,9 +186,11 @@ func (s *HistoryContainer) ForEveryItem(process EveryTransactionFn, data any) bo
 	return true
 }
 
-func (s *HistoryContainer) Sort() error {
+func (s *HistoryContainer) Sort() (err error) {
+	// EXISTING_CODE
 	// TODO: Is there anything to sort for history?
-	return nil
+	// EXISTING_CODE
+	return
 }
 
 // EXISTING_CODE
diff --git a/pkg/types/types_containerindex.go b/pkg/types/types_containerindex.go
@@ -181,8 +181,11 @@ func (s *IndexContainer) ForEveryItem(process EveryChunkStatsFn, data any) bool
 	return true
 }
 
-func (s *IndexContainer) Sort() error {
-	return sdk.SortChunkStats(s.Items, s.Sorts)
+func (s *IndexContainer) Sort() (err error) {
+	// EXISTING_CODE
+	err = sdk.SortChunkStats(s.Items, s.Sorts)
+	// EXISTING_CODE
+	return
 }
 
 // EXISTING_CODE
diff --git a/pkg/types/types_containermanifest.go b/pkg/types/types_containermanifest.go
@@ -175,8 +175,11 @@ func (s *ManifestContainer) ForEveryItem(process EveryChunkRecordFn, data any) b
 	return true
 }
 
-func (s *ManifestContainer) Sort() error {
-	return sdk.SortChunkRecords(s.Items, s.Sorts)
+func (s *ManifestContainer) Sort() (err error) {
+	// EXISTING_CODE
+	err = sdk.SortChunkRecords(s.Items, s.Sorts)
+	// EXISTING_CODE
+	return
 }
 
 // EXISTING_CODE
diff --git a/pkg/types/types_containermonitor.go b/pkg/types/types_containermonitor.go
@@ -196,8 +196,11 @@ func (s *MonitorContainer) ForEveryItem(process EveryMonitorFn, data any) bool {
 	return true
 }
 
-func (s *MonitorContainer) Sort() error {
-	return sdk.SortMonitors(s.Items, s.Sorts)
+func (s *MonitorContainer) Sort() (err error) {
+	// EXISTING_CODE
+	err = sdk.SortMonitors(s.Items, s.Sorts)
+	// EXISTING_CODE
+	return
 }
 
 // EXISTING_CODE
diff --git a/pkg/types/types_containername.go b/pkg/types/types_containername.go
@@ -225,12 +225,15 @@ func (s *NameContainer) ForEveryItem(process EveryNameFn, data any) bool {
 	return true
 }
 
-func (s *NameContainer) Sort() error {
+func (s *NameContainer) Sort() (err error) {
+	// EXISTING_CODE
 	sort.Slice(s.Items, func(i, j int) bool {
 		return compare(s.Items[i], s.Items[j])
 	})
+	// TODO: Sorting?
 	// return sdk.SortNames(s.Items, s.Sorts)
-	return nil
+	// EXISTING_CODE
+	return
 }
 
 // EXISTING_CODE
diff --git a/pkg/types/types_containerproject.go b/pkg/types/types_containerproject.go
@@ -39,8 +39,8 @@ func NewProjectContainer(chain string, itemsIn []HistoryContainer) ProjectContai
 		Items:  itemsIn,
 		NItems: uint64(len(itemsIn)),
 		Sorts: sdk.SortSpec{
-			Fields: []string{},
-			Order:  []sdk.SortOrder{},
+			Fields: []string{"address"},
+			Order:  []sdk.SortOrder{"Asc},
 		},
 		Updater: NewProjectUpdater(chain, itemsIn),
 	}
@@ -176,12 +176,15 @@ func (s *ProjectContainer) ForEveryItem(process EveryHistoryContainerFn, data an
 	return true
 }
 
-func (s *ProjectContainer) Sort() error {
+func (s *ProjectContainer) Sort() (err error) {
+	// EXISTING_CODE
 	sort.Slice(s.Items, func(i, j int) bool {
 		return s.Items[i].Address.Hex() < s.Items[j].Address.Hex()
 	})
+	// TODO: Sorting?
 	// return sdk.SortHistoryContainers(s.Items, s.Sorts)
-	return nil
+	// EXISTING_CODE
+	return
 }
 
 // EXISTING_CODE
diff --git a/pkg/types/types_containersession.go b/pkg/types/types_containersession.go
@@ -159,8 +159,11 @@ func (s *SessionContainer) ForEveryItem(process EveryNothingFn, data any) bool {
 	return true
 }
 
-func (s *SessionContainer) Sort() error {
-	return nil
+func (s *SessionContainer) Sort() (err error) {
+	// EXISTING_CODE
+	// TODO: Sorting?
+	// EXISTING_CODE
+	return
 }
 
 // EXISTING_CODE
diff --git a/pkg/types/types_containersettings.go b/pkg/types/types_containersettings.go
@@ -167,8 +167,11 @@ func (s *SettingsContainer) ForEveryItem(process EveryCacheItemFn, data any) boo
 	return true
 }
 
-func (s *SettingsContainer) Sort() error {
-	return nil
+func (s *SettingsContainer) Sort() (err error) {
+	// EXISTING_CODE
+	// TODO: Sorting?
+	// EXISTING_CODE
+	return
 }
 
 // EXISTING_CODE
diff --git a/pkg/types/types_containerstatus.go b/pkg/types/types_containerstatus.go
@@ -168,8 +168,11 @@ func (s *StatusContainer) ForEveryItem(process EveryCacheItemFn, data any) bool
 	return true
 }
 
-func (s *StatusContainer) Sort() error {
-	return sdk.SortCacheItems(s.Items, s.Sorts)
+func (s *StatusContainer) Sort() (err error) {
+	// EXISTING_CODE
+	err = sdk.SortCacheItems(s.Items, s.Sorts)
+	// EXISTING_CODE
+	return
 }
 
 // EXISTING_CODE
diff --git a/pkg/types/types_containerwizard.go b/pkg/types/types_containerwizard.go
@@ -159,9 +159,11 @@ func (s *WizardContainer) ForEveryItem(process EveryWizErrorFn, data any) bool {
 	return true
 }
 
-func (s *WizardContainer) Sort() error {
+func (s *WizardContainer) Sort() (err error) {
+	// EXISTING_CODE
 	// TODO: Sorting?
-	return nil
+	// EXISTING_CODE
+	return
 }
 
 // EXISTING_CODE

Original file line number	Diff line number	Diff line change
`@@ -185,8 +185,11 @@ func (s *AbiContainer) ForEveryItem(process EveryAbiFn, data any) bool {`
`185`	`185`	`return true`
`186`	`186`	`}`
`187`	`187`
`188`		`-func (s *AbiContainer) Sort() error {`
`189`		`- return sdk.SortAbis(s.Items, s.Sorts)`
	`188`	`+func (s *AbiContainer) Sort() (err error) {`
	`189`	`+ // EXISTING_CODE`
	`190`	`+ err = sdk.SortAbis(s.Items, s.Sorts)`
	`191`	`+ // EXISTING_CODE`
	`192`	`+ return`
`190`	`193`	`}`
`191`	`194`
`192`	`195`	`// EXISTING_CODE`
Original file line number	Diff line number	Diff line change
`@@ -178,8 +178,11 @@ func (s *ConfigContainer) ForEveryItem(process EveryChainFn, data any) bool {`
`178`	`178`	`return true`
`179`	`179`	`}`
`180`	`180`
`181`		`-func (s *ConfigContainer) Sort() error {`
`182`		`- return sdk.SortChains(s.Items, s.Sorts)`
	`181`	`+func (s *ConfigContainer) Sort() (err error) {`
	`182`	`+ // EXISTING_CODE`
	`183`	`+ err = sdk.SortChains(s.Items, s.Sorts)`
	`184`	`+ // EXISTING_CODE`
	`185`	`+ return`
`183`	`186`	`}`
`184`	`187`
`185`	`188`	`// EXISTING_CODE`
Original file line number	Diff line number	Diff line change
`@@ -162,9 +162,11 @@ func (s *DaemonContainer) ForEveryItem(process EveryNothingFn, data any) bool {`
`162`	`162`	`return true`
`163`	`163`	`}`
`164`	`164`
`165`		`-func (s *DaemonContainer) Sort() error {`
	`165`	`+func (s *DaemonContainer) Sort() (err error) {`
	`166`	`+ // EXISTING_CODE`
`166`	`167`	`// TODO: Is there anything to sort for daemons?`
`167`		`- return nil`
	`168`	`+ // EXISTING_CODE`
	`169`	`+ return`
`168`	`170`	`}`
`169`	`171`
`170`	`172`	`// EXISTING_CODE`
Original file line number	Diff line number	Diff line change
`@@ -186,9 +186,11 @@ func (s *HistoryContainer) ForEveryItem(process EveryTransactionFn, data any) bo`
`186`	`186`	`return true`
`187`	`187`	`}`
`188`	`188`
`189`		`-func (s *HistoryContainer) Sort() error {`
	`189`	`+func (s *HistoryContainer) Sort() (err error) {`
	`190`	`+ // EXISTING_CODE`
`190`	`191`	`// TODO: Is there anything to sort for history?`
`191`		`- return nil`
	`192`	`+ // EXISTING_CODE`
	`193`	`+ return`
`192`	`194`	`}`
`193`	`195`
`194`	`196`	`// EXISTING_CODE`
Original file line number	Diff line number	Diff line change
`@@ -181,8 +181,11 @@ func (s *IndexContainer) ForEveryItem(process EveryChunkStatsFn, data any) bool`
`181`	`181`	`return true`
`182`	`182`	`}`
`183`	`183`
`184`		`-func (s *IndexContainer) Sort() error {`
`185`		`- return sdk.SortChunkStats(s.Items, s.Sorts)`
	`184`	`+func (s *IndexContainer) Sort() (err error) {`
	`185`	`+ // EXISTING_CODE`
	`186`	`+ err = sdk.SortChunkStats(s.Items, s.Sorts)`
	`187`	`+ // EXISTING_CODE`
	`188`	`+ return`
`186`	`189`	`}`
`187`	`190`
`188`	`191`	`// EXISTING_CODE`
Original file line number	Diff line number	Diff line change
`@@ -175,8 +175,11 @@ func (s *ManifestContainer) ForEveryItem(process EveryChunkRecordFn, data any) b`
`175`	`175`	`return true`
`176`	`176`	`}`
`177`	`177`
`178`		`-func (s *ManifestContainer) Sort() error {`
`179`		`- return sdk.SortChunkRecords(s.Items, s.Sorts)`
	`178`	`+func (s *ManifestContainer) Sort() (err error) {`
	`179`	`+ // EXISTING_CODE`
	`180`	`+ err = sdk.SortChunkRecords(s.Items, s.Sorts)`
	`181`	`+ // EXISTING_CODE`
	`182`	`+ return`
`180`	`183`	`}`
`181`	`184`
`182`	`185`	`// EXISTING_CODE`
Original file line number	Diff line number	Diff line change
`@@ -196,8 +196,11 @@ func (s *MonitorContainer) ForEveryItem(process EveryMonitorFn, data any) bool {`
`196`	`196`	`return true`
`197`	`197`	`}`
`198`	`198`
`199`		`-func (s *MonitorContainer) Sort() error {`
`200`		`- return sdk.SortMonitors(s.Items, s.Sorts)`
	`199`	`+func (s *MonitorContainer) Sort() (err error) {`
	`200`	`+ // EXISTING_CODE`
	`201`	`+ err = sdk.SortMonitors(s.Items, s.Sorts)`
	`202`	`+ // EXISTING_CODE`
	`203`	`+ return`
`201`	`204`	`}`
`202`	`205`
`203`	`206`	`// EXISTING_CODE`