2 files changed, 8 insertions(+), 14 deletions(-)

M admin/routes.go
M core/routes.go

@@ 665,8 665,8 @@ func (s *Service) DomainUpdate(c echo.Context) error {
 		var result GraphQLResponse
 
 		op := gqlclient.NewOperation(
-			`mutation UpdateAdminDomain($id: Int!, $name: String!, $lookupName: String!, $orgSlug: String, $level: Int!, $status: Int!
-								$service: Int!, $migrate: Boolean, $isActive: Boolean!) {
+			`mutation UpdateAdminDomain($id: Int!, $name: String!, $lookupName: String!, $orgSlug: String, $level: DomainLevel!, $status: Int!
+								$service: DomainService!, $migrate: Boolean, $isActive: Boolean!) {
 					updateAdminDomain(input: {
 						id: $id,
 						name: $name,


@@ 793,8 793,8 @@ func (s *Service) DomainCreate(c echo.Context) error {
 		}
 
 		op := gqlclient.NewOperation(
-			`mutation AddAdminDomain($name: String!, $lookupName: String!, $orgSlug: String, $level: Int!, $status: Int!
-								$service: Int!, $migrate: Boolean, $isActive: Boolean!) {
+			`mutation AddAdminDomain($name: String!, $lookupName: String!, $orgSlug: String, $level: DomainLevel!, $status: Int!
+								$service: DomainService!, $migrate: Boolean, $isActive: Boolean!) {
 					addAdminDomain(input: {
 						name: $name,
 						lookupName: $lookupName,


@@ 1092,7 1092,7 @@ func (s *Service) DomainList(c echo.Context) error {
 	}
 	var result GraphQLResponse
 	op := gqlclient.NewOperation(
-		`query GetAdminDomains($search: String, $after: Cursor, $before: Cursor, $filterLevel: String, $filterService: Int, $filterActive: Boolean) {
+		`query GetAdminDomains($search: String, $after: Cursor, $before: Cursor, $filterLevel: DomainLevel, $filterService: DomainService, $filterActive: Boolean) {
 			getAdminDomains(input: {
 					search: $search,
 					after: $after,


@@ 1140,19 1140,13 @@ func (s *Service) DomainList(c echo.Context) error {
 	}
 
 	if c.QueryParam("level") != "" {
-		level, err := strconv.Atoi(c.QueryParam("level"))
-		if err != nil {
-			return echo.NotFoundHandler(c)
-		}
+		level := c.QueryParam("level")
 		op.Var("filterLevel", level)
 		gmap["selectedLevel"] = level
 	}
 
 	if c.QueryParam("service") != "" {
-		service, err := strconv.Atoi(c.QueryParam("service"))
-		if err != nil {
-			return echo.NotFoundHandler(c)
-		}
+		service := c.QueryParam("service")
 		op.Var("filterService", service)
 		gmap["selectedService"] = service
 	}

@@ 499,7 499,7 @@ func (s *Service) DomainCreate(c echo.Context) error {
 
 		op := gqlclient.NewOperation(
 			`mutation AddDomain(
-				$name: String!, $lookupName: String!, $orgSlug: String!, $service: Int!, $migrate: Boolean) {
+				$name: String!, $lookupName: String!, $orgSlug: String!, $service: DomainService!, $migrate: Boolean) {
 				addDomain(input: {name: $name, lookupName: $lookupName,
 						  orgSlug: $orgSlug, service: $service, migrateLinks: $migrate}) {
 					id