Hotfixes for 1.1.27

CHANGELOG.md

@@ -1,4 +1,4 @@
-# v1.1.26
+# v1.1.27
 
 Add's the React.js and React native project building. For example:
 

clients/fireback-tools-vs-code-extension/package.json

@@ -2,7 +2,7 @@
   "name": "fireback-tools",
   "displayName": "Fireback Tools",
   "description": "Fireback tools and auto completion for Module3",
-  "version": "1.1.26",
+  "version": "1.1.27",
   "engines": {
     "vscode": "^1.75.0"
   },

cmd/fireback/fireback-deb.sh

@@ -3,7 +3,7 @@
 # Define variables
 DIRNAME="../../artifacts/fireback-server-all/"
 PACKAGE_NAME="fireback"
-PACKAGE_VERSION="1.1.26"
+PACKAGE_VERSION="1.1.27"
 DESCRIPTION="Fireback ultimate golang framework"
 MAINTAINER="Ali Torabi <ali-torabian@outlook.com>"
 BIN_PATH_AMD="../../artifacts/fireback-server-all/fireback" # Change this to the actual path of your amd64 binary

cmd/fireback/msi/Product.wxs

@@ -5,7 +5,7 @@
     Language="1033"
     Manufacturer="Ali Torabi"
     Name="Fireback"
-    Version="1.1.26">
+    Version="1.1.27">
 
     <Package InstallScope="perMachine" Compressed="yes" />
 

go.sum

@@ -634,7 +634,7 @@ github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCO
 github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M=
 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
-github.com/yuin/goldmark v1.1.26/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

modules/commonprofile/CommonProfileEntity.dyno.go

