query node - graphql playground fix and query templates IV

query-node/codegen/package.json

@@ -6,7 +6,7 @@
   "license": "ISC",
   "scripts": {},
   "dependencies": {
-    "@joystream/hydra-cli": "3.1.0-alpha.19",
-    "@joystream/hydra-typegen": "3.1.0-alpha.19"
+    "@joystream/hydra-cli": "^3.1.0-alpha.20",
+    "@joystream/hydra-typegen": "^3.1.0-alpha.20"
   }
 }

query-node/codegen/yarn.lock

@@ -33,9 +33,9 @@
   dependencies:
     xss "^1.0.8"
 
-"@apollographql/graphql-playground-react@https://github.com/Joystream/graphql-playground/releases/download/joystream%401.7.28/graphql-playground-react-v1.7.28.tgz":
-  version "1.7.28"
-  resolved "https://github.com/Joystream/graphql-playground/releases/download/joystream%401.7.28/graphql-playground-react-v1.7.28.tgz#24c9c54e14ae0ba13c894738b4b87301f5801b26"
+"@apollographql/graphql-playground-react@https://github.com/Joystream/graphql-playground/releases/download/graphql-playground-react%401.7.29/graphql-playground-react-v1.7.29.tgz":
+  version "1.7.29"
+  resolved "https://github.com/Joystream/graphql-playground/releases/download/graphql-playground-react%401.7.29/graphql-playground-react-v1.7.29.tgz#bf0bf4a72f74de156ccf2a8638e7cb617a8b41e2"
   dependencies:
     "@types/lru-cache" "^4.1.1"
     apollo-link "^1.2.13"
@@ -306,15 +306,15 @@
   resolved "https://registry.yarnpkg.com/@josephg/resolvable/-/resolvable-1.0.1.tgz#69bc4db754d79e1a2f17a650d3466e038d94a5eb"
   integrity sha512-CtzORUwWTTOTqfVtHaKRJ0I1kNQd1bpn3sUh8I3nJDVY+5/M/Oe1DnEWzPQvqq/xPIIkzzzIP7mfCoAjFRvDhg==
 
-"@joystream/hydra-cli@3.1.0-alpha.19":
-  version "3.1.0-alpha.19"
-  resolved "https://registry.yarnpkg.com/@joystream/hydra-cli/-/hydra-cli-3.1.0-alpha.19.tgz#d7581a4af6455f73226959fe0658768410f4bab2"
-  integrity sha512-NpJSIss1a+LlJRh54ul6huE6ro5wrjqmdf64ePovMsTsHiumKAbY9jxCR/vN6zDhZ4jml/NAyUes3nbYb6RZsg==
+"@joystream/hydra-cli@^3.1.0-alpha.20":
+  version "3.1.0-alpha.20"
+  resolved "https://registry.yarnpkg.com/@joystream/hydra-cli/-/hydra-cli-3.1.0-alpha.20.tgz#cb114994b6b74761164796540b6d64ad1096f219"
+  integrity sha512-NFDnNjt7E+HLpIBbKwJSh+1MZ+hZgGzPmLY6Ux+7lSW+g8DiMc7ZnuYRHkEEIUrDyiPTapKDF3bWmo5LD6lHQA==
   dependencies:
     "@inquirer/input" "^0.0.13-alpha.0"
     "@inquirer/password" "^0.0.12-alpha.0"
     "@inquirer/select" "^0.0.13-alpha.0"
-    "@joystream/warthog" "^2.41.3"
+    "@joystream/warthog" "^2.41.4"
     "@oclif/command" "^1.5.20"
     "@oclif/config" "^1"
     "@oclif/errors" "^1.3.3"
@@ -342,10 +342,10 @@
     pluralize "^8.0.0"
     tslib "1.11.2"
 
