From 5721ebc86993ece256a98dddba9ff3f468e80236 Mon Sep 17 00:00:00 2001
From: Kichiyaki <xyztojajestem@gmail.com>
Date: Sat, 13 Mar 2021 16:57:18 +0100
Subject: [PATCH] [WIP]

---
 codegen.yml                                   |   1 +
 .../AppLayout/components/Sidebar/Sidebar.tsx  |   7 +
 .../components/FormDialog/FormDialog.tsx      |  75 ++++-
 .../components/FormDialog/constants.ts        |   1 -
 src/features/QuestionsPage/constants.ts       |   7 +-
 src/libs/graphql/types.ts                     | 276 +++++++++---------
 6 files changed, 218 insertions(+), 149 deletions(-)
 delete mode 100644 src/features/QuestionsPage/components/FormDialog/constants.ts

diff --git a/codegen.yml b/codegen.yml
index 9e3af2d..bee28c3 100644
--- a/codegen.yml
+++ b/codegen.yml
@@ -9,3 +9,4 @@ generates:
       skipTypename: true
       scalars:
         ID: number
+        Time: Date | string
diff --git a/src/common/AppLayout/components/Sidebar/Sidebar.tsx b/src/common/AppLayout/components/Sidebar/Sidebar.tsx
index 4b8e7e3..2a76837 100644
--- a/src/common/AppLayout/components/Sidebar/Sidebar.tsx
+++ b/src/common/AppLayout/components/Sidebar/Sidebar.tsx
@@ -16,6 +16,7 @@ import {
   Group as GroupIcon,
   Work as WorkIcon,
   Description as DescriptionIcon,
+  QuestionAnswer as QuestionAnswerIcon,
 } from '@material-ui/icons';
 import Nav from './components/Nav/Nav';
 import CurrentUser from './components/CurrentUser/CurrentUser';
@@ -51,6 +52,12 @@ const Sidebar = ({ className, open, variant, onClose, onOpen }: Props) => {
       exact: true,
       Icon: <DescriptionIcon color="inherit" />,
     },
