Fix/grapghql cms block

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed handling checkbox custom option -  @gibkigonzo (#2781)
 - Fixed typos in docs - @afozbek (#3709)
 - Fixed VSF build fails for some people due to lack of dependencies in the container - @krskibin (#3699)
+- Fixed two graphql problems, one with cms_blocks and the other with default sort order - @resubaka (#3718)
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)

core/lib/search/adapter/graphql/gqlQuery.js

@@ -45,7 +45,15 @@ export function prepareQueryVars (Request) {
 
   if (Request.sort !== '') {
     const sortParse = Request.sort.split(':')
-    queryVariables.sort[sortParse[0]] = sortParse[1].toUpperCase()
+    if (sortParse[1] !== undefined) {
+      queryVariables.sort[sortParse[0]] = sortParse[1].toUpperCase()
+    } else {
+      if (sortParse[0] === '_score') {
+        queryVariables.sort[sortParse[0]] = 'DESC'
+      } else {
+        queryVariables.sort[sortParse[0]] = 'ASC'
+      }
+    }
   }
 
   queryVariables.pageSize = Request.size

core/lib/search/adapter/graphql/queries/cmsBlock.gql

@@ -5,9 +5,10 @@ query cmsBlocks ($filter: CmsInput) {
   {
     items {
       title
+      id
       identifier
       content
       creation_time
     }
   }
-}
+}