-"@joystream/hydra-typegen@3.1.0-alpha.19":
-  version "3.1.0-alpha.19"
-  resolved "https://registry.yarnpkg.com/@joystream/hydra-typegen/-/hydra-typegen-3.1.0-alpha.19.tgz#9913d756e67e12a9ad109688b520d25790a6b036"
-  integrity sha512-FrWIXYgrxeIRYwqlaNOwytum91sM1n4qKI3BIkHGoEfmegmTi+5+3tMRavKG+mST/Mq2OIu+LJ4VJP4POaCO3g==
+"@joystream/hydra-typegen@^3.1.0-alpha.20":
+  version "3.1.0-alpha.20"
+  resolved "https://registry.yarnpkg.com/@joystream/hydra-typegen/-/hydra-typegen-3.1.0-alpha.20.tgz#dbfc608908fa3809a9904a8165281111b4a104f9"
+  integrity sha512-+hDsr2Ys+UoVuOLj0kCoUq3+DcNopgNkzxQ6c1o1EyAVh5/a5dmp/jjxpLkN/CvIKej19pZqM3q914G8rYi/7g==
   dependencies:
     "@oclif/command" "^1.8.0"
     "@oclif/config" "^1"
@@ -358,12 +358,12 @@
     yaml "^1.10.0"
     yaml-validator "^3.0.0"
 
-"@joystream/warthog@^2.41.3":
-  version "2.41.3"
-  resolved "https://registry.yarnpkg.com/@joystream/warthog/-/warthog-2.41.3.tgz#12f1ff73f29264dd6ebce1c90ff2dad6b1467871"
-  integrity sha512-CM337UO31zHRgkK1RWpvUr3esQIYmLrpqv/yBOgescNLth/MlfnUpDHV/9fCGfquvFdk/HSUyZFy/6KrJrPXjA==
+"@joystream/warthog@^2.41.4":
+  version "2.41.4"
+  resolved "https://registry.yarnpkg.com/@joystream/warthog/-/warthog-2.41.4.tgz#4b0a396d9d6eee9e469a36b1ca1c86c3890d56d6"
+  integrity sha512-yfGgrjbg3alGR+7g1NcSTdlpYtgH0kDFNDSKFWiYFEPNsjwwCBgWnsVQ+ED1PWAa2RhUhwp9J4dsI5U21P543A==
   dependencies:
-    "@apollographql/graphql-playground-react" "https://github.com/Joystream/graphql-playground/releases/download/joystream%401.7.28/graphql-playground-react-v1.7.28.tgz"
+    "@apollographql/graphql-playground-react" "https://github.com/Joystream/graphql-playground/releases/download/graphql-playground-react%401.7.29/graphql-playground-react-v1.7.29.tgz"
     "@types/app-root-path" "^1.2.4"
     "@types/bn.js" "^4.11.6"
     "@types/caller" "^1.0.0"

query-node/mappings/package.json