+    {
+      name: 'Pytania',
+      to: Route.QuestionsPage,
+      exact: true,
+      Icon: <QuestionAnswerIcon color="inherit" />,
+    },
   ];
 
   useEffect(() => {
diff --git a/src/features/QuestionsPage/components/FormDialog/FormDialog.tsx b/src/features/QuestionsPage/components/FormDialog/FormDialog.tsx
index db3ba03..28a57f0 100644
--- a/src/features/QuestionsPage/components/FormDialog/FormDialog.tsx
+++ b/src/features/QuestionsPage/components/FormDialog/FormDialog.tsx
@@ -1,7 +1,6 @@
-import { useForm } from 'react-hook-form';
+import { useForm, Controller } from 'react-hook-form';
 import { pick } from 'lodash';
-import { MAX_NAME_LENGTH } from './constants';
-import { QuestionInput, Question } from 'libs/graphql/types';
+import { QuestionInput, Question, Maybe, Answer } from 'libs/graphql/types';
 
 import { makeStyles } from '@material-ui/core/styles';
 import {
@@ -11,9 +10,11 @@ import {
   DialogContent,
   DialogProps,
   DialogTitle,
+  MenuItem,
   TextField,
 } from '@material-ui/core';
-import { Maybe } from 'graphql/jsutils/Maybe';
+
+const ANSWERS = Object.keys(Answer);
 
 export interface FormDialogProps extends Pick<DialogProps, 'open'> {
   question?: Maybe<Question>;
@@ -27,6 +28,7 @@ const FormDialog = ({ open, onClose, question, onSubmit }: FormDialogProps) => {
     register,
     handleSubmit,
     errors,
+    control,
     formState: { isSubmitting },
   } = useForm<QuestionInput>({});
   const classes = useStyles();
@@ -59,18 +61,73 @@ const FormDialog = ({ open, onClose, question, onSubmit }: FormDialogProps) => {
           <TextField
             fullWidth
             label="Treść pytania"
-            name="name"
+            name="content"
+            multiline
             defaultValue={question?.content}
             inputRef={register({
               required: 'Te pole jest wymagane.',
-              maxLength: {
-                value: MAX_NAME_LENGTH,
-                message: `Maksymalna długość nazwy zawodu to ${MAX_NAME_LENGTH} znaki.`,
-              },
             })}
             error={!!errors.content}
             helperText={errors.content?.message ?? ''}
           />
+          <TextField
+            fullWidth
+            label="Z"
+            name="from"
+            defaultValue={question?.from}
+            inputRef={register({
+              required: 'Te pole jest wymagane.',
+            })}
+            error={!!errors.from}
+            helperText={errors.from?.message ?? ''}
+          />
+          <TextField
+            fullWidth
+            label="Wyjaśnienie"
+            name="explanation"
+            multiline
+            defaultValue={question?.explanation}
+            inputRef={register}
+            error={!!errors.explanation}
+            helperText={errors.explanation?.message ?? ''}
+          />
+          <Controller
+            name="correctAnswer"
+            defaultValue={question?.correctAnswer ?? ANSWERS[0]}
+            control={control}
+            as={
+              <TextField select fullWidth label="Poprawna odpowiedź">
+                {ANSWERS.map(answer => (
+                  <MenuItem key={answer} value={answer}>
+                    {answer}
+                  </MenuItem>
+                ))}
+              </TextField>
+            }
+          />
+          {ANSWERS.map(answer => {
+            const upper = answer.toUpperCase();
+            return (
+              //(question as any)[`answer${upper}`]
+              <TextField
+                fullWidth
+                key={upper}
+                label={`Odpowiedź ${upper}`}
+                name={`answer${upper}`}
+                multiline
+                defaultValue={
+                  question ? question[`answer${upper}` as keyof Question] : ''
+                }
+                inputRef={register({
+                  required: 'Te pole jest wymagane.',
+                })}
+                error={!!errors[`answer${upper}` as keyof QuestionInput]}
+                helperText={
+                  errors[`answer${upper}` as keyof QuestionInput]?.message ?? ''
+                }
+              />
+            );
+          })}
         </DialogContent>
         <DialogActions>
           <Button
diff --git a/src/features/QuestionsPage/components/FormDialog/constants.ts b/src/features/QuestionsPage/components/FormDialog/constants.ts
deleted file mode 100644
index 8c617f4..0000000
--- a/src/features/QuestionsPage/components/FormDialog/constants.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const MAX_NAME_LENGTH = 100;
diff --git a/src/features/QuestionsPage/constants.ts b/src/features/QuestionsPage/constants.ts
index 06ecec6..818a2bc 100644
--- a/src/features/QuestionsPage/constants.ts
+++ b/src/features/QuestionsPage/constants.ts
@@ -9,6 +9,11 @@ export const COLUMNS: Column<Question>[] = [
     sortable: true,
     label: 'ID',
   },
+  {
+    field: 'from',
+    sortable: true,
+    label: 'Z',
+  },
   {
     field: 'content',
     sortable: true,
@@ -16,7 +21,7 @@ export const COLUMNS: Column<Question>[] = [
   },
   {
     field: 'qualification',
-    sortable: true,
+    sortable: false,
     label: 'Kwalifikacja',
     valueFormatter: v => {
       return `${v.qualification?.code ?? '-'} (ID: ${
diff --git a/src/libs/graphql/types.ts b/src/libs/graphql/types.ts
index 4a957fe..0fc2fab 100644
--- a/src/libs/graphql/types.ts
+++ b/src/libs/graphql/types.ts
@@ -9,33 +9,48 @@ export type Scalars = {
   Boolean: boolean;
   Int: number;
   Float: number;
-  Time: any;
   Upload: any;
+  Time: Date | string;
 };
 
 
 
 
-export type UserWithToken = {
-  token: Scalars['String'];
-  user: User;
-};
-
 export type ProfessionInput = {
   name?: Maybe<Scalars['String']>;
   description?: Maybe<Scalars['String']>;
 };
 
-export type QualificationList = {
+
+export type UserList = {
   total: Scalars['Int'];
-  items?: Maybe<Array<Qualification>>;
+  items?: Maybe<Array<User>>;
 };
 
+export type UserInput = {
+  displayName?: Maybe<Scalars['String']>;
+  password?: Maybe<Scalars['String']>;
+  email?: Maybe<Scalars['String']>;
+  role?: Maybe<Role>;
+  activated?: Maybe<Scalars['Boolean']>;
+};
+
+export type QuestionFilter = {
+  id?: Maybe<Array<Scalars['ID']>>;
+  idNEQ?: Maybe<Array<Scalars['ID']>>;
+  from?: Maybe<Array<Scalars['String']>>;
+  contentIEQ?: Maybe<Scalars['String']>;
+  contentMATCH?: Maybe<Scalars['String']>;
+  qualificationID?: Maybe<Array<Scalars['Int']>>;
+  qualificationIDNEQ?: Maybe<Array<Scalars['Int']>>;
+  qualificationFilter?: Maybe<QualificationFilter>;
+  createdAt?: Maybe<Scalars['Time']>;
+  createdAtGT?: Maybe<Scalars['Time']>;
+  createdAtGTE?: Maybe<Scalars['Time']>;
+  createdAtLT?: Maybe<Scalars['Time']>;
+  createdAtLTE?: Maybe<Scalars['Time']>;
+};
 
-export enum Role {
-  Admin = 'admin',
-  User = 'user'
-}
 
 export type User = {
   id: Scalars['ID'];
@@ -53,6 +68,25 @@ export type UserFilterOr = {
   emailMATCH?: Maybe<Scalars['String']>;
 };
 
+export type ProfessionFilter = {
+  id?: Maybe<Array<Scalars['ID']>>;
+  idNEQ?: Maybe<Array<Scalars['ID']>>;
+  slug?: Maybe<Array<Scalars['String']>>;
+  slugNEQ?: Maybe<Array<Scalars['String']>>;
+  name?: Maybe<Array<Scalars['String']>>;
+  nameNEQ?: Maybe<Array<Scalars['String']>>;
+  nameIEQ?: Maybe<Scalars['String']>;
+  nameMATCH?: Maybe<Scalars['String']>;
+  descriptionIEQ?: Maybe<Scalars['String']>;
+  descriptionMATCH?: Maybe<Scalars['String']>;
+  qualificationID?: Maybe<Array<Scalars['ID']>>;
+  createdAt?: Maybe<Scalars['Time']>;
+  createdAtGT?: Maybe<Scalars['Time']>;
+  createdAtGTE?: Maybe<Scalars['Time']>;
+  createdAtLT?: Maybe<Scalars['Time']>;
+  createdAtLTE?: Maybe<Scalars['Time']>;
+};
+
 export type Qualification = {
   id: Scalars['ID'];
   slug: Scalars['String'];
@@ -63,12 +97,17 @@ export type Qualification = {
   createdAt: Scalars['Time'];
 };
 
-export enum Answer {
-  A = 'a',
-  B = 'b',
-  C = 'c',
-  D = 'd'
-}
+export type QualificationFilterOr = {
+  nameMatch?: Maybe<Scalars['String']>;
+  nameIEQ?: Maybe<Scalars['String']>;
+  codeMatch?: Maybe<Scalars['String']>;
+  codeIEQ?: Maybe<Scalars['String']>;
+};
+
+export type QuestionList = {
+  total: Scalars['Int'];
+  items?: Maybe<Array<Question>>;
+};
 
 export type QuestionInput = {
   content?: Maybe<Scalars['String']>;
@@ -78,78 +117,45 @@ export type QuestionInput = {
   qualificationID?: Maybe<Scalars['Int']>;
   image?: Maybe<Scalars['Upload']>;
   deleteImage?: Maybe<Scalars['Boolean']>;
-  answerA?: Maybe<Answer>;
+  answerA?: Maybe<Scalars['String']>;
   answerAImage?: Maybe<Scalars['Upload']>;
   deleteAnswerAImage?: Maybe<Scalars['Boolean']>;
-  answerB?: Maybe<Answer>;
+  answerB?: Maybe<Scalars['String']>;
   answerBImage?: Maybe<Scalars['Upload']>;
   deleteAnswerBImage?: Maybe<Scalars['Boolean']>;
-  answerC?: Maybe<Answer>;
+  answerC?: Maybe<Scalars['String']>;
   answerCImage?: Maybe<Scalars['Upload']>;
   deleteAnswerCImage?: Maybe<Scalars['Boolean']>;
-  answerD?: Maybe<Answer>;
+  answerD?: Maybe<Scalars['String']>;
   answerDImage?: Maybe<Scalars['Upload']>;
   deleteAnswerDImage?: Maybe<Scalars['Boolean']>;
 };
 
-export type Question = {
-  id: Scalars['ID'];
-  from?: Maybe<Scalars['String']>;
-  content: Scalars['String'];
-  explanation?: Maybe<Scalars['String']>;
-  correctAnswer: Answer;
-  image?: Maybe<Scalars['String']>;
-  answerA?: Maybe<Answer>;
-  answerAImage?: Maybe<Scalars['String']>;
-  answerB?: Maybe<Answer>;
-  answerBImage?: Maybe<Scalars['String']>;
-  answerC?: Maybe<Answer>;
-  answerCImage?: Maybe<Scalars['String']>;
-  answerD?: Maybe<Answer>;
-  answerDImage?: Maybe<Scalars['String']>;
-  qualification?: Maybe<Qualification>;
-  createdAt: Scalars['Time'];
-  updatedAt: Scalars['Time'];
+export type UpdateManyUsersInput = {
+  role?: Maybe<Role>;
+  activated?: Maybe<Scalars['Boolean']>;
 };
 
-export type ProfessionList = {
-  total: Scalars['Int'];
-  items?: Maybe<Array<Profession>>;
-};
-
-export type QualificationInput = {
-  name?: Maybe<Scalars['String']>;
-  description?: Maybe<Scalars['String']>;
-  code?: Maybe<Scalars['String']>;
-  formula?: Maybe<Scalars['String']>;
-  associateProfession?: Maybe<Array<Scalars['Int']>>;
-  dissociateProfession?: Maybe<Array<Scalars['Int']>>;
-};
-
-export type QualificationFilter = {
+export type UserFilter = {
   id?: Maybe<Array<Scalars['ID']>>;
   idNEQ?: Maybe<Array<Scalars['ID']>>;
-  slug?: Maybe<Array<Scalars['String']>>;
-  slugNEQ?: Maybe<Array<Scalars['String']>>;
-  formula?: Maybe<Array<Scalars['String']>>;
-  formulaNEQ?: Maybe<Array<Scalars['String']>>;
-  name?: Maybe<Array<Scalars['String']>>;
-  nameNEQ?: Maybe<Array<Scalars['String']>>;
-  nameIEQ?: Maybe<Scalars['String']>;
-  nameMATCH?: Maybe<Scalars['String']>;
-  code?: Maybe<Array<Scalars['String']>>;
-  codeNEQ?: Maybe<Array<Scalars['String']>>;
-  codeIEQ?: Maybe<Scalars['String']>;
-  codeMATCH?: Maybe<Scalars['String']>;
-  descriptionIEQ?: Maybe<Scalars['String']>;
-  descriptionMATCH?: Maybe<Scalars['String']>;
-  professionID?: Maybe<Array<Scalars['Int']>>;
+  activated?: Maybe<Scalars['Boolean']>;
+  displayName?: Maybe<Array<Scalars['String']>>;
+  displayNameNEQ?: Maybe<Array<Scalars['String']>>;
+  displayNameIEQ?: Maybe<Scalars['String']>;
+  displayNameMATCH?: Maybe<Scalars['String']>;
+  email?: Maybe<Array<Scalars['String']>>;
+  emailNEQ?: Maybe<Array<Scalars['String']>>;
+  emailIEQ?: Maybe<Scalars['String']>;
+  emailMATCH?: Maybe<Scalars['String']>;
+  role?: Maybe<Array<Role>>;
+  roleNEQ?: Maybe<Array<Role>>;
   createdAt?: Maybe<Scalars['Time']>;
   createdAtGT?: Maybe<Scalars['Time']>;
   createdAtGTE?: Maybe<Scalars['Time']>;
   createdAtLT?: Maybe<Scalars['Time']>;
   createdAtLTE?: Maybe<Scalars['Time']>;
-  or?: Maybe<QualificationFilterOr>;
+  or?: Maybe<UserFilterOr>;
 };
 
 export type Mutation = {
@@ -246,52 +252,17 @@ export type MutationSignInArgs = {
   staySignedIn?: Maybe<Scalars['Boolean']>;
 };
 
-export type UserFilter = {
-  id?: Maybe<Array<Scalars['ID']>>;
-  idNEQ?: Maybe<Array<Scalars['ID']>>;
-  activated?: Maybe<Scalars['Boolean']>;
-  displayName?: Maybe<Array<Scalars['String']>>;
-  displayNameNEQ?: Maybe<Array<Scalars['String']>>;
-  displayNameIEQ?: Maybe<Scalars['String']>;
-  displayNameMATCH?: Maybe<Scalars['String']>;
-  email?: Maybe<Array<Scalars['String']>>;
-  emailNEQ?: Maybe<Array<Scalars['String']>>;
-  emailIEQ?: Maybe<Scalars['String']>;
-  emailMATCH?: Maybe<Scalars['String']>;
-  role?: Maybe<Array<Role>>;
-  roleNEQ?: Maybe<Array<Role>>;
-  createdAt?: Maybe<Scalars['Time']>;
-  createdAtGT?: Maybe<Scalars['Time']>;
-  createdAtGTE?: Maybe<Scalars['Time']>;
-  createdAtLT?: Maybe<Scalars['Time']>;
-  createdAtLTE?: Maybe<Scalars['Time']>;
-  or?: Maybe<UserFilterOr>;
-};
+export enum Role {
+  Admin = 'admin',
+  User = 'user'
+}
 
-export type Profession = {
-  id: Scalars['ID'];
-  slug: Scalars['String'];
-  name: Scalars['String'];
-  description?: Maybe<Scalars['String']>;
-  createdAt: Scalars['Time'];
-};
-
-
-export type QuestionFilter = {
-  id?: Maybe<Array<Scalars['ID']>>;
-  idNEQ?: Maybe<Array<Scalars['ID']>>;
-  from?: Maybe<Array<Scalars['String']>>;
-  contentIEQ?: Maybe<Scalars['String']>;
-  contentMATCH?: Maybe<Scalars['String']>;
-  qualificationID?: Maybe<Array<Scalars['Int']>>;
-  qualificationIDNEQ?: Maybe<Array<Scalars['Int']>>;
-  qualificationFilter?: Maybe<QualificationFilter>;
-  createdAt?: Maybe<Scalars['Time']>;
-  createdAtGT?: Maybe<Scalars['Time']>;
-  createdAtGTE?: Maybe<Scalars['Time']>;
-  createdAtLT?: Maybe<Scalars['Time']>;
-  createdAtLTE?: Maybe<Scalars['Time']>;
-};
+export enum Answer {
+  A = 'a',
+  B = 'b',
+  C = 'c',
+  D = 'd'
+}
 
 export type Query = {
   professions: ProfessionList;
@@ -360,51 +331,80 @@ export type QueryUserArgs = {
   id: Scalars['Int'];
 };
 
-export type ProfessionFilter = {
+export type Profession = {
+  id: Scalars['ID'];
+  slug: Scalars['String'];
+  name: Scalars['String'];
+  description?: Maybe<Scalars['String']>;
+  createdAt: Scalars['Time'];
+};
+
+export type QualificationInput = {
+  name?: Maybe<Scalars['String']>;
+  description?: Maybe<Scalars['String']>;
+  code?: Maybe<Scalars['String']>;
+  formula?: Maybe<Scalars['String']>;
+  associateProfession?: Maybe<Array<Scalars['Int']>>;
+  dissociateProfession?: Maybe<Array<Scalars['Int']>>;
+};
+
+export type QualificationFilter = {
   id?: Maybe<Array<Scalars['ID']>>;
   idNEQ?: Maybe<Array<Scalars['ID']>>;
   slug?: Maybe<Array<Scalars['String']>>;
   slugNEQ?: Maybe<Array<Scalars['String']>>;
+  formula?: Maybe<Array<Scalars['String']>>;
+  formulaNEQ?: Maybe<Array<Scalars['String']>>;
   name?: Maybe<Array<Scalars['String']>>;
   nameNEQ?: Maybe<Array<Scalars['String']>>;
   nameIEQ?: Maybe<Scalars['String']>;
   nameMATCH?: Maybe<Scalars['String']>;
+  code?: Maybe<Array<Scalars['String']>>;
+  codeNEQ?: Maybe<Array<Scalars['String']>>;
+  codeIEQ?: Maybe<Scalars['String']>;
+  codeMATCH?: Maybe<Scalars['String']>;
   descriptionIEQ?: Maybe<Scalars['String']>;
   descriptionMATCH?: Maybe<Scalars['String']>;
-  qualificationID?: Maybe<Array<Scalars['ID']>>;
+  professionID?: Maybe<Array<Scalars['Int']>>;
   createdAt?: Maybe<Scalars['Time']>;
   createdAtGT?: Maybe<Scalars['Time']>;
   createdAtGTE?: Maybe<Scalars['Time']>;
   createdAtLT?: Maybe<Scalars['Time']>;
   createdAtLTE?: Maybe<Scalars['Time']>;
+  or?: Maybe<QualificationFilterOr>;
 };
 
-export type QualificationFilterOr = {
-  nameMatch?: Maybe<Scalars['String']>;
-  nameIEQ?: Maybe<Scalars['String']>;
-  codeMatch?: Maybe<Scalars['String']>;
-  codeIEQ?: Maybe<Scalars['String']>;
+export type UserWithToken = {
+  token: Scalars['String'];
+  user: User;
 };
 
-export type UserInput = {
-  displayName?: Maybe<Scalars['String']>;
-  password?: Maybe<Scalars['String']>;
-  email?: Maybe<Scalars['String']>;
-  role?: Maybe<Role>;
-  activated?: Maybe<Scalars['Boolean']>;
-};
-
-export type QuestionList = {
+export type ProfessionList = {
   total: Scalars['Int'];
-  items?: Maybe<Array<Question>>;
+  items?: Maybe<Array<Profession>>;
 };
 
-export type UserList = {
+export type QualificationList = {
   total: Scalars['Int'];
-  items?: Maybe<Array<User>>;
+  items?: Maybe<Array<Qualification>>;
 };
 
-export type UpdateManyUsersInput = {
-  role?: Maybe<Role>;
-  activated?: Maybe<Scalars['Boolean']>;
+export type Question = {
+  id: Scalars['ID'];
+  from?: Maybe<Scalars['String']>;
+  content: Scalars['String'];
+  explanation?: Maybe<Scalars['String']>;
+  correctAnswer: Answer;
+  image?: Maybe<Scalars['String']>;
+  answerA?: Maybe<Scalars['String']>;
+  answerAImage?: Maybe<Scalars['String']>;
+  answerB?: Maybe<Scalars['String']>;
+  answerBImage?: Maybe<Scalars['String']>;
+  answerC?: Maybe<Scalars['String']>;
+  answerCImage?: Maybe<Scalars['String']>;
+  answerD?: Maybe<Scalars['String']>;
+  answerDImage?: Maybe<Scalars['String']>;
+  qualification?: Maybe<Qualification>;
+  createdAt: Scalars['Time'];
+  updatedAt: Scalars['Time'];
 };