Merge pull request #131 from databrary/hasura_migration

Update Hasura's column names to camelCase and Upgrade client's Apollo
databrary · Sep 14, 2020 · f96bf3f · f96bf3f
2 parents 426d6fe + 4681c38
commit f96bf3f
Show file tree

Hide file tree

Showing 164 changed files with 230 additions and 2,558 deletions.
diff --git a/Makefile b/Makefile
@@ -63,41 +63,8 @@ upgrade-hasura-cli:
 ##############################################################################
 # Hasura
 ##############################################################################
-HASURA_IMAGE=hasura-cli
-HASURA_DIR=./docker-assets/$(HASURA_IMAGE)
-
-check-image-hasura-cli: FORCE
-	@if [ -z "$$(docker images -q $(HASURA_IMAGE):latest 2> /dev/null)" ]; then\
-		touch $(HASURA_DIR)/Dockerfile;\
-	fi
-
-$(HASURA_DIR): $(HASURA_DIR)/Dockerfile
-	@docker build -t $(HASURA_IMAGE) $(HASURA_DIR)/
-	@touch $@
-
-setup_migrations: check-image-minio-cli $(HASURA_DIR)
-	@docker run\
-		--env-file=./.env\
-		--network="host"\
-		-v ${CURDIR}/hasura:/hasura\
-		-it ${HASURA_IMAGE}\
-		migrate apply --skip-update-check
-	@docker run\
-		--env-file=./.env\
-		--network="host"\
-		-v ${CURDIR}/hasura:/hasura\
-		-it ${HASURA_IMAGE}\
-		metadata apply --skip-update-check
-
-migrate: setup_migrations
+migrate:
 	cd hasura && hasura console && cd ..
-# Problem with console running in docker :P
-# docker run\
-# 	--env-file=./.env\
-# 	--network="host"\
-# 	-v ${CURDIR}/hasura:/hasura\
-# 	-it ${HASURA_IMAGE}\
-# 	console --skip-update-check --no-browser --console-port 9695
 
 ##############################################################################
 # Minio

diff --git a/client/package.json b/client/package.json
@@ -14,6 +14,7 @@
     "build:pwa": "quasar build -m pwa"
   },
   "dependencies": {
+    "@apollo/client": "^3.1.5",
     "@quasar/extras": "^1.8.2",
     "@uppy/aws-s3": "^1.6.2",
     "@uppy/aws-s3-multipart": "^1.6.2",
@@ -24,18 +25,14 @@
     "@uppy/instagram": "^1.4.3",
     "@uppy/url": "^1.5.3",
     "@uppy/webcam": "^1.6.3",
-    "apollo-cache-inmemory": "^1.6.5",
-    "apollo-client": "^2.6.8",
-    "apollo-link": "^1.2.13",
-    "apollo-link-context": "^1.0.19",
-    "apollo-link-http": "^1.5.16",
     "axios": "^0.18.1",
-    "graphql": "^14.5.8",
-    "graphql-tag": "^2.10.1",
+    "fs-extra": "^9.0.1",
+    "graphql": "^15.3.0",
     "js-cookie": "^2.2.1",
     "node-fetch": "^2.6.0",
     "node-sass": "^4.13.1",
     "quasar": "^1.12.12",
+    "react": "^16.13.1",
     "v-runtime-template": "^1.10.0",
     "validator": "^13.0.0",
     "vue-apollo": "^3.0.2",

diff --git a/client/src/boot/apollo.js b/client/src/boot/apollo.js
@@ -1,8 +1,6 @@
-import { ApolloClient } from 'apollo-client'
-import { InMemoryCache } from 'apollo-cache-inmemory'
+import { ApolloClient, InMemoryCache, createHttpLink } from '@apollo/client'
 import VueApollo from 'vue-apollo'
 import fetch from 'node-fetch'
-import { createHttpLink } from 'apollo-link-http'
 
 export default async ({ app, Vue }) => {
   const httpLink = createHttpLink({

diff --git a/client/src/components/FileExplorer.vue b/client/src/components/FileExplorer.vue
@@ -284,10 +284,10 @@ export default {
           query GetProject($projectId: Int!) {
             assets(where: {
               id: {_eq: $projectId},
-              type_id: {_eq: 1}
+              typeId: {_eq: 1}
             }) {
               name
-              datetime_created
+              datetimeCreated
             }
           }
         `,

diff --git a/client/src/graphql/createProject.js b/client/src/graphql/createProject.js
@@ -1,4 +1,4 @@
-import gql from 'graphql-tag'
+import { gql } from '@apollo/client'
 
 export default function createProject (name) {
   return {
@@ -7,8 +7,8 @@ export default function createProject (name) {
         insert_assets(
           objects: {
             name: $name,
-            asset_type: project,
-            privacy_type: private
+            assetType: project,
+            privacyType: private
           }
         ) {
           returning {

diff --git a/client/src/pages/Landing/LandingLoggedIn.vue b/client/src/pages/Landing/LandingLoggedIn.vue
@@ -63,12 +63,12 @@ export default {
         query: gql`
           query GetProjectsByUserId($userId: Int!) {
             assets(
-              where: {asset_type: {_eq: project}, _and: {created_by_id: {_eq: $userId}}}
-              order_by: {datetime_created: desc}
+              where: {assetType: {_eq: project}, _and: {createdById: {_eq: $userId}}}
+              order_by: {datetimeCreated: desc}
             ) {
               id
               name
-              datetime_created
+              datetimeCreated
             }
           }
         `,

diff --git a/client/src/pages/Project/Landing.vue b/client/src/pages/Project/Landing.vue
@@ -270,12 +270,12 @@ export default {
           query GetProject($projectId: Int!) {
             assets(where: {
               id: {_eq: $projectId},
-              asset_type: {_eq: project}
+              assetType: {_eq: project}
             }) {
               id
-              asset_type
+              assetType
               name
-              datetime_created
+              datetimeCreated
             }
           }
         `,