@@ -9,6 +9,9 @@ import (
 	"embed"
 	"encoding/json"
 	"fmt"
+	reflect "reflect"
+	"strings"
+
 	"github.com/gin-gonic/gin"
 	"github.com/gookit/event"
 	jsoniter "github.com/json-iterator/go"
@@ -21,8 +24,6 @@ import (
 	"github.com/urfave/cli"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
-	reflect "reflect"
-	"strings"
 )
 
 var commonProfileSeedersFs = &seeders.ViewsFs
@@ -679,8 +680,8 @@ var CommonProfileCreateInteractiveCmd cli.Command = cli.Command{
 			if !item.Required && c.Bool("all") == false {
 				continue
 			}
-			result := workspaces.AskForInput(item.Name, "")
-			workspaces.SetFieldString(entity, item.StructField, result)
+			// result := workspaces.AskForInput(item.Name, "")
+			// workspaces.SetFieldString(entity, item.StructField, result)
 		}
 		if entity, err := CommonProfileActionCreate(entity, query); err != nil {
 			fmt.Println(err.Error())

modules/workspaces/AcceptInviteDto.dyno.go

@@ -1,7 +1,7 @@
 package workspaces
 
 /*
-*	Generated by fireback 1.1.26
+*	Generated by fireback 1.1.27
 *	Written by Ali Torabi.
 *	Checkout the repository for licenses and contribution: https://github.com/torabian/fireback
  */

modules/workspaces/AppMenuEntity.dyno.go

@@ -1,7 +1,7 @@
 package workspaces
 
 /*
-*	Generated by fireback 1.1.26
+*	Generated by fireback 1.1.27
 *	Written by Ali Torabi.
 *	Checkout the repository for licenses and contribution: https://github.com/torabian/fireback
  */
@@ -19,6 +19,7 @@ import (
 	queries "github.com/torabian/fireback/modules/workspaces/queries"
 	seeders "github.com/torabian/fireback/modules/workspaces/seeders/AppMenu"
 	"github.com/urfave/cli"
+	"gopkg.in/yaml.v2"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 	reflect "reflect"
@@ -46,9 +47,9 @@ type AppMenuEntity struct {
 	Created          int64                    `json:"created,omitempty" gorm:"autoUpdateTime:nano"`
 	CreatedFormatted string                   `json:"createdFormatted,omitempty" sql:"-" gorm:"-"`
 	UpdatedFormatted string                   `json:"updatedFormatted,omitempty" sql:"-" gorm:"-"`
+	Label            *string                  `json:"label" yaml:"label"        translate:"true"  `
 	Href             *string                  `json:"href" yaml:"href"        `
 	Icon             *string                  `json:"icon" yaml:"icon"        `
-	Label            *string                  `json:"label" yaml:"label"        translate:"true"  `
 	ActiveMatcher    *string                  `json:"activeMatcher" yaml:"activeMatcher"        `
 	ApplyType        *string                  `json:"applyType" yaml:"applyType"        `
 	Capability       *CapabilityEntity        `json:"capability" yaml:"capability"    gorm:"foreignKey:CapabilityId;references:UniqueId"      `
@@ -92,9 +93,9 @@ var APP_MENU_EVENTS = []string{
 }
 
 type AppMenuFieldMap struct {
+	Label         TranslatedString `yaml:"label"`
 	Href          TranslatedString `yaml:"href"`
 	Icon          TranslatedString `yaml:"icon"`
-	Label         TranslatedString `yaml:"label"`
 	ActiveMatcher TranslatedString `yaml:"activeMatcher"`
 	ApplyType     TranslatedString `yaml:"applyType"`
 	Capability    TranslatedString `yaml:"capability"`
@@ -128,9 +129,9 @@ func AppMenuMockEntity() *AppMenuEntity {
 	_ = int64Holder
 	_ = float64Holder
 	entity := &AppMenuEntity{
+		Label:         &stringHolder,
 		Href:          &stringHolder,
 		Icon:          &stringHolder,
-		Label:         &stringHolder,
 		ActiveMatcher: &stringHolder,
 		ApplyType:     &stringHolder,
 	}
@@ -172,9 +173,9 @@ func AppMenuActionSeederInit() *AppMenuEntity {
 	tildaRef := "~"
 	_ = tildaRef
 	entity := &AppMenuEntity{
+		Label:         &tildaRef,
 		Href:          &tildaRef,
 		Icon:          &tildaRef,
-		Label:         &tildaRef,
 		ActiveMatcher: &tildaRef,
 		ApplyType:     &tildaRef,
 	}
@@ -517,6 +518,11 @@ var AppMenuCommonCliFlags = []cli.Flag{
 		Required: false,
 		Usage:    " Parent record id of the same type",
 	},
+	&cli.StringFlag{
+		Name:     "label",
+		Required: false,
+		Usage:    "label",
+	},
 	&cli.StringFlag{
 		Name:     "href",
 		Required: false,
@@ -527,11 +533,6 @@ var AppMenuCommonCliFlags = []cli.Flag{
 		Required: false,
 		Usage:    "icon",
 	},
-	&cli.StringFlag{
-		Name:     "label",
-		Required: false,
-		Usage:    "label",
-	},
 	&cli.StringFlag{
 		Name:     "active-matcher",
 		Required: false,
@@ -549,38 +550,43 @@ var AppMenuCommonCliFlags = []cli.Flag{
 	},
 }
 var AppMenuCommonInteractiveCliFlags = []CliInteractiveFlag{
+	{
+		Name:        "label",
+		StructField: "Label",
+		Required:    false,
+		Recommended: true,
+		Usage:       "label",
+		Type:        "string",
+	},
 	{
 		Name:        "href",
 		StructField: "Href",
 		Required:    false,
+		Recommended: true,
 		Usage:       "href",
 		Type:        "string",
 	},
 	{
 		Name:        "icon",
 		StructField: "Icon",
 		Required:    false,
+		Recommended: true,
 		Usage:       "icon",
 		Type:        "string",
 	},
-	{
-		Name:        "label",
-		StructField: "Label",
-		Required:    false,
-		Usage:       "label",
-		Type:        "string",
-	},
 	{
 		Name:        "activeMatcher",
 		StructField: "ActiveMatcher",
 		Required:    false,
+		Recommended: false,
 		Usage:       "activeMatcher",
 		Type:        "string",
 	},
 	{
 		Name:        "applyType",
 		StructField: "ApplyType",
 		Required:    false,
+		Recommended: false,
 		Usage:       "applyType",
 		Type:        "string",
 	},
@@ -601,6 +607,11 @@ var AppMenuCommonCliFlagsOptional = []cli.Flag{
 		Required: false,
 		Usage:    " Parent record id of the same type",
 	},
+	&cli.StringFlag{
+		Name:     "label",
+		Required: false,
+		Usage:    "label",
+	},
 	&cli.StringFlag{
 		Name:     "href",
 		Required: false,
@@ -611,11 +622,6 @@ var AppMenuCommonCliFlagsOptional = []cli.Flag{
 		Required: false,
 		Usage:    "icon",
 	},
-	&cli.StringFlag{
-		Name:     "label",
-		Required: false,
-		Usage:    "label",
-	},
 	&cli.StringFlag{
 		Name:     "active-matcher",
 		Required: false,
@@ -647,18 +653,12 @@ var AppMenuCreateInteractiveCmd cli.Command = cli.Command{
 			ActionRequires: []PermissionInfo{PERM_ROOT_APP_MENU_CREATE},
 		})
 		entity := &AppMenuEntity{}
-		for _, item := range AppMenuCommonInteractiveCliFlags {
-			if !item.Required && c.Bool("all") == false {
-				continue
-			}
-			result := AskForInput(item.Name, "")
-			SetFieldString(entity, item.StructField, result)
-		}
+		PopulateInteractively(entity, c, AppMenuCommonInteractiveCliFlags)
 		if entity, err := AppMenuActionCreate(entity, query); err != nil {
 			fmt.Println(err.Error())
 		} else {
-			f, _ := json.MarshalIndent(entity, "", "  ")
-			fmt.Println(string(f))
+			f, _ := yaml.Marshal(entity)
+			fmt.Println(FormatYamlKeys(string(f)))
 		}
 	},
 }
@@ -694,6 +694,10 @@ func CastAppMenuFromCli(c *cli.Context) *AppMenuEntity {
 		x := c.String("pid")
 		template.ParentId = &x
 	}
+	if c.IsSet("label") {
+		value := c.String("label")
+		template.Label = &value
+	}
 	if c.IsSet("href") {
 		value := c.String("href")
 		template.Href = &value
@@ -702,10 +706,6 @@ func CastAppMenuFromCli(c *cli.Context) *AppMenuEntity {
 		value := c.String("icon")
 		template.Icon = &value
 	}
-	if c.IsSet("label") {
-		value := c.String("label")
-		template.Label = &value
-	}
 	if c.IsSet("active-matcher") {
 		value := c.String("active-matcher")
 		template.ActiveMatcher = &value
@@ -942,7 +942,7 @@ func AppMenuCliFn() cli.Command {
 	AppMenuCliCommands = append(AppMenuCliCommands, AppMenuImportExportCommands...)
 	return cli.Command{
 		Name:        "appmenu",
-		Description: "AppMenus module actions (sample module to handle complex entities)",
+		Description: "AppMenus module actions",
 		Usage:       "Manages the menus in the app, (for example tab views, sidebar items, etc.)",
 		Flags: []cli.Flag{
 			&cli.StringFlag{

modules/workspaces/AssignRoleDto.dyno.go

@@ -1,7 +1,7 @@
 package workspaces
 
 /*
-*	Generated by fireback 1.1.26
+*	Generated by fireback 1.1.27
 *	Written by Ali Torabi.
 *	Checkout the repository for licenses and contribution: https://github.com/torabian/fireback
  */

modules/workspaces/AuthContextDto.dyno.go

@@ -1,7 +1,7 @@
 package workspaces
 
 /*
-*	Generated by fireback 1.1.26
+*	Generated by fireback 1.1.27
 *	Written by Ali Torabi.
 *	Checkout the repository for licenses and contribution: https://github.com/torabian/fireback
  */

modules/workspaces/AuthResultDto.dyno.go

@@ -1,7 +1,7 @@
 package workspaces
 
 /*
-*	Generated by fireback 1.1.26
+*	Generated by fireback 1.1.27
 *	Written by Ali Torabi.
 *	Checkout the repository for licenses and contribution: https://github.com/torabian/fireback
  */

modules/workspaces/BackupTableMetaEntity.dyno.go

@@ -1,7 +1,7 @@
 package workspaces
 
 /*
-*	Generated by fireback 1.1.26
+*	Generated by fireback 1.1.27
 *	Written by Ali Torabi.
 *	Checkout the repository for licenses and contribution: https://github.com/torabian/fireback
  */
@@ -18,6 +18,7 @@ import (
 	mocks "github.com/torabian/fireback/modules/workspaces/mocks/BackupTableMeta"
 	seeders "github.com/torabian/fireback/modules/workspaces/seeders/BackupTableMeta"
 	"github.com/urfave/cli"
+	"gopkg.in/yaml.v2"
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
 	reflect "reflect"
@@ -444,6 +445,7 @@ var BackupTableMetaCommonInteractiveCliFlags = []CliInteractiveFlag{
 		Name:        "tableNameInDb",
 		StructField: "TableNameInDb",
 		Required:    false,
+		Recommended: false,
 		Usage:       "tableNameInDb",
 		Type:        "string",
 	},
@@ -485,18 +487,12 @@ var BackupTableMetaCreateInteractiveCmd cli.Command = cli.Command{
 			ActionRequires: []PermissionInfo{PERM_ROOT_BACKUP_TABLE_META_CREATE},
 		})
 		entity := &BackupTableMetaEntity{}
-		for _, item := range BackupTableMetaCommonInteractiveCliFlags {
-			if !item.Required && c.Bool("all") == false {
-				continue
-			}
-			result := AskForInput(item.Name, "")
-			SetFieldString(entity, item.StructField, result)
-		}
+		PopulateInteractively(entity, c, BackupTableMetaCommonInteractiveCliFlags)
 		if entity, err := BackupTableMetaActionCreate(entity, query); err != nil {
 			fmt.Println(err.Error())
 		} else {
-			f, _ := json.MarshalIndent(entity, "", "  ")
-			fmt.Println(string(f))
+			f, _ := yaml.Marshal(entity)
+			fmt.Println(FormatYamlKeys(string(f)))
 		}
 	},
 }
@@ -758,7 +754,7 @@ func BackupTableMetaCliFn() cli.Command {
 	BackupTableMetaCliCommands = append(BackupTableMetaCliCommands, BackupTableMetaImportExportCommands...)
 	return cli.Command{
 		Name:        "backup",
-		Description: "BackupTableMetas module actions (sample module to handle complex entities)",
+		Description: "BackupTableMetas module actions",
 		Usage:       "Keeps information about which tables to be used during backup (mostly internal)",
 		Flags: []cli.Flag{
 			&cli.StringFlag{