Reactive search clean up.

cmd/fireback/main.go

@@ -39,7 +39,6 @@ var xapp = &fireback.FirebackApp{
 		abac.AppMenuSyncSeeders()
 	},
 
-	InjectSearchEndpoint: fireback.InjectReactiveSearch,
 	PublicFolders: []fireback.PublicFolderInfo{
 		// You can set a series of static folders to be served along with fireback.
 		// This is only for static content. For advanced MVX render templates, you need to

e2e/react-bed/src/sdk/modules/fireback/ReactiveSearch.ts

@@ -0,0 +1,41 @@
+import { WebSocketX } from "../../sdk/common/WebSocketX";
+import { buildUrl } from "../../sdk/common/buildUrl";
+import { useWebSocketX } from "../../sdk/react/useWebSocketX";
+/**
+ * Action to communicate with the action ReactiveSearch
+ */
+export type ReactiveSearchActionOptions = {
+  queryKey?: unknown[];
+  qs?: URLSearchParams;
+};
+export const useReactiveSearchAction = (options?: {
+  qs?: URLSearchParams;
+  overrideUrl?: string;
+}) => {
+  return useWebSocketX(() =>
+    ReactiveSearchAction.Create(options?.overrideUrl, options?.qs),
+  );
+};
+/**
+ * ReactiveSearchAction
+ */
+export class ReactiveSearchAction {
+  //
+  static URL = "/reactive-search";
+  static NewUrl = (qs?: URLSearchParams) =>
+    buildUrl(ReactiveSearchAction.URL, undefined, qs);
+  static Method = "reactive";
+  static Create = (overrideUrl?: string, qs?: URLSearchParams) => {
+    const url = overrideUrl ?? ReactiveSearchAction.NewUrl(qs);
+    return new WebSocketX<unknown, unknown>(url, undefined, {
+      MessageFactoryClass: undefined,
+    });
+  };
+  static Definition = {
+    name: "ReactiveSearch",
+    url: "/reactive-search",
+    method: "reactive",
+    description:
+      "Reactive search is a general purpose search mechanism for different modules, and could be used in mobile apps or front-end to quickly search for a entity.",
+  };
+}

e2e/samples/fireback-data-types/cmd/fireback-data-types-server/main.go

@@ -26,8 +26,7 @@ var xapp = &fireback.FirebackApp{
 
 	},
 
-	InjectSearchEndpoint: fireback.InjectReactiveSearch,
-	PublicFolders:        []fireback.PublicFolderInfo{
+	PublicFolders: []fireback.PublicFolderInfo{
 		// You can set a series of static folders to be served along with fireback.
 		// This is only for static content. For advanced MVX render templates, you need to
 		// Bootstrap those themes

e2e/samples/fireback-payment/cmd/fireback-payment-server/main.go

@@ -25,8 +25,7 @@ var xapp = &fireback.FirebackApp{
 
 	},
 
-	InjectSearchEndpoint: fireback.InjectReactiveSearch,
-	PublicFolders:        []fireback.PublicFolderInfo{
+	PublicFolders: []fireback.PublicFolderInfo{
 		// You can set a series of static folders to be served along with fireback.
 		// This is only for static content. For advanced MVX render templates, you need to
 		// Bootstrap those themes

modules/abac/AbacCustomActions.dyno.go

@@ -236,18 +236,6 @@ var SignoutActionCmd cli.Command = cli.Command{
 		fireback.HandleActionInCli(c, result, err, map[string]map[string]string{})
 	},
 }
-var ReactiveSearchSecurityModel *fireback.SecurityModel = nil
-var ReactiveSearchActionImp = fireback.DefaultEmptyReactiveAction
-
-// Reactive action does not have that
-var ReactiveSearchActionCmd cli.Command = cli.Command{
-	Name:  "reactive-search",
-	Usage: `Reactive search is a general purpose search mechanism for different modules, and could be used in mobile apps or front-end to quickly search for a entity.`,
-	Action: func(c *cli.Context) {
-		query := fireback.CommonCliQueryDSLBuilderAuthorize(c, ReactiveSearchSecurityModel)
-		fireback.CliReactivePipeHandler(query, ReactiveSearchActionImp)
-	},
-}
 var ImportUserSecurityModel *fireback.SecurityModel = nil
 
 type ImportUserActionReqDto struct {
@@ -1303,21 +1291,6 @@ func AbacCustomActions() []fireback.Module3Action {
 				Entity: "",
 			},
 		},
-		{
-			Method:        "REACTIVE",
-			Url:           "reactive-search",
-			SecurityModel: ReactiveSearchSecurityModel,
-			Name:          "reactiveSearch",
-			Description:   "Reactive search is a general purpose search mechanism for different modules, and could be used in mobile apps or front-end to quickly search for a entity.",
-			Handlers: []gin.HandlerFunc{
-				fireback.ReactiveSocketHandler(ReactiveSearchActionImp),
-			},
-			Format:         "REACTIVE",
-			ResponseEntity: string(""),
-			Out: &fireback.Module3ActionBody{
-				Entity: "",
-			},
-		},
 		{
 			Method:        "POST",
 			Url:           "/user/import",
@@ -1465,7 +1438,6 @@ var AbacCustomActionsCli = []cli.Command{
 	UserInvitationsActionCmd,
 	QueryUserRoleWorkspacesActionCmd,
 	SignoutActionCmd,
-	ReactiveSearchActionCmd,
 	ImportUserActionCmd,
 	SendEmailActionCmd,
 	SendEmailWithProviderActionCmd,
@@ -1504,7 +1476,6 @@ var AbacCliActionsBundle = &fireback.CliActionsBundle{
 		UserInvitationsActionCmd,
 		QueryUserRoleWorkspacesActionCmd,
 		SignoutActionCmd,
-		ReactiveSearchActionCmd,
 		ImportUserActionCmd,
 		SendEmailActionCmd,
 		SendEmailWithProviderActionCmd,

modules/abac/AbacModule.go

@@ -26,7 +26,33 @@ func AppMenuWriteQueryCteMock(ctx fireback.MockQueryContext) {
 	}
 }
 
-func workspaceModuleCore(module *fireback.ModuleProvider) {
+type MicroserviceSetupConfig struct {
+	AuthorizationResolver WithAuthorizationPureImpl
+}
+
+// Inject this into any project as a complete solution
+func AbacCompleteModules() []*fireback.ModuleProvider {
+	return []*fireback.ModuleProvider{
+		WorkspaceModuleSetup(),
+		DriveModuleSetup(),
+		NotificationModuleSetup(),
+		PassportsModuleSetup(),
+	}
+}
+
+func WorkspaceModuleSetup() *fireback.ModuleProvider {
+
+	// Default Fireback authorization. You can Override this on microservices
+	fireback.WithAuthorizationPure = WithAuthorizationPureDefault
+	fireback.WithAuthorizationFn = WithAuthorizationFn
+	fireback.WithSocketAuthorization = WithSocketAuthorization
+
+	module := &fireback.ModuleProvider{
+		Name:               "abac",
+		Definitions:        &Module3Definitions,
+		OnEnvInit:          OnInitEnvHook,
+		GoMigrateDirectory: &migrations.MigrationsFs,
+	}
 
 	module.ProvidePermissionHandler(
 		ALL_WORKSPACE_CONFIG_PERMISSIONS,
@@ -88,38 +114,6 @@ func workspaceModuleCore(module *fireback.ModuleProvider) {
 		return RepairTheWorkspaces()
 	})
 
-}
-
-type MicroserviceSetupConfig struct {
-	AuthorizationResolver WithAuthorizationPureImpl
-}
-
-// Inject this into any project as a complete solution
-func AbacCompleteModules() []*fireback.ModuleProvider {
-	return []*fireback.ModuleProvider{
-		WorkspaceModuleSetup(),
-		DriveModuleSetup(),
-		NotificationModuleSetup(),
-		PassportsModuleSetup(),
-	}
-}
-
-func WorkspaceModuleSetup() *fireback.ModuleProvider {
-
-	// Default Fireback authorization. You can Override this on microservices
-	fireback.WithAuthorizationPure = WithAuthorizationPureDefault
-	fireback.WithAuthorizationFn = WithAuthorizationFn
-	fireback.WithSocketAuthorization = WithSocketAuthorization
-
-	module := &fireback.ModuleProvider{
-		Name:               "abac",
-		Definitions:        &Module3Definitions,
-		OnEnvInit:          OnInitEnvHook,
-		GoMigrateDirectory: &migrations.MigrationsFs,
-	}
-
-	workspaceModuleCore(module)
-
 	module.ProvideMockWriterHandler(func(languages []string) {
 		// WorkspaceTypeWriteQueryMock(MockQueryContext{Languages: languages})
 		// GsmProviderWriteQueryMock(MockQueryContext{Languages: languages})

modules/abac/AbacModule3.yml

@@ -72,22 +72,6 @@ dtom:
         type: string
       - name: workspaceTypeId
         type: string
-  - name: reactiveSearchResult
-    fields:
-      - type: string
-        name: uniqueId
-      - type: string
-        name: phrase
-      - type: string
-        name: icon
-      - type: string
-        name: description
-      - type: string
-        name: group
-      - type: string
-        name: uiLocation
-      - type: string
-        name: actionFn
   - name: assignRole
     fields:
       - name: roleId
@@ -651,13 +635,6 @@ actions:
     description: Signout the user, clears cookies or does anything else if needed.
     method: post
 
-  - name: reactiveSearch
-    description:
-      Reactive search is a general purpose search mechanism for different modules,
-      and could be used in mobile apps or front-end to quickly search for a entity.
-    url: reactive-search
-    method: reactive
-    format: reactive
   - name: importUser
     url: /user/import
     method: post