@@ -18,8 +18,8 @@
   },
   "dependencies": {
     "@polkadot/types": "5.9.1",
-    "@joystream/hydra-common": "3.1.0-alpha.19",
-    "@joystream/hydra-db-utils": "3.1.0-alpha.19",
+    "@joystream/hydra-common": "^3.1.0-alpha.20",
+    "@joystream/hydra-db-utils": "^3.1.0-alpha.20",
     "@joystream/metadata-protobuf": "^2.0.0",
     "@joystream/types": "^0.18.0",
     "@joystream/warthog": "2.41.2",

query-node/mappings/queryTemplates.ts

@@ -12,22 +12,12 @@ const commonIgnoredFields = [
   'updatedById',
   'deletedById',
   'version',
-
-  // type in `DataObject`'s causes problems - don't use it for now
-  'type',
-]
-
-const dataObjectIgnoredFields = [
-  ...commonIgnoredFields,
-
-  // dataObject's `owner` is problematic because it's variant and will need some special handling
-  'owner',
 ]
 
 const exampleDate = `"2018-01-31 23:59"`
 
 export const queryTemplates: IQueryTemplate[] = [
-  ...queryTemplateUtils.getOneGetAllTemplates('video', 'videos', 'videos', dataObjectIgnoredFields),
+  ...queryTemplateUtils.getOneGetAllTemplates('video', 'videos', 'videos', commonIgnoredFields),
   {
     title: 'Featured videos',
     description: 'Get all featured videos.',
@@ -65,7 +55,7 @@ export const queryTemplates: IQueryTemplate[] = [
       videos(where: { category: { id_eq: 1 } }) { ${queryTemplateUtils.allPropsMarker} }
     }`,
   },
-  ...queryTemplateUtils.getOneGetAllTemplates('channel', 'channels', 'channels', dataObjectIgnoredFields),
+  ...queryTemplateUtils.getOneGetAllTemplates('channel', 'channels', 'channels', commonIgnoredFields),
   ...queryTemplateUtils.getOneGetAllTemplates(
     'channel category',
     'channels categories',
@@ -83,9 +73,9 @@ export const queryTemplates: IQueryTemplate[] = [
     }`,
   },
 
-  ...queryTemplateUtils.getOneGetAllTemplates('asset', 'assets', 'dataObjects', dataObjectIgnoredFields),
+  ...queryTemplateUtils.getOneGetAllTemplates('asset', 'assets', 'storageDataObjects', commonIgnoredFields),
   ...queryTemplateUtils.getOneGetAllTemplates('membership', 'memberships', 'memberships', commonIgnoredFields),
 
   ...queryTemplateUtils.getOneGetAllTemplates('curator group', 'curator groups', 'curatorGroups', commonIgnoredFields),
-  ...queryTemplateUtils.getOneGetAllTemplates('worker', 'workers', 'workers', dataObjectIgnoredFields),
+  ...queryTemplateUtils.getOneGetAllTemplates('worker', 'workers', 'workers', commonIgnoredFields),
 ].map(queryTemplateUtils.formatQuery)

query-node/package.json

@@ -35,7 +35,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@joystream/hydra-processor": "3.1.0-alpha.19",
+    "@joystream/hydra-processor": "^3.1.0-alpha.20",
     "@polkadot/metadata": "^4.17.1",
     "@types/bn.js": "^4.11.6",
     "bn.js": "^5.1.2",

yarn.lock

@@ -152,9 +152,66 @@
   dependencies:
     xss "^1.0.8"
 
+"@apollographql/graphql-playground-react@https://github.com/Joystream/graphql-playground/releases/download/graphql-playground-react%401.7.29/graphql-playground-react-v1.7.29.tgz":
+  version "1.7.29"
+  resolved "https://github.com/Joystream/graphql-playground/releases/download/graphql-playground-react%401.7.29/graphql-playground-react-v1.7.29.tgz#bf0bf4a72f74de156ccf2a8638e7cb617a8b41e2"
+  dependencies:
+    "@types/lru-cache" "^4.1.1"
+    apollo-link "^1.2.13"
+    apollo-link-http "^1.5.16"
+    apollo-link-ws "^1.0.19"
+    calculate-size "^1.1.1"
+    codemirror "^5.58.1"
+    codemirror-graphql "^0.12.3"
+    copy-to-clipboard "^3.0.8"
+    cryptiles "4.1.2"
+    cuid "^1.3.8"
+    graphiql "^0.17.5"
+    graphql "^15.3.0"
+    immutable "^4.0.0-rc.9"
+    isomorphic-fetch "^2.2.1"
+    js-yaml "^3.10.0"
+    json-stable-stringify "^1.0.1"
+    keycode "^2.1.9"
+    lodash "^4.17.11"
+    lodash.debounce "^4.0.8"
+    markdown-it "^8.4.1"
+    marked "^0.8.2"
+    prettier "2.0.2"
+    prop-types "^15.7.2"
+    query-string "5"
+    react "16.13.1"
+    react-addons-shallow-compare "^15.6.2"
+    react-codemirror "^1.0.0"
+    react-copy-to-clipboard "^5.0.1"
+    react-display-name "^0.2.3"
+    react-dom "^16.13.1"
+    react-helmet "^5.2.0"
+    react-input-autosize "^2.2.1"
+    react-modal "^3.1.11"
+    react-redux "^7.2.1"
+    react-router-dom "^4.2.2"
+    react-sortable-hoc "^0.8.3"
+    react-transition-group "^2.2.1"
+    react-virtualized "^9.12.0"
+    redux "^4.0.5"
+    redux-actions "^2.6.5"
+    redux-immutable "^4.0.0"
+    redux-localstorage "^1.0.0-rc5"
+    redux-localstorage-debounce "^0.1.0"
+    redux-localstorage-filter "^0.1.1"
+    redux-saga "^1.1.3"
+    reselect "^4.0.0"
+    seamless-immutable "^7.0.1"
+    styled-components "^4.0.0"
+    subscriptions-transport-ws "^0.9.5"
+    utility-types "^1.0.0"
+    webpack-bundle-analyzer "^3.3.2"
+    zen-observable "^0.7.1"
+
 "@apollographql/graphql-playground-react@https://github.com/Joystream/graphql-playground/releases/download/joystream%401.7.28/graphql-playground-react-v1.7.28.tgz":
   version "1.7.28"
-  resolved "https://github.com/Joystream/graphql-playground/releases/download/joystream%401.7.28/graphql-playground-react-v1.7.28.tgz#24c9c54e14ae0ba13c894738b4b87301f5801b26"
+  resolved "file:/mnt/work/Joystream/graphql-playground/packages/graphql-playground-react/graphql-playground-react-v1.7.28_8.tgz#382b808f424b7c62662990d44a739574a40dbecc"
   dependencies:
     "@types/lru-cache" "^4.1.1"
     apollo-link "^1.2.13"
@@ -1987,32 +2044,32 @@
   resolved "https://registry.yarnpkg.com/@josephg/resolvable/-/resolvable-1.0.0.tgz#cd75b09cfad18cd945de9221d403203aa07e3d0a"
   integrity sha512-OfTtjoqB2doov5aTJxkyAMK8dXoo7CjCUQSYUEtiY34jbWduOGV7+168tmCT8COMsUEd5DMSFg/0iAOPCBTNAQ==
 
-"@joystream/hydra-common@3.1.0-alpha.19", "@joystream/hydra-common@^3.1.0-alpha.19":
-  version "3.1.0-alpha.19"
-  resolved "https://registry.yarnpkg.com/@joystream/hydra-common/-/hydra-common-3.1.0-alpha.19.tgz#e87091c2b89fcd47b5d5223984160a2bd9421112"
-  integrity sha512-ezD6Xb2VqCYuoR7b54Mc+y5PlGt6hg0tzfXfp2MmQiQ8f/Bs4ng7YreJqkb6BmTCEu7VVoaGqY+OqHsXBGpqlw==
+"@joystream/hydra-common@^3.1.0-alpha.20":
+  version "3.1.0-alpha.20"
+  resolved "https://registry.yarnpkg.com/@joystream/hydra-common/-/hydra-common-3.1.0-alpha.20.tgz#5fa29183b3ee4bcbd10a5b4f355cdce74d507e3b"
+  integrity sha512-4W6ewAu0f0KF46Q7+bZL1RZIWDmuRH6PXLkAKJ6eYYdWLfbLNxVxt09mhFbee+lHERD1M30D53FX97kgQ+is9g==
   dependencies:
     bn.js "^5.1.3"
 
-"@joystream/hydra-db-utils@3.1.0-alpha.19", "@joystream/hydra-db-utils@^3.1.0-alpha.19":
-  version "3.1.0-alpha.19"
-  resolved "https://registry.yarnpkg.com/@joystream/hydra-db-utils/-/hydra-db-utils-3.1.0-alpha.19.tgz#5709906e22a8f4fa9a3dfc43c794e7920c737670"
-  integrity sha512-lIxRUrlulVzX5IYG7YzytTjySGAwLHPn55pn2qbzQNjfZELSt3LFAhg26A8GFNcXTz+oVQtXMPohvDIT6+x3vA==
+"@joystream/hydra-db-utils@^3.1.0-alpha.20":
+  version "3.1.0-alpha.20"
+  resolved "https://registry.yarnpkg.com/@joystream/hydra-db-utils/-/hydra-db-utils-3.1.0-alpha.20.tgz#9894644f9aaf371a229f4425752c221dfac2711e"
+  integrity sha512-7fmUZPxPaMDaEQBUNcIkFCKju+vdWRCeleSjJaGwtRdhBASIfIlXWcZdd2oafmUPQTVS7A2zAzdKKK1jodafWQ==
   dependencies:
-    "@joystream/hydra-common" "^3.1.0-alpha.19"
+    "@joystream/hydra-common" "^3.1.0-alpha.20"
     "@types/ioredis" "^4.17.4"
     bn.js "^5.1.3"
     ioredis "^4.17.3"
     lodash "^4.17.20"
     typeorm "^0.2.25"
 
-"@joystream/hydra-processor@3.1.0-alpha.19":
-  version "3.1.0-alpha.19"
-  resolved "https://registry.yarnpkg.com/@joystream/hydra-processor/-/hydra-processor-3.1.0-alpha.19.tgz#d44d34b9badd22312983b92ef35380b4c5fad253"
-  integrity sha512-/2zXMNdpsG1Vu1LQgk0Y96fvWuBSVRfNCapIL1EE/TdwyLrFU5vbuyoUq6+M90YHJJh85NCfwZC+JFlXw56hUA==
+"@joystream/hydra-processor@^3.1.0-alpha.20":
+  version "3.1.0-alpha.20"
+  resolved "https://registry.yarnpkg.com/@joystream/hydra-processor/-/hydra-processor-3.1.0-alpha.20.tgz#e9c72e6a60fdd862805b28c9c80109e0e0bee6f3"
+  integrity sha512-YCu2knfTHUUTOsE5+rc6QKVRDPUnJj/LML0ys/FZ1QbzZeB5gM+T7zQOHlRJ9tN1Rg9f0yf6IalZBR5xgxfZyA==
   dependencies:
-    "@joystream/hydra-common" "^3.1.0-alpha.19"
-    "@joystream/hydra-db-utils" "^3.1.0-alpha.19"
+    "@joystream/hydra-common" "^3.1.0-alpha.20"
+    "@joystream/hydra-db-utils" "^3.1.0-alpha.20"
     "@oclif/command" "^1.8.0"
     "@oclif/config" "^1"
     "@oclif/errors" "^1.3.3"
@@ -2101,12 +2158,12 @@
     typeorm-typedi-extensions "^0.4.1"
     typescript "^4.4"
 
-"@joystream/warthog@^2.41.3":
-  version "2.41.3"
-  resolved "https://registry.yarnpkg.com/@joystream/warthog/-/warthog-2.41.3.tgz#12f1ff73f29264dd6ebce1c90ff2dad6b1467871"
-  integrity sha512-CM337UO31zHRgkK1RWpvUr3esQIYmLrpqv/yBOgescNLth/MlfnUpDHV/9fCGfquvFdk/HSUyZFy/6KrJrPXjA==
+"@joystream/warthog@^2.41.4":
+  version "2.41.4"
+  resolved "https://registry.yarnpkg.com/@joystream/warthog/-/warthog-2.41.4.tgz#4b0a396d9d6eee9e469a36b1ca1c86c3890d56d6"
+  integrity sha512-yfGgrjbg3alGR+7g1NcSTdlpYtgH0kDFNDSKFWiYFEPNsjwwCBgWnsVQ+ED1PWAa2RhUhwp9J4dsI5U21P543A==
   dependencies:
-    "@apollographql/graphql-playground-react" "https://github.com/Joystream/graphql-playground/releases/download/joystream%401.7.28/graphql-playground-react-v1.7.28.tgz"
+    "@apollographql/graphql-playground-react" "https://github.com/Joystream/graphql-playground/releases/download/graphql-playground-react%401.7.29/graphql-playground-react-v1.7.29.tgz"
     "@types/app-root-path" "^1.2.4"
     "@types/bn.js" "^4.11.6"
     "@types/caller" "^1.0.0"