From ab1e4d5424356ae414eb7cc4329eb929661e4821 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 6 Dec 2019 09:26:50 -0800 Subject: [PATCH] Added job list container. Removed all previous migrations. --- README.MD | 7 ++ client/src/App/App.container.jsx | 6 +- client/src/App/App.js | 3 +- .../header-app-bar.container.jsx | 1 + .../job-list/job-list.component.jsx | 6 ++ .../job-list/job-list.container.jsx | 28 ++++++ client/src/components/test-auth.component.jsx | 91 ------------------- .../up.yaml | 18 ---- .../up.yaml | 18 ---- .../up.yaml | 11 --- .../down.yaml | 3 - .../up.yaml | 20 ---- .../down.yaml | 3 - .../up.yaml | 20 ---- .../down.yaml | 48 ---------- .../up.yaml | 80 ---------------- .../down.yaml | 3 - .../up.yaml | 3 - .../down.yaml | 6 -- .../up.yaml | 6 -- .../down.yaml | 6 -- .../up.yaml | 23 ----- .../down.yaml | 6 -- .../up.yaml | 13 --- .../down.yaml | 6 -- .../up.yaml | 15 --- .../down.yaml | 6 -- .../up.yaml | 10 -- .../down.yaml | 6 -- .../up.yaml | 22 ----- .../down.yaml | 6 -- .../up.yaml | 15 --- .../down.yaml | 6 -- .../up.yaml | 17 ---- .../down.yaml | 6 -- .../up.yaml | 12 --- .../down.yaml | 6 -- .../up.yaml | 20 ---- .../down.yaml | 6 -- .../up.yaml | 14 --- .../down.yaml | 6 -- .../up.yaml | 16 ---- .../down.yaml | 6 -- .../up.yaml | 11 --- .../down.yaml | 6 -- .../up.yaml | 25 ----- .../down.yaml | 6 -- .../up.yaml | 22 ----- .../down.yaml | 6 -- .../up.yaml | 24 ----- .../down.yaml | 6 -- .../up.yaml | 13 --- .../down.yaml | 20 ---- .../up.yaml | 23 ----- .../down.yaml | 22 ----- .../up.yaml | 25 ----- .../down.yaml | 22 ----- .../up.yaml | 25 ----- .../down.yaml | 19 ---- .../up.yaml | 26 ------ .../down.yaml | 21 ----- .../up.yaml | 28 ------ .../down.yaml | 6 -- .../up.yaml | 14 --- .../down.yaml | 19 ---- .../up.yaml | 21 ----- .../down.yaml | 19 ---- .../up.yaml | 19 ---- .../down.yaml | 13 --- .../up.yaml | 6 -- .../down.yaml | 6 -- .../up.yaml | 13 --- .../down.yaml | 6 -- .../up.yaml | 13 --- .../down.yaml | 0 .../up.yaml | 2 +- .../down.yaml | 0 .../up.yaml | 15 +++ .../down.yaml | 0 .../up.yaml | 11 +++ .../down.yaml | 0 .../up.yaml | 11 +++ .../down.yaml | 3 + .../up.yaml | 13 +++ package.json | 2 +- 85 files changed, 104 insertions(+), 1088 deletions(-) create mode 100644 client/src/components/job-list/job-list.component.jsx create mode 100644 client/src/components/job-list/job-list.container.jsx delete mode 100644 client/src/components/test-auth.component.jsx delete mode 100644 hasura/migrations/1575502302010_create_table_public_users/up.yaml delete mode 100644 hasura/migrations/1575502389423_create_table_public_bodyshops/up.yaml delete mode 100644 hasura/migrations/1575502585480_create_table_public_associations/up.yaml delete mode 100644 hasura/migrations/1575502690068_create_table_public_estimates/down.yaml delete mode 100644 hasura/migrations/1575502690068_create_table_public_estimates/up.yaml delete mode 100644 hasura/migrations/1575502747859_create_table_public_estimatelines/down.yaml delete mode 100644 hasura/migrations/1575502747859_create_table_public_estimatelines/up.yaml delete mode 100644 hasura/migrations/1575502854774_track_all_relationships/down.yaml delete mode 100644 hasura/migrations/1575502854774_track_all_relationships/up.yaml delete mode 100644 hasura/migrations/1575503794697_alter_table_public_users_add_column_auth0id/down.yaml delete mode 100644 hasura/migrations/1575503794697_alter_table_public_users_add_column_auth0id/up.yaml delete mode 100644 hasura/migrations/1575504519579_alter_table_public_users_alter_column_auth0id/down.yaml delete mode 100644 hasura/migrations/1575504519579_alter_table_public_users_alter_column_auth0id/up.yaml delete mode 100644 hasura/migrations/1575504550932_update_permission_user_public_table_users/down.yaml delete mode 100644 hasura/migrations/1575504550932_update_permission_user_public_table_users/up.yaml delete mode 100644 hasura/migrations/1575504556390_update_permission_user_public_table_users/down.yaml delete mode 100644 hasura/migrations/1575504556390_update_permission_user_public_table_users/up.yaml delete mode 100644 hasura/migrations/1575504560320_update_permission_user_public_table_users/down.yaml delete mode 100644 hasura/migrations/1575504560320_update_permission_user_public_table_users/up.yaml delete mode 100644 hasura/migrations/1575504564505_update_permission_user_public_table_users/down.yaml delete mode 100644 hasura/migrations/1575504564505_update_permission_user_public_table_users/up.yaml delete mode 100644 hasura/migrations/1575504607520_update_permission_user_public_table_bodyshops/down.yaml delete mode 100644 hasura/migrations/1575504607520_update_permission_user_public_table_bodyshops/up.yaml delete mode 100644 hasura/migrations/1575504614012_update_permission_user_public_table_bodyshops/down.yaml delete mode 100644 hasura/migrations/1575504614012_update_permission_user_public_table_bodyshops/up.yaml delete mode 100644 hasura/migrations/1575504617991_update_permission_user_public_table_bodyshops/down.yaml delete mode 100644 hasura/migrations/1575504617991_update_permission_user_public_table_bodyshops/up.yaml delete mode 100644 hasura/migrations/1575504622392_update_permission_user_public_table_bodyshops/down.yaml delete mode 100644 hasura/migrations/1575504622392_update_permission_user_public_table_bodyshops/up.yaml delete mode 100644 hasura/migrations/1575504649963_update_permission_user_public_table_associations/down.yaml delete mode 100644 hasura/migrations/1575504649963_update_permission_user_public_table_associations/up.yaml delete mode 100644 hasura/migrations/1575504656919_update_permission_user_public_table_associations/down.yaml delete mode 100644 hasura/migrations/1575504656919_update_permission_user_public_table_associations/up.yaml delete mode 100644 hasura/migrations/1575504660445_update_permission_user_public_table_associations/down.yaml delete mode 100644 hasura/migrations/1575504660445_update_permission_user_public_table_associations/up.yaml delete mode 100644 hasura/migrations/1575504664957_update_permission_user_public_table_associations/down.yaml delete mode 100644 hasura/migrations/1575504664957_update_permission_user_public_table_associations/up.yaml delete mode 100644 hasura/migrations/1575504748913_update_permission_user_public_table_estimates/down.yaml delete mode 100644 hasura/migrations/1575504748913_update_permission_user_public_table_estimates/up.yaml delete mode 100644 hasura/migrations/1575504762393_update_permission_user_public_table_estimates/down.yaml delete mode 100644 hasura/migrations/1575504762393_update_permission_user_public_table_estimates/up.yaml delete mode 100644 hasura/migrations/1575504767175_update_permission_user_public_table_estimates/down.yaml delete mode 100644 hasura/migrations/1575504767175_update_permission_user_public_table_estimates/up.yaml delete mode 100644 hasura/migrations/1575504773881_update_permission_user_public_table_estimates/down.yaml delete mode 100644 hasura/migrations/1575504773881_update_permission_user_public_table_estimates/up.yaml delete mode 100644 hasura/migrations/1575504784104_update_permission_user_public_table_associations/down.yaml delete mode 100644 hasura/migrations/1575504784104_update_permission_user_public_table_associations/up.yaml delete mode 100644 hasura/migrations/1575504786840_update_permission_user_public_table_associations/down.yaml delete mode 100644 hasura/migrations/1575504786840_update_permission_user_public_table_associations/up.yaml delete mode 100644 hasura/migrations/1575504787774_update_permission_user_public_table_associations/down.yaml delete mode 100644 hasura/migrations/1575504787774_update_permission_user_public_table_associations/up.yaml delete mode 100644 hasura/migrations/1575504809321_update_permission_user_public_table_users/down.yaml delete mode 100644 hasura/migrations/1575504809321_update_permission_user_public_table_users/up.yaml delete mode 100644 hasura/migrations/1575504812353_update_permission_user_public_table_users/down.yaml delete mode 100644 hasura/migrations/1575504812353_update_permission_user_public_table_users/up.yaml delete mode 100644 hasura/migrations/1575607993362_update_permission_anonymous_public_table_masterdata/down.yaml delete mode 100644 hasura/migrations/1575607993362_update_permission_anonymous_public_table_masterdata/up.yaml delete mode 100644 hasura/migrations/1575608000977_update_permission_anonymous_public_table_masterdata/down.yaml delete mode 100644 hasura/migrations/1575608000977_update_permission_anonymous_public_table_masterdata/up.yaml delete mode 100644 hasura/migrations/1575608013056_update_permission_anonymous_public_table_masterdata/down.yaml delete mode 100644 hasura/migrations/1575608013056_update_permission_anonymous_public_table_masterdata/up.yaml delete mode 100644 hasura/migrations/1575608025216_delete_permission_anonymous_public_table_masterdata/down.yaml delete mode 100644 hasura/migrations/1575608025216_delete_permission_anonymous_public_table_masterdata/up.yaml delete mode 100644 hasura/migrations/1575608039178_update_permission_user_public_table_masterdata/down.yaml delete mode 100644 hasura/migrations/1575608039178_update_permission_user_public_table_masterdata/up.yaml delete mode 100644 hasura/migrations/1575608057441_update_permission_anonymous_public_table_masterdata/down.yaml delete mode 100644 hasura/migrations/1575608057441_update_permission_anonymous_public_table_masterdata/up.yaml rename hasura/migrations/{1575607977672_create_table_public_masterdata => 1575616993057_create_table_public_masterdata}/down.yaml (100%) rename hasura/migrations/{1575607977672_create_table_public_masterdata => 1575616993057_create_table_public_masterdata}/up.yaml (78%) rename hasura/migrations/{1575502302010_create_table_public_users => 1575617121272_create_table_public_users}/down.yaml (100%) create mode 100644 hasura/migrations/1575617121272_create_table_public_users/up.yaml rename hasura/migrations/{1575502389423_create_table_public_bodyshops => 1575617170150_create_table_public_bodyshops}/down.yaml (100%) create mode 100644 hasura/migrations/1575617170150_create_table_public_bodyshops/up.yaml rename hasura/migrations/{1575502585480_create_table_public_associations => 1575617232856_create_table_public_associations}/down.yaml (100%) create mode 100644 hasura/migrations/1575617232856_create_table_public_associations/up.yaml create mode 100644 hasura/migrations/1575617285236_create_table_public_jobs/down.yaml create mode 100644 hasura/migrations/1575617285236_create_table_public_jobs/up.yaml diff --git a/README.MD b/README.MD index 0bb0fc015..a106682e9 100644 --- a/README.MD +++ b/README.MD @@ -1,2 +1,9 @@ +React App: +React Hooks are used for Authentication ONLY to ensure the correct web token is passed. + +GraphQL API: +Hasura is hosted on another dyno. Several environmental variables are required, including disabling the console. +ALL CHANGES MUST BE MADE USING LOCAL CONSOLE TO ENSURE DATABASE MIGRATION FILES ARE CREATED. + To Start Hasura CLI: npx hasura console --admin-secret Dev-BodyShopAppBySnaptSoftware! \ No newline at end of file diff --git a/client/src/App/App.container.jsx b/client/src/App/App.container.jsx index 9a88b89bd..c4cbc2f76 100644 --- a/client/src/App/App.container.jsx +++ b/client/src/App/App.container.jsx @@ -10,7 +10,7 @@ export default function Auth() { useEffect(() => { return firebase.auth().onAuthStateChanged(async user => { - console.log("user", user); + console.log("User in App Container.js: ", user); if (user) { const token = await user.getIdToken(); const idTokenResult = await user.getIdTokenResult(); @@ -31,6 +31,10 @@ export default function Auth() { setAuthState({ status: "in", user, token }); }); } + + console.log("#####Logged In. make a gql call to upsert", user); + + } else { setAuthState({ status: "out" }); } diff --git a/client/src/App/App.js b/client/src/App/App.js index 8d756fb93..3814a9c7f 100644 --- a/client/src/App/App.js +++ b/client/src/App/App.js @@ -10,6 +10,7 @@ import "./App.css"; import HeaderAppBarContainer from "../components/header-app-bar/header-app-bar.container"; import SignIn from "../components/sign-in/sign-in.component"; import initialState from "../graphql/initial-state"; +import JobListContainer from "../components/job-list/job-list.container"; //Todo: Issue with this line. Not sure why. const graphqlEndpoint = @@ -37,11 +38,11 @@ export default function App({ authState }) { data: initialState }); - console.log(client); return ( + ); } diff --git a/client/src/components/header-app-bar/header-app-bar.container.jsx b/client/src/components/header-app-bar/header-app-bar.container.jsx index 19a5e564f..4a7ff3a7d 100644 --- a/client/src/components/header-app-bar/header-app-bar.container.jsx +++ b/client/src/components/header-app-bar/header-app-bar.container.jsx @@ -28,6 +28,7 @@ const HeaderAppBarContainer = () => ( {({ loading, error, data }) => { if (loading) return ; + if (error) return ; return ( JobList; +} diff --git a/client/src/components/job-list/job-list.container.jsx b/client/src/components/job-list/job-list.container.jsx new file mode 100644 index 000000000..92a052bea --- /dev/null +++ b/client/src/components/job-list/job-list.container.jsx @@ -0,0 +1,28 @@ +import React from "react"; +import { Query } from "react-apollo"; +import { gql } from "apollo-boost"; + +import { Spin, Alert } from "antd"; + +import JobList from "./job-list.component"; + +const GET_JOBS = gql` + query get_jobs { + estimates { + ro_number + } + } +`; + +const JobListContainer = () => ( + + {({ loading, error, data }) => { + if (loading) return ; + if (error) return ; + console.log("JobListContainer Data:", data); + return ; + }} + +); + +export default JobListContainer; diff --git a/client/src/components/test-auth.component.jsx b/client/src/components/test-auth.component.jsx deleted file mode 100644 index eed58b4ce..000000000 --- a/client/src/components/test-auth.component.jsx +++ /dev/null @@ -1,91 +0,0 @@ -import firebase from "firebase/app"; -import "firebase/auth"; -import "firebase/database"; -import React, { useState, useEffect } from "react"; -import App from "./App"; - -const provider = new firebase.auth.GoogleAuthProvider(); - -// Find these options in your Firebase console -firebase.initializeApp({ - apiKey: "xxx", - authDomain: "xxx", - databaseURL: "xxx", - projectId: "xxx", - storageBucket: "xxx", - messagingSenderId: "xxx" -}); - -export default function Auth() { - const [authState, setAuthState] = useState({ status: "loading" }); - - useEffect(() => { - return firebase.auth().onAuthStateChanged(async user => { - if (user) { - const token = await user.getIdToken(); - const idTokenResult = await user.getIdTokenResult(); - const hasuraClaim = - idTokenResult.claims["https://hasura.io/jwt/claims"]; - - if (hasuraClaim) { - setAuthState({ status: "in", user, token }); - } else { - // Check if refresh is required. - const metadataRef = firebase - .database() - .ref("metadata/" + user.uid + "/refreshTime"); - - metadataRef.on("value", async () => { - // Force refresh to pick up the latest custom claims changes. - const token = await user.getIdToken(true); - setAuthState({ status: "in", user, token }); - }); - } - } else { - setAuthState({ status: "out" }); - } - }); - }, []); - - const signInWithGoogle = async () => { - try { - await firebase.auth().signInWithPopup(provider); - } catch (error) { - console.log(error); - } - }; - - const signOut = async () => { - try { - setAuthState({ status: "loading" }); - await firebase.auth().signOut(); - setAuthState({ status: "out" }); - } catch (error) { - console.log(error); - } - }; - - let content; - if (authState.status === "loading") { - content = null; - } else { - content = ( - <> -
- {authState.status === "in" ? ( -
-

Welcome, {authState.user.displayName}

- -
- ) : ( - - )} -
- - - - ); - } - - return
{content}
; -} \ No newline at end of file diff --git a/hasura/migrations/1575502302010_create_table_public_users/up.yaml b/hasura/migrations/1575502302010_create_table_public_users/up.yaml deleted file mode 100644 index 71f9bec62..000000000 --- a/hasura/migrations/1575502302010_create_table_public_users/up.yaml +++ /dev/null @@ -1,18 +0,0 @@ -- args: - sql: CREATE EXTENSION IF NOT EXISTS pgcrypto; - type: run_sql -- args: - sql: "CREATE TABLE \"public\".\"users\"(\"id\" uuid NOT NULL DEFAULT gen_random_uuid(), - \"username\" text NOT NULL, \"password\" text NOT NULL, \"created_at\" timestamptz - NOT NULL DEFAULT now(), \"updated_at\" timestamptz NOT NULL DEFAULT now(), \"last_login\" - timestamptz, PRIMARY KEY (\"id\") );\nCREATE OR REPLACE FUNCTION \"public\".\"set_current_timestamp_updated_at\"()\nRETURNS - TRIGGER AS $$\nDECLARE\n _new record;\nBEGIN\n _new := NEW;\n _new.\"updated_at\" - = NOW();\n RETURN _new;\nEND;\n$$ LANGUAGE plpgsql;\nCREATE TRIGGER \"set_public_users_updated_at\"\nBEFORE - UPDATE ON \"public\".\"users\"\nFOR EACH ROW\nEXECUTE PROCEDURE \"public\".\"set_current_timestamp_updated_at\"();\nCOMMENT - ON TRIGGER \"set_public_users_updated_at\" ON \"public\".\"users\" \nIS 'trigger - to set value of column \"updated_at\" to current timestamp on row update';\n" - type: run_sql -- args: - name: users - schema: public - type: add_existing_table_or_view diff --git a/hasura/migrations/1575502389423_create_table_public_bodyshops/up.yaml b/hasura/migrations/1575502389423_create_table_public_bodyshops/up.yaml deleted file mode 100644 index 2edb46d6c..000000000 --- a/hasura/migrations/1575502389423_create_table_public_bodyshops/up.yaml +++ /dev/null @@ -1,18 +0,0 @@ -- args: - sql: CREATE EXTENSION IF NOT EXISTS pgcrypto; - type: run_sql -- args: - sql: "CREATE TABLE \"public\".\"bodyshops\"(\"id\" uuid NOT NULL DEFAULT gen_random_uuid(), - \"shop_name\" text NOT NULL, \"created_at\" timestamptz NOT NULL DEFAULT now(), - \"updated_at\" timestamptz NOT NULL DEFAULT now(), PRIMARY KEY (\"id\") );\nCREATE - OR REPLACE FUNCTION \"public\".\"set_current_timestamp_updated_at\"()\nRETURNS - TRIGGER AS $$\nDECLARE\n _new record;\nBEGIN\n _new := NEW;\n _new.\"updated_at\" - = NOW();\n RETURN _new;\nEND;\n$$ LANGUAGE plpgsql;\nCREATE TRIGGER \"set_public_bodyshops_updated_at\"\nBEFORE - UPDATE ON \"public\".\"bodyshops\"\nFOR EACH ROW\nEXECUTE PROCEDURE \"public\".\"set_current_timestamp_updated_at\"();\nCOMMENT - ON TRIGGER \"set_public_bodyshops_updated_at\" ON \"public\".\"bodyshops\" \nIS - 'trigger to set value of column \"updated_at\" to current timestamp on row update';\n" - type: run_sql -- args: - name: bodyshops - schema: public - type: add_existing_table_or_view diff --git a/hasura/migrations/1575502585480_create_table_public_associations/up.yaml b/hasura/migrations/1575502585480_create_table_public_associations/up.yaml deleted file mode 100644 index 609d70ce4..000000000 --- a/hasura/migrations/1575502585480_create_table_public_associations/up.yaml +++ /dev/null @@ -1,11 +0,0 @@ -- args: - sql: CREATE TABLE "public"."associations"("bodyshop" uuid NOT NULL, "user" uuid - NOT NULL, "active" boolean NOT NULL DEFAULT false, PRIMARY KEY ("bodyshop","user") - , FOREIGN KEY ("bodyshop") REFERENCES "public"."bodyshops"("id") ON UPDATE restrict - ON DELETE restrict, FOREIGN KEY ("user") REFERENCES "public"."users"("id") ON - UPDATE restrict ON DELETE restrict); - type: run_sql -- args: - name: associations - schema: public - type: add_existing_table_or_view diff --git a/hasura/migrations/1575502690068_create_table_public_estimates/down.yaml b/hasura/migrations/1575502690068_create_table_public_estimates/down.yaml deleted file mode 100644 index c910009f0..000000000 --- a/hasura/migrations/1575502690068_create_table_public_estimates/down.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- args: - sql: DROP TABLE "public"."estimates" - type: run_sql diff --git a/hasura/migrations/1575502690068_create_table_public_estimates/up.yaml b/hasura/migrations/1575502690068_create_table_public_estimates/up.yaml deleted file mode 100644 index 1a29ca193..000000000 --- a/hasura/migrations/1575502690068_create_table_public_estimates/up.yaml +++ /dev/null @@ -1,20 +0,0 @@ -- args: - sql: CREATE EXTENSION IF NOT EXISTS pgcrypto; - type: run_sql -- args: - sql: "CREATE TABLE \"public\".\"estimates\"(\"id\" uuid NOT NULL DEFAULT gen_random_uuid(), - \"created_at\" timestamptz NOT NULL DEFAULT now(), \"updated_at\" timestamptz - NOT NULL DEFAULT now(), \"est_number\" text NOT NULL, \"ro_number\" text NOT - NULL, \"shopid\" uuid NOT NULL, PRIMARY KEY (\"id\") , FOREIGN KEY (\"shopid\") - REFERENCES \"public\".\"bodyshops\"(\"id\") ON UPDATE restrict ON DELETE restrict);\nCREATE - OR REPLACE FUNCTION \"public\".\"set_current_timestamp_updated_at\"()\nRETURNS - TRIGGER AS $$\nDECLARE\n _new record;\nBEGIN\n _new := NEW;\n _new.\"updated_at\" - = NOW();\n RETURN _new;\nEND;\n$$ LANGUAGE plpgsql;\nCREATE TRIGGER \"set_public_estimates_updated_at\"\nBEFORE - UPDATE ON \"public\".\"estimates\"\nFOR EACH ROW\nEXECUTE PROCEDURE \"public\".\"set_current_timestamp_updated_at\"();\nCOMMENT - ON TRIGGER \"set_public_estimates_updated_at\" ON \"public\".\"estimates\" \nIS - 'trigger to set value of column \"updated_at\" to current timestamp on row update';\n" - type: run_sql -- args: - name: estimates - schema: public - type: add_existing_table_or_view diff --git a/hasura/migrations/1575502747859_create_table_public_estimatelines/down.yaml b/hasura/migrations/1575502747859_create_table_public_estimatelines/down.yaml deleted file mode 100644 index be975fe66..000000000 --- a/hasura/migrations/1575502747859_create_table_public_estimatelines/down.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- args: - sql: DROP TABLE "public"."estimatelines" - type: run_sql diff --git a/hasura/migrations/1575502747859_create_table_public_estimatelines/up.yaml b/hasura/migrations/1575502747859_create_table_public_estimatelines/up.yaml deleted file mode 100644 index 586806c6c..000000000 --- a/hasura/migrations/1575502747859_create_table_public_estimatelines/up.yaml +++ /dev/null @@ -1,20 +0,0 @@ -- args: - sql: CREATE EXTENSION IF NOT EXISTS pgcrypto; - type: run_sql -- args: - sql: "CREATE TABLE \"public\".\"estimatelines\"(\"id\" uuid NOT NULL DEFAULT gen_random_uuid(), - \"created_at\" timestamptz NOT NULL DEFAULT now(), \"updated_at\" timestamptz - NOT NULL DEFAULT now(), \"estimate_id\" uuid NOT NULL, \"line_desc\" text NOT - NULL, PRIMARY KEY (\"id\") , FOREIGN KEY (\"estimate_id\") REFERENCES \"public\".\"estimates\"(\"id\") - ON UPDATE restrict ON DELETE restrict);\nCREATE OR REPLACE FUNCTION \"public\".\"set_current_timestamp_updated_at\"()\nRETURNS - TRIGGER AS $$\nDECLARE\n _new record;\nBEGIN\n _new := NEW;\n _new.\"updated_at\" - = NOW();\n RETURN _new;\nEND;\n$$ LANGUAGE plpgsql;\nCREATE TRIGGER \"set_public_estimatelines_updated_at\"\nBEFORE - UPDATE ON \"public\".\"estimatelines\"\nFOR EACH ROW\nEXECUTE PROCEDURE \"public\".\"set_current_timestamp_updated_at\"();\nCOMMENT - ON TRIGGER \"set_public_estimatelines_updated_at\" ON \"public\".\"estimatelines\" - \nIS 'trigger to set value of column \"updated_at\" to current timestamp on - row update';\n" - type: run_sql -- args: - name: estimatelines - schema: public - type: add_existing_table_or_view diff --git a/hasura/migrations/1575502854774_track_all_relationships/down.yaml b/hasura/migrations/1575502854774_track_all_relationships/down.yaml deleted file mode 100644 index d1bb26823..000000000 --- a/hasura/migrations/1575502854774_track_all_relationships/down.yaml +++ /dev/null @@ -1,48 +0,0 @@ -- args: - relationship: userByUser - table: - name: associations - schema: public - type: drop_relationship -- args: - relationship: bodyshopByBodyshop - table: - name: associations - schema: public - type: drop_relationship -- args: - relationship: associations - table: - name: bodyshops - schema: public - type: drop_relationship -- args: - relationship: estimates - table: - name: bodyshops - schema: public - type: drop_relationship -- args: - relationship: estimate - table: - name: estimatelines - schema: public - type: drop_relationship -- args: - relationship: bodyshop - table: - name: estimates - schema: public - type: drop_relationship -- args: - relationship: estimatelines - table: - name: estimates - schema: public - type: drop_relationship -- args: - relationship: associations - table: - name: users - schema: public - type: drop_relationship diff --git a/hasura/migrations/1575502854774_track_all_relationships/up.yaml b/hasura/migrations/1575502854774_track_all_relationships/up.yaml deleted file mode 100644 index b92a627df..000000000 --- a/hasura/migrations/1575502854774_track_all_relationships/up.yaml +++ /dev/null @@ -1,80 +0,0 @@ -- args: - name: userByUser - table: - name: associations - schema: public - using: - foreign_key_constraint_on: user - type: create_object_relationship -- args: - name: bodyshopByBodyshop - table: - name: associations - schema: public - using: - foreign_key_constraint_on: bodyshop - type: create_object_relationship -- args: - name: associations - table: - name: bodyshops - schema: public - using: - foreign_key_constraint_on: - column: bodyshop - table: - name: associations - schema: public - type: create_array_relationship -- args: - name: estimates - table: - name: bodyshops - schema: public - using: - foreign_key_constraint_on: - column: shopid - table: - name: estimates - schema: public - type: create_array_relationship -- args: - name: estimate - table: - name: estimatelines - schema: public - using: - foreign_key_constraint_on: estimate_id - type: create_object_relationship -- args: - name: bodyshop - table: - name: estimates - schema: public - using: - foreign_key_constraint_on: shopid - type: create_object_relationship -- args: - name: estimatelines - table: - name: estimates - schema: public - using: - foreign_key_constraint_on: - column: estimate_id - table: - name: estimatelines - schema: public - type: create_array_relationship -- args: - name: associations - table: - name: users - schema: public - using: - foreign_key_constraint_on: - column: user - table: - name: associations - schema: public - type: create_array_relationship diff --git a/hasura/migrations/1575503794697_alter_table_public_users_add_column_auth0id/down.yaml b/hasura/migrations/1575503794697_alter_table_public_users_add_column_auth0id/down.yaml deleted file mode 100644 index 549f5c23b..000000000 --- a/hasura/migrations/1575503794697_alter_table_public_users_add_column_auth0id/down.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- args: - sql: ALTER TABLE "public"."users" DROP COLUMN "auth0id"; - type: run_sql diff --git a/hasura/migrations/1575503794697_alter_table_public_users_add_column_auth0id/up.yaml b/hasura/migrations/1575503794697_alter_table_public_users_add_column_auth0id/up.yaml deleted file mode 100644 index 1e85fd246..000000000 --- a/hasura/migrations/1575503794697_alter_table_public_users_add_column_auth0id/up.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- args: - sql: ALTER TABLE "public"."users" ADD COLUMN "auth0id" text NULL; - type: run_sql diff --git a/hasura/migrations/1575504519579_alter_table_public_users_alter_column_auth0id/down.yaml b/hasura/migrations/1575504519579_alter_table_public_users_alter_column_auth0id/down.yaml deleted file mode 100644 index d4a8a1105..000000000 --- a/hasura/migrations/1575504519579_alter_table_public_users_alter_column_auth0id/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - sql: COMMENT ON COLUMN "public"."users"."auth0id" IS E'null' - type: run_sql -- args: - sql: alter table "public"."users" rename column "authid" to "auth0id"; - type: run_sql diff --git a/hasura/migrations/1575504519579_alter_table_public_users_alter_column_auth0id/up.yaml b/hasura/migrations/1575504519579_alter_table_public_users_alter_column_auth0id/up.yaml deleted file mode 100644 index d9ec087e1..000000000 --- a/hasura/migrations/1575504519579_alter_table_public_users_alter_column_auth0id/up.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - sql: COMMENT ON COLUMN "public"."users"."auth0id" IS E'' - type: run_sql -- args: - sql: alter table "public"."users" rename column "auth0id" to "authid"; - type: run_sql diff --git a/hasura/migrations/1575504550932_update_permission_user_public_table_users/down.yaml b/hasura/migrations/1575504550932_update_permission_user_public_table_users/down.yaml deleted file mode 100644 index 5022ed879..000000000 --- a/hasura/migrations/1575504550932_update_permission_user_public_table_users/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: user - table: - name: users - schema: public - type: drop_insert_permission diff --git a/hasura/migrations/1575504550932_update_permission_user_public_table_users/up.yaml b/hasura/migrations/1575504550932_update_permission_user_public_table_users/up.yaml deleted file mode 100644 index e0a399ea8..000000000 --- a/hasura/migrations/1575504550932_update_permission_user_public_table_users/up.yaml +++ /dev/null @@ -1,23 +0,0 @@ -- args: - permission: - allow_upsert: true - check: - authid: - _eq: X-Hasura-User-Id - columns: - - id - - username - - password - - created_at - - updated_at - - last_login - - authid - localPresets: - - key: "" - value: "" - set: {} - role: user - table: - name: users - schema: public - type: create_insert_permission diff --git a/hasura/migrations/1575504556390_update_permission_user_public_table_users/down.yaml b/hasura/migrations/1575504556390_update_permission_user_public_table_users/down.yaml deleted file mode 100644 index 9e5d0dbf1..000000000 --- a/hasura/migrations/1575504556390_update_permission_user_public_table_users/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: user - table: - name: users - schema: public - type: drop_select_permission diff --git a/hasura/migrations/1575504556390_update_permission_user_public_table_users/up.yaml b/hasura/migrations/1575504556390_update_permission_user_public_table_users/up.yaml deleted file mode 100644 index 67cc0c251..000000000 --- a/hasura/migrations/1575504556390_update_permission_user_public_table_users/up.yaml +++ /dev/null @@ -1,13 +0,0 @@ -- args: - permission: - allow_aggregations: false - columns: [] - filter: - authid: - _eq: X-Hasura-User-Id - limit: null - role: user - table: - name: users - schema: public - type: create_select_permission diff --git a/hasura/migrations/1575504560320_update_permission_user_public_table_users/down.yaml b/hasura/migrations/1575504560320_update_permission_user_public_table_users/down.yaml deleted file mode 100644 index 63eb45960..000000000 --- a/hasura/migrations/1575504560320_update_permission_user_public_table_users/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: user - table: - name: users - schema: public - type: drop_update_permission diff --git a/hasura/migrations/1575504560320_update_permission_user_public_table_users/up.yaml b/hasura/migrations/1575504560320_update_permission_user_public_table_users/up.yaml deleted file mode 100644 index 475260b3e..000000000 --- a/hasura/migrations/1575504560320_update_permission_user_public_table_users/up.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- args: - permission: - columns: [] - filter: - authid: - _eq: X-Hasura-User-Id - localPresets: - - key: "" - value: "" - set: {} - role: user - table: - name: users - schema: public - type: create_update_permission diff --git a/hasura/migrations/1575504564505_update_permission_user_public_table_users/down.yaml b/hasura/migrations/1575504564505_update_permission_user_public_table_users/down.yaml deleted file mode 100644 index a92198db1..000000000 --- a/hasura/migrations/1575504564505_update_permission_user_public_table_users/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: user - table: - name: users - schema: public - type: drop_delete_permission diff --git a/hasura/migrations/1575504564505_update_permission_user_public_table_users/up.yaml b/hasura/migrations/1575504564505_update_permission_user_public_table_users/up.yaml deleted file mode 100644 index 21c019c38..000000000 --- a/hasura/migrations/1575504564505_update_permission_user_public_table_users/up.yaml +++ /dev/null @@ -1,10 +0,0 @@ -- args: - permission: - filter: - authid: - _eq: X-Hasura-User-Id - role: user - table: - name: users - schema: public - type: create_delete_permission diff --git a/hasura/migrations/1575504607520_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1575504607520_update_permission_user_public_table_bodyshops/down.yaml deleted file mode 100644 index 4c85bfd3b..000000000 --- a/hasura/migrations/1575504607520_update_permission_user_public_table_bodyshops/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: user - table: - name: bodyshops - schema: public - type: drop_insert_permission diff --git a/hasura/migrations/1575504607520_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1575504607520_update_permission_user_public_table_bodyshops/up.yaml deleted file mode 100644 index 9ef890fc2..000000000 --- a/hasura/migrations/1575504607520_update_permission_user_public_table_bodyshops/up.yaml +++ /dev/null @@ -1,22 +0,0 @@ -- args: - permission: - allow_upsert: true - check: - associations: - userByUser: - authid: - _eq: X-Hasura-User-Id - columns: - - id - - shop_name - - created_at - - updated_at - localPresets: - - key: "" - value: "" - set: {} - role: user - table: - name: bodyshops - schema: public - type: create_insert_permission diff --git a/hasura/migrations/1575504614012_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1575504614012_update_permission_user_public_table_bodyshops/down.yaml deleted file mode 100644 index 8559c1bd2..000000000 --- a/hasura/migrations/1575504614012_update_permission_user_public_table_bodyshops/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: user - table: - name: bodyshops - schema: public - type: drop_select_permission diff --git a/hasura/migrations/1575504614012_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1575504614012_update_permission_user_public_table_bodyshops/up.yaml deleted file mode 100644 index 82bf2b0db..000000000 --- a/hasura/migrations/1575504614012_update_permission_user_public_table_bodyshops/up.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- args: - permission: - allow_aggregations: false - columns: [] - filter: - associations: - userByUser: - authid: - _eq: X-Hasura-User-Id - limit: null - role: user - table: - name: bodyshops - schema: public - type: create_select_permission diff --git a/hasura/migrations/1575504617991_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1575504617991_update_permission_user_public_table_bodyshops/down.yaml deleted file mode 100644 index 0c08e2319..000000000 --- a/hasura/migrations/1575504617991_update_permission_user_public_table_bodyshops/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: user - table: - name: bodyshops - schema: public - type: drop_update_permission diff --git a/hasura/migrations/1575504617991_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1575504617991_update_permission_user_public_table_bodyshops/up.yaml deleted file mode 100644 index 4d95aaa03..000000000 --- a/hasura/migrations/1575504617991_update_permission_user_public_table_bodyshops/up.yaml +++ /dev/null @@ -1,17 +0,0 @@ -- args: - permission: - columns: [] - filter: - associations: - userByUser: - authid: - _eq: X-Hasura-User-Id - localPresets: - - key: "" - value: "" - set: {} - role: user - table: - name: bodyshops - schema: public - type: create_update_permission diff --git a/hasura/migrations/1575504622392_update_permission_user_public_table_bodyshops/down.yaml b/hasura/migrations/1575504622392_update_permission_user_public_table_bodyshops/down.yaml deleted file mode 100644 index 9758a6ff2..000000000 --- a/hasura/migrations/1575504622392_update_permission_user_public_table_bodyshops/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: user - table: - name: bodyshops - schema: public - type: drop_delete_permission diff --git a/hasura/migrations/1575504622392_update_permission_user_public_table_bodyshops/up.yaml b/hasura/migrations/1575504622392_update_permission_user_public_table_bodyshops/up.yaml deleted file mode 100644 index dd6e709be..000000000 --- a/hasura/migrations/1575504622392_update_permission_user_public_table_bodyshops/up.yaml +++ /dev/null @@ -1,12 +0,0 @@ -- args: - permission: - filter: - associations: - userByUser: - authid: - _eq: X-Hasura-User-Id - role: user - table: - name: bodyshops - schema: public - type: create_delete_permission diff --git a/hasura/migrations/1575504649963_update_permission_user_public_table_associations/down.yaml b/hasura/migrations/1575504649963_update_permission_user_public_table_associations/down.yaml deleted file mode 100644 index 8ca0c2e18..000000000 --- a/hasura/migrations/1575504649963_update_permission_user_public_table_associations/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: user - table: - name: associations - schema: public - type: drop_insert_permission diff --git a/hasura/migrations/1575504649963_update_permission_user_public_table_associations/up.yaml b/hasura/migrations/1575504649963_update_permission_user_public_table_associations/up.yaml deleted file mode 100644 index 807605349..000000000 --- a/hasura/migrations/1575504649963_update_permission_user_public_table_associations/up.yaml +++ /dev/null @@ -1,20 +0,0 @@ -- args: - permission: - allow_upsert: true - check: - userByUser: - authid: - _eq: X-Hasura-User-Id - columns: - - bodyshop - - user - - active - localPresets: - - key: "" - value: "" - set: {} - role: user - table: - name: associations - schema: public - type: create_insert_permission diff --git a/hasura/migrations/1575504656919_update_permission_user_public_table_associations/down.yaml b/hasura/migrations/1575504656919_update_permission_user_public_table_associations/down.yaml deleted file mode 100644 index 27cf8ba1e..000000000 --- a/hasura/migrations/1575504656919_update_permission_user_public_table_associations/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: user - table: - name: associations - schema: public - type: drop_select_permission diff --git a/hasura/migrations/1575504656919_update_permission_user_public_table_associations/up.yaml b/hasura/migrations/1575504656919_update_permission_user_public_table_associations/up.yaml deleted file mode 100644 index 4827ed5d9..000000000 --- a/hasura/migrations/1575504656919_update_permission_user_public_table_associations/up.yaml +++ /dev/null @@ -1,14 +0,0 @@ -- args: - permission: - allow_aggregations: false - columns: [] - filter: - userByUser: - authid: - _eq: X-Hasura-User-Id - limit: null - role: user - table: - name: associations - schema: public - type: create_select_permission diff --git a/hasura/migrations/1575504660445_update_permission_user_public_table_associations/down.yaml b/hasura/migrations/1575504660445_update_permission_user_public_table_associations/down.yaml deleted file mode 100644 index f2a2b2d6e..000000000 --- a/hasura/migrations/1575504660445_update_permission_user_public_table_associations/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: user - table: - name: associations - schema: public - type: drop_update_permission diff --git a/hasura/migrations/1575504660445_update_permission_user_public_table_associations/up.yaml b/hasura/migrations/1575504660445_update_permission_user_public_table_associations/up.yaml deleted file mode 100644 index d502a1bd6..000000000 --- a/hasura/migrations/1575504660445_update_permission_user_public_table_associations/up.yaml +++ /dev/null @@ -1,16 +0,0 @@ -- args: - permission: - columns: [] - filter: - userByUser: - authid: - _eq: X-Hasura-User-Id - localPresets: - - key: "" - value: "" - set: {} - role: user - table: - name: associations - schema: public - type: create_update_permission diff --git a/hasura/migrations/1575504664957_update_permission_user_public_table_associations/down.yaml b/hasura/migrations/1575504664957_update_permission_user_public_table_associations/down.yaml deleted file mode 100644 index ec79cd1bc..000000000 --- a/hasura/migrations/1575504664957_update_permission_user_public_table_associations/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: user - table: - name: associations - schema: public - type: drop_delete_permission diff --git a/hasura/migrations/1575504664957_update_permission_user_public_table_associations/up.yaml b/hasura/migrations/1575504664957_update_permission_user_public_table_associations/up.yaml deleted file mode 100644 index 463cb00a5..000000000 --- a/hasura/migrations/1575504664957_update_permission_user_public_table_associations/up.yaml +++ /dev/null @@ -1,11 +0,0 @@ -- args: - permission: - filter: - userByUser: - authid: - _eq: X-Hasura-User-Id - role: user - table: - name: associations - schema: public - type: create_delete_permission diff --git a/hasura/migrations/1575504748913_update_permission_user_public_table_estimates/down.yaml b/hasura/migrations/1575504748913_update_permission_user_public_table_estimates/down.yaml deleted file mode 100644 index af421b834..000000000 --- a/hasura/migrations/1575504748913_update_permission_user_public_table_estimates/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: user - table: - name: estimates - schema: public - type: drop_insert_permission diff --git a/hasura/migrations/1575504748913_update_permission_user_public_table_estimates/up.yaml b/hasura/migrations/1575504748913_update_permission_user_public_table_estimates/up.yaml deleted file mode 100644 index 3ac411c0f..000000000 --- a/hasura/migrations/1575504748913_update_permission_user_public_table_estimates/up.yaml +++ /dev/null @@ -1,25 +0,0 @@ -- args: - permission: - allow_upsert: true - check: - bodyshop: - associations: - userByUser: - authid: - _eq: X-Hasura-User-Id - columns: - - id - - created_at - - updated_at - - est_number - - ro_number - - shopid - localPresets: - - key: "" - value: "" - set: {} - role: user - table: - name: estimates - schema: public - type: create_insert_permission diff --git a/hasura/migrations/1575504762393_update_permission_user_public_table_estimates/down.yaml b/hasura/migrations/1575504762393_update_permission_user_public_table_estimates/down.yaml deleted file mode 100644 index 89144ae94..000000000 --- a/hasura/migrations/1575504762393_update_permission_user_public_table_estimates/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: user - table: - name: estimates - schema: public - type: drop_select_permission diff --git a/hasura/migrations/1575504762393_update_permission_user_public_table_estimates/up.yaml b/hasura/migrations/1575504762393_update_permission_user_public_table_estimates/up.yaml deleted file mode 100644 index 1cab5fc2d..000000000 --- a/hasura/migrations/1575504762393_update_permission_user_public_table_estimates/up.yaml +++ /dev/null @@ -1,22 +0,0 @@ -- args: - permission: - allow_aggregations: false - columns: - - est_number - - ro_number - - created_at - - updated_at - - id - - shopid - filter: - bodyshop: - associations: - userByUser: - authid: - _eq: X-Hasura-User-Id - limit: null - role: user - table: - name: estimates - schema: public - type: create_select_permission diff --git a/hasura/migrations/1575504767175_update_permission_user_public_table_estimates/down.yaml b/hasura/migrations/1575504767175_update_permission_user_public_table_estimates/down.yaml deleted file mode 100644 index bd6d000c6..000000000 --- a/hasura/migrations/1575504767175_update_permission_user_public_table_estimates/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: user - table: - name: estimates - schema: public - type: drop_update_permission diff --git a/hasura/migrations/1575504767175_update_permission_user_public_table_estimates/up.yaml b/hasura/migrations/1575504767175_update_permission_user_public_table_estimates/up.yaml deleted file mode 100644 index 7a30e475c..000000000 --- a/hasura/migrations/1575504767175_update_permission_user_public_table_estimates/up.yaml +++ /dev/null @@ -1,24 +0,0 @@ -- args: - permission: - columns: - - est_number - - ro_number - - created_at - - updated_at - - id - - shopid - filter: - bodyshop: - associations: - userByUser: - authid: - _eq: X-Hasura-User-Id - localPresets: - - key: "" - value: "" - set: {} - role: user - table: - name: estimates - schema: public - type: create_update_permission diff --git a/hasura/migrations/1575504773881_update_permission_user_public_table_estimates/down.yaml b/hasura/migrations/1575504773881_update_permission_user_public_table_estimates/down.yaml deleted file mode 100644 index 2a4e9211f..000000000 --- a/hasura/migrations/1575504773881_update_permission_user_public_table_estimates/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: user - table: - name: estimates - schema: public - type: drop_delete_permission diff --git a/hasura/migrations/1575504773881_update_permission_user_public_table_estimates/up.yaml b/hasura/migrations/1575504773881_update_permission_user_public_table_estimates/up.yaml deleted file mode 100644 index b8da818a9..000000000 --- a/hasura/migrations/1575504773881_update_permission_user_public_table_estimates/up.yaml +++ /dev/null @@ -1,13 +0,0 @@ -- args: - permission: - filter: - bodyshop: - associations: - userByUser: - authid: - _eq: X-Hasura-User-Id - role: user - table: - name: estimates - schema: public - type: create_delete_permission diff --git a/hasura/migrations/1575504784104_update_permission_user_public_table_associations/down.yaml b/hasura/migrations/1575504784104_update_permission_user_public_table_associations/down.yaml deleted file mode 100644 index f703d5fcd..000000000 --- a/hasura/migrations/1575504784104_update_permission_user_public_table_associations/down.yaml +++ /dev/null @@ -1,20 +0,0 @@ -- args: - role: user - table: - name: associations - schema: public - type: drop_select_permission -- args: - permission: - allow_aggregations: false - columns: [] - computed_fields: [] - filter: - userByUser: - authid: - _eq: X-Hasura-User-Id - role: user - table: - name: associations - schema: public - type: create_select_permission diff --git a/hasura/migrations/1575504784104_update_permission_user_public_table_associations/up.yaml b/hasura/migrations/1575504784104_update_permission_user_public_table_associations/up.yaml deleted file mode 100644 index 475933928..000000000 --- a/hasura/migrations/1575504784104_update_permission_user_public_table_associations/up.yaml +++ /dev/null @@ -1,23 +0,0 @@ -- args: - role: user - table: - name: associations - schema: public - type: drop_select_permission -- args: - permission: - allow_aggregations: false - columns: - - bodyshop - - user - - active - computed_fields: [] - filter: - userByUser: - authid: - _eq: X-Hasura-User-Id - role: user - table: - name: associations - schema: public - type: create_select_permission diff --git a/hasura/migrations/1575504786840_update_permission_user_public_table_associations/down.yaml b/hasura/migrations/1575504786840_update_permission_user_public_table_associations/down.yaml deleted file mode 100644 index 784d28242..000000000 --- a/hasura/migrations/1575504786840_update_permission_user_public_table_associations/down.yaml +++ /dev/null @@ -1,22 +0,0 @@ -- args: - role: user - table: - name: associations - schema: public - type: drop_update_permission -- args: - permission: - columns: [] - filter: - userByUser: - authid: - _eq: X-Hasura-User-Id - localPresets: - - key: "" - value: "" - set: {} - role: user - table: - name: associations - schema: public - type: create_update_permission diff --git a/hasura/migrations/1575504786840_update_permission_user_public_table_associations/up.yaml b/hasura/migrations/1575504786840_update_permission_user_public_table_associations/up.yaml deleted file mode 100644 index ac3597aeb..000000000 --- a/hasura/migrations/1575504786840_update_permission_user_public_table_associations/up.yaml +++ /dev/null @@ -1,25 +0,0 @@ -- args: - role: user - table: - name: associations - schema: public - type: drop_update_permission -- args: - permission: - columns: - - active - - bodyshop - - user - filter: - userByUser: - authid: - _eq: X-Hasura-User-Id - localPresets: - - key: "" - value: "" - set: {} - role: user - table: - name: associations - schema: public - type: create_update_permission diff --git a/hasura/migrations/1575504787774_update_permission_user_public_table_associations/down.yaml b/hasura/migrations/1575504787774_update_permission_user_public_table_associations/down.yaml deleted file mode 100644 index 784d28242..000000000 --- a/hasura/migrations/1575504787774_update_permission_user_public_table_associations/down.yaml +++ /dev/null @@ -1,22 +0,0 @@ -- args: - role: user - table: - name: associations - schema: public - type: drop_update_permission -- args: - permission: - columns: [] - filter: - userByUser: - authid: - _eq: X-Hasura-User-Id - localPresets: - - key: "" - value: "" - set: {} - role: user - table: - name: associations - schema: public - type: create_update_permission diff --git a/hasura/migrations/1575504787774_update_permission_user_public_table_associations/up.yaml b/hasura/migrations/1575504787774_update_permission_user_public_table_associations/up.yaml deleted file mode 100644 index ac3597aeb..000000000 --- a/hasura/migrations/1575504787774_update_permission_user_public_table_associations/up.yaml +++ /dev/null @@ -1,25 +0,0 @@ -- args: - role: user - table: - name: associations - schema: public - type: drop_update_permission -- args: - permission: - columns: - - active - - bodyshop - - user - filter: - userByUser: - authid: - _eq: X-Hasura-User-Id - localPresets: - - key: "" - value: "" - set: {} - role: user - table: - name: associations - schema: public - type: create_update_permission diff --git a/hasura/migrations/1575504809321_update_permission_user_public_table_users/down.yaml b/hasura/migrations/1575504809321_update_permission_user_public_table_users/down.yaml deleted file mode 100644 index c137fa321..000000000 --- a/hasura/migrations/1575504809321_update_permission_user_public_table_users/down.yaml +++ /dev/null @@ -1,19 +0,0 @@ -- args: - role: user - table: - name: users - schema: public - type: drop_select_permission -- args: - permission: - allow_aggregations: false - columns: [] - computed_fields: [] - filter: - authid: - _eq: X-Hasura-User-Id - role: user - table: - name: users - schema: public - type: create_select_permission diff --git a/hasura/migrations/1575504809321_update_permission_user_public_table_users/up.yaml b/hasura/migrations/1575504809321_update_permission_user_public_table_users/up.yaml deleted file mode 100644 index bfdbc3a85..000000000 --- a/hasura/migrations/1575504809321_update_permission_user_public_table_users/up.yaml +++ /dev/null @@ -1,26 +0,0 @@ -- args: - role: user - table: - name: users - schema: public - type: drop_select_permission -- args: - permission: - allow_aggregations: false - columns: - - id - - username - - password - - created_at - - updated_at - - last_login - - authid - computed_fields: [] - filter: - authid: - _eq: X-Hasura-User-Id - role: user - table: - name: users - schema: public - type: create_select_permission diff --git a/hasura/migrations/1575504812353_update_permission_user_public_table_users/down.yaml b/hasura/migrations/1575504812353_update_permission_user_public_table_users/down.yaml deleted file mode 100644 index 999a92c01..000000000 --- a/hasura/migrations/1575504812353_update_permission_user_public_table_users/down.yaml +++ /dev/null @@ -1,21 +0,0 @@ -- args: - role: user - table: - name: users - schema: public - type: drop_update_permission -- args: - permission: - columns: [] - filter: - authid: - _eq: X-Hasura-User-Id - localPresets: - - key: "" - value: "" - set: {} - role: user - table: - name: users - schema: public - type: create_update_permission diff --git a/hasura/migrations/1575504812353_update_permission_user_public_table_users/up.yaml b/hasura/migrations/1575504812353_update_permission_user_public_table_users/up.yaml deleted file mode 100644 index ef1ebba79..000000000 --- a/hasura/migrations/1575504812353_update_permission_user_public_table_users/up.yaml +++ /dev/null @@ -1,28 +0,0 @@ -- args: - role: user - table: - name: users - schema: public - type: drop_update_permission -- args: - permission: - columns: - - authid - - password - - username - - created_at - - last_login - - updated_at - - id - filter: - authid: - _eq: X-Hasura-User-Id - localPresets: - - key: "" - value: "" - set: {} - role: user - table: - name: users - schema: public - type: create_update_permission diff --git a/hasura/migrations/1575607993362_update_permission_anonymous_public_table_masterdata/down.yaml b/hasura/migrations/1575607993362_update_permission_anonymous_public_table_masterdata/down.yaml deleted file mode 100644 index 9953c4688..000000000 --- a/hasura/migrations/1575607993362_update_permission_anonymous_public_table_masterdata/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: anonymous - table: - name: masterdata - schema: public - type: drop_insert_permission diff --git a/hasura/migrations/1575607993362_update_permission_anonymous_public_table_masterdata/up.yaml b/hasura/migrations/1575607993362_update_permission_anonymous_public_table_masterdata/up.yaml deleted file mode 100644 index 1abb98eb7..000000000 --- a/hasura/migrations/1575607993362_update_permission_anonymous_public_table_masterdata/up.yaml +++ /dev/null @@ -1,14 +0,0 @@ -- args: - permission: - allow_upsert: true - check: {} - columns: [] - localPresets: - - key: "" - value: "" - set: {} - role: anonymous - table: - name: masterdata - schema: public - type: create_insert_permission diff --git a/hasura/migrations/1575608000977_update_permission_anonymous_public_table_masterdata/down.yaml b/hasura/migrations/1575608000977_update_permission_anonymous_public_table_masterdata/down.yaml deleted file mode 100644 index c4c69ba4d..000000000 --- a/hasura/migrations/1575608000977_update_permission_anonymous_public_table_masterdata/down.yaml +++ /dev/null @@ -1,19 +0,0 @@ -- args: - role: anonymous - table: - name: masterdata - schema: public - type: drop_insert_permission -- args: - permission: - check: {} - columns: [] - localPresets: - - key: "" - value: "" - set: {} - role: anonymous - table: - name: masterdata - schema: public - type: create_insert_permission diff --git a/hasura/migrations/1575608000977_update_permission_anonymous_public_table_masterdata/up.yaml b/hasura/migrations/1575608000977_update_permission_anonymous_public_table_masterdata/up.yaml deleted file mode 100644 index 544194d94..000000000 --- a/hasura/migrations/1575608000977_update_permission_anonymous_public_table_masterdata/up.yaml +++ /dev/null @@ -1,21 +0,0 @@ -- args: - role: anonymous - table: - name: masterdata - schema: public - type: drop_insert_permission -- args: - permission: - check: {} - columns: - - value - - key - localPresets: - - key: "" - value: "" - set: {} - role: anonymous - table: - name: masterdata - schema: public - type: create_insert_permission diff --git a/hasura/migrations/1575608013056_update_permission_anonymous_public_table_masterdata/down.yaml b/hasura/migrations/1575608013056_update_permission_anonymous_public_table_masterdata/down.yaml deleted file mode 100644 index c4c69ba4d..000000000 --- a/hasura/migrations/1575608013056_update_permission_anonymous_public_table_masterdata/down.yaml +++ /dev/null @@ -1,19 +0,0 @@ -- args: - role: anonymous - table: - name: masterdata - schema: public - type: drop_insert_permission -- args: - permission: - check: {} - columns: [] - localPresets: - - key: "" - value: "" - set: {} - role: anonymous - table: - name: masterdata - schema: public - type: create_insert_permission diff --git a/hasura/migrations/1575608013056_update_permission_anonymous_public_table_masterdata/up.yaml b/hasura/migrations/1575608013056_update_permission_anonymous_public_table_masterdata/up.yaml deleted file mode 100644 index c4c69ba4d..000000000 --- a/hasura/migrations/1575608013056_update_permission_anonymous_public_table_masterdata/up.yaml +++ /dev/null @@ -1,19 +0,0 @@ -- args: - role: anonymous - table: - name: masterdata - schema: public - type: drop_insert_permission -- args: - permission: - check: {} - columns: [] - localPresets: - - key: "" - value: "" - set: {} - role: anonymous - table: - name: masterdata - schema: public - type: create_insert_permission diff --git a/hasura/migrations/1575608025216_delete_permission_anonymous_public_table_masterdata/down.yaml b/hasura/migrations/1575608025216_delete_permission_anonymous_public_table_masterdata/down.yaml deleted file mode 100644 index 9c18bd13f..000000000 --- a/hasura/migrations/1575608025216_delete_permission_anonymous_public_table_masterdata/down.yaml +++ /dev/null @@ -1,13 +0,0 @@ -- args: - permission: - check: {} - columns: [] - localPresets: - - key: "" - value: "" - set: {} - role: anonymous - table: - name: masterdata - schema: public - type: create_insert_permission diff --git a/hasura/migrations/1575608025216_delete_permission_anonymous_public_table_masterdata/up.yaml b/hasura/migrations/1575608025216_delete_permission_anonymous_public_table_masterdata/up.yaml deleted file mode 100644 index 9953c4688..000000000 --- a/hasura/migrations/1575608025216_delete_permission_anonymous_public_table_masterdata/up.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: anonymous - table: - name: masterdata - schema: public - type: drop_insert_permission diff --git a/hasura/migrations/1575608039178_update_permission_user_public_table_masterdata/down.yaml b/hasura/migrations/1575608039178_update_permission_user_public_table_masterdata/down.yaml deleted file mode 100644 index 2bd7ff797..000000000 --- a/hasura/migrations/1575608039178_update_permission_user_public_table_masterdata/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: user - table: - name: masterdata - schema: public - type: drop_select_permission diff --git a/hasura/migrations/1575608039178_update_permission_user_public_table_masterdata/up.yaml b/hasura/migrations/1575608039178_update_permission_user_public_table_masterdata/up.yaml deleted file mode 100644 index af7e7bc7f..000000000 --- a/hasura/migrations/1575608039178_update_permission_user_public_table_masterdata/up.yaml +++ /dev/null @@ -1,13 +0,0 @@ -- args: - permission: - allow_aggregations: false - columns: - - value - - key - filter: {} - limit: null - role: user - table: - name: masterdata - schema: public - type: create_select_permission diff --git a/hasura/migrations/1575608057441_update_permission_anonymous_public_table_masterdata/down.yaml b/hasura/migrations/1575608057441_update_permission_anonymous_public_table_masterdata/down.yaml deleted file mode 100644 index 1d0adab90..000000000 --- a/hasura/migrations/1575608057441_update_permission_anonymous_public_table_masterdata/down.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- args: - role: anonymous - table: - name: masterdata - schema: public - type: drop_select_permission diff --git a/hasura/migrations/1575608057441_update_permission_anonymous_public_table_masterdata/up.yaml b/hasura/migrations/1575608057441_update_permission_anonymous_public_table_masterdata/up.yaml deleted file mode 100644 index 014e56e19..000000000 --- a/hasura/migrations/1575608057441_update_permission_anonymous_public_table_masterdata/up.yaml +++ /dev/null @@ -1,13 +0,0 @@ -- args: - permission: - allow_aggregations: false - columns: - - value - - key - filter: {} - limit: null - role: anonymous - table: - name: masterdata - schema: public - type: create_select_permission diff --git a/hasura/migrations/1575607977672_create_table_public_masterdata/down.yaml b/hasura/migrations/1575616993057_create_table_public_masterdata/down.yaml similarity index 100% rename from hasura/migrations/1575607977672_create_table_public_masterdata/down.yaml rename to hasura/migrations/1575616993057_create_table_public_masterdata/down.yaml diff --git a/hasura/migrations/1575607977672_create_table_public_masterdata/up.yaml b/hasura/migrations/1575616993057_create_table_public_masterdata/up.yaml similarity index 78% rename from hasura/migrations/1575607977672_create_table_public_masterdata/up.yaml rename to hasura/migrations/1575616993057_create_table_public_masterdata/up.yaml index e04ca70fa..2d963252a 100644 --- a/hasura/migrations/1575607977672_create_table_public_masterdata/up.yaml +++ b/hasura/migrations/1575616993057_create_table_public_masterdata/up.yaml @@ -1,6 +1,6 @@ - args: sql: CREATE TABLE "public"."masterdata"("key" text NOT NULL, "value" jsonb NOT - NULL, PRIMARY KEY ("key") , UNIQUE ("key")); + NULL, PRIMARY KEY ("key") ); type: run_sql - args: name: masterdata diff --git a/hasura/migrations/1575502302010_create_table_public_users/down.yaml b/hasura/migrations/1575617121272_create_table_public_users/down.yaml similarity index 100% rename from hasura/migrations/1575502302010_create_table_public_users/down.yaml rename to hasura/migrations/1575617121272_create_table_public_users/down.yaml diff --git a/hasura/migrations/1575617121272_create_table_public_users/up.yaml b/hasura/migrations/1575617121272_create_table_public_users/up.yaml new file mode 100644 index 000000000..22b1e368e --- /dev/null +++ b/hasura/migrations/1575617121272_create_table_public_users/up.yaml @@ -0,0 +1,15 @@ +- args: + sql: "CREATE TABLE \"public\".\"users\"(\"email\" text NOT NULL, \"authid\" text + NOT NULL, \"created_at\" timestamptz NOT NULL DEFAULT now(), \"updated_at\" + timestamptz NOT NULL DEFAULT now(), PRIMARY KEY (\"email\") );\nCREATE OR REPLACE + FUNCTION \"public\".\"set_current_timestamp_updated_at\"()\nRETURNS TRIGGER + AS $$\nDECLARE\n _new record;\nBEGIN\n _new := NEW;\n _new.\"updated_at\" + = NOW();\n RETURN _new;\nEND;\n$$ LANGUAGE plpgsql;\nCREATE TRIGGER \"set_public_users_updated_at\"\nBEFORE + UPDATE ON \"public\".\"users\"\nFOR EACH ROW\nEXECUTE PROCEDURE \"public\".\"set_current_timestamp_updated_at\"();\nCOMMENT + ON TRIGGER \"set_public_users_updated_at\" ON \"public\".\"users\" \nIS 'trigger + to set value of column \"updated_at\" to current timestamp on row update';\n" + type: run_sql +- args: + name: users + schema: public + type: add_existing_table_or_view diff --git a/hasura/migrations/1575502389423_create_table_public_bodyshops/down.yaml b/hasura/migrations/1575617170150_create_table_public_bodyshops/down.yaml similarity index 100% rename from hasura/migrations/1575502389423_create_table_public_bodyshops/down.yaml rename to hasura/migrations/1575617170150_create_table_public_bodyshops/down.yaml diff --git a/hasura/migrations/1575617170150_create_table_public_bodyshops/up.yaml b/hasura/migrations/1575617170150_create_table_public_bodyshops/up.yaml new file mode 100644 index 000000000..cfff5f0f9 --- /dev/null +++ b/hasura/migrations/1575617170150_create_table_public_bodyshops/up.yaml @@ -0,0 +1,11 @@ +- args: + sql: CREATE EXTENSION IF NOT EXISTS pgcrypto; + type: run_sql +- args: + sql: CREATE TABLE "public"."bodyshops"("shopid" uuid NOT NULL DEFAULT gen_random_uuid(), + "name" text NOT NULL, PRIMARY KEY ("shopid") ); + type: run_sql +- args: + name: bodyshops + schema: public + type: add_existing_table_or_view diff --git a/hasura/migrations/1575502585480_create_table_public_associations/down.yaml b/hasura/migrations/1575617232856_create_table_public_associations/down.yaml similarity index 100% rename from hasura/migrations/1575502585480_create_table_public_associations/down.yaml rename to hasura/migrations/1575617232856_create_table_public_associations/down.yaml diff --git a/hasura/migrations/1575617232856_create_table_public_associations/up.yaml b/hasura/migrations/1575617232856_create_table_public_associations/up.yaml new file mode 100644 index 000000000..5be9c2d17 --- /dev/null +++ b/hasura/migrations/1575617232856_create_table_public_associations/up.yaml @@ -0,0 +1,11 @@ +- args: + sql: CREATE TABLE "public"."associations"("shopid" uuid NOT NULL, "useremail" + text NOT NULL, "active" boolean NOT NULL DEFAULT false, PRIMARY KEY ("shopid","useremail") + , FOREIGN KEY ("shopid") REFERENCES "public"."bodyshops"("shopid") ON UPDATE + restrict ON DELETE restrict, FOREIGN KEY ("useremail") REFERENCES "public"."users"("email") + ON UPDATE restrict ON DELETE restrict); + type: run_sql +- args: + name: associations + schema: public + type: add_existing_table_or_view diff --git a/hasura/migrations/1575617285236_create_table_public_jobs/down.yaml b/hasura/migrations/1575617285236_create_table_public_jobs/down.yaml new file mode 100644 index 000000000..236b87dbe --- /dev/null +++ b/hasura/migrations/1575617285236_create_table_public_jobs/down.yaml @@ -0,0 +1,3 @@ +- args: + sql: DROP TABLE "public"."jobs" + type: run_sql diff --git a/hasura/migrations/1575617285236_create_table_public_jobs/up.yaml b/hasura/migrations/1575617285236_create_table_public_jobs/up.yaml new file mode 100644 index 000000000..c5e391341 --- /dev/null +++ b/hasura/migrations/1575617285236_create_table_public_jobs/up.yaml @@ -0,0 +1,13 @@ +- args: + sql: CREATE EXTENSION IF NOT EXISTS pgcrypto; + type: run_sql +- args: + sql: CREATE TABLE "public"."jobs"("jobid" uuid NOT NULL DEFAULT gen_random_uuid(), + "ro_number" text NOT NULL, "est_number" text NOT NULL, "shopid" uuid NOT NULL, + PRIMARY KEY ("jobid") , FOREIGN KEY ("shopid") REFERENCES "public"."bodyshops"("shopid") + ON UPDATE restrict ON DELETE restrict); + type: run_sql +- args: + name: jobs + schema: public + type: add_existing_table_or_view diff --git a/package.json b/package.json index fd0994064..f23accd92 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bodyshop-server", "version": "0.0.1", - "license": "Copyright Snapt Software (C) 2019", + "license": "UNLICENSED", "engines": { "node": "12.13.1", "npm": "6.11.3"