Merge pull request #60 from the-deep/fix/add-missing-id-in-queries

Add missing ids in queries
the-deep · Sep 27, 2023 · 27f1464 · 27f1464
2 parents ebd963f + 232dfb1
commit 27f1464
Show file tree

Hide file tree

Showing 27 changed files with 111 additions and 26 deletions.
diff --git a/backend b/backend
diff --git a/src/components/ChoiceCollectionSelectInput/AddChoiceCollectionModal/index.tsx b/src/components/ChoiceCollectionSelectInput/AddChoiceCollectionModal/index.tsx
@@ -55,7 +55,9 @@ const ADD_OPTIONS = gql`
         $input: QuestionChoiceCollectionCreateInput!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 createQuestionChoiceCollection(
                     data: $input,
                 ) {
@@ -86,7 +88,9 @@ const EDIT_OPTIONS = gql`
         $choiceCollectionId: ID!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 updateQuestionChoiceCollection(
                     data: $input,
                     id: $choiceCollectionId,
@@ -117,6 +121,7 @@ const COLLECTION = gql`
         $choiceCollectionId: ID!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
                 id
                 choiceCollection(pk: $choiceCollectionId) {

diff --git a/src/components/ChoiceCollectionSelectInput/index.tsx b/src/components/ChoiceCollectionSelectInput/index.tsx
@@ -27,6 +27,7 @@ const CHOICE_COLLECTIONS = gql`
         $search:String
         ) {
         private {
+            id
             projectScope(pk: $projectId) {
                 id
                 choiceCollections(

diff --git a/src/components/EditQuestionnaireModal/index.tsx b/src/components/EditQuestionnaireModal/index.tsx
@@ -42,7 +42,9 @@ const CREATE_QUESTIONNAIRE = gql`
         $input: QuestionnaireCreateInput!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 createQuestionnaire(data: $input) {
                     errors
                     ok
@@ -59,7 +61,9 @@ const EDIT_QUESTIONNAIRE = gql`
         $input: QuestionnaireUpdateInput!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 updateQuestionnaire(data: $input, id: $questionnaireId) {
                     errors
                     ok
@@ -79,7 +83,9 @@ const QUESTIONNAIRE_DETAIL = gql`
         $questionnaireId: ID!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 questionnaire(pk: $questionnaireId) {
                     id
                     title

diff --git a/src/components/PillarSelectInput/index.tsx b/src/components/PillarSelectInput/index.tsx
@@ -11,8 +11,11 @@ const PILLARS = gql`
         $questionnaireId: ID!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 questionnaire(pk: $questionnaireId) {
+                    id
                     leafGroups {
                         id
                         name

diff --git a/src/components/ProjectCreateModal/index.tsx b/src/components/ProjectCreateModal/index.tsx
@@ -26,6 +26,7 @@ const CREATE_PROJECT = gql`
         $input: ProjectCreateInput!,
     ) {
         private {
+            id
             createProject(data: $input) {
                 errors
                 ok

diff --git a/src/components/ProjectMembershipEditModal/index.tsx b/src/components/ProjectMembershipEditModal/index.tsx
@@ -41,6 +41,7 @@ const UPDATE_MEMBERSHIP = gql`
         $membershipId: ID,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
                 id
                 updateMemberships(

diff --git a/src/components/UserSelectInput/index.tsx b/src/components/UserSelectInput/index.tsx
@@ -21,6 +21,7 @@ const USERS = gql`
         $search: String,
     ) {
         private {
+            id
             users(
                 pagination: {
                     limit: $limit,

diff --git a/src/views/About/QuestionsPreview/index.tsx b/src/views/About/QuestionsPreview/index.tsx
@@ -33,6 +33,7 @@ const QUESTIONS_FROM_BANK = gql`
         $leafGroupId: ID!,
     ) {
         private {
+            id
             qbQuestions(
                 filters: {
                     qbank: {pk: $questionBankId}

diff --git a/src/views/About/index.tsx b/src/views/About/index.tsx
@@ -31,14 +31,12 @@ import QuestionsPreview from './QuestionsPreview';
 import IntroText from './IntroText';
 import styles from './index.module.css';
 
-const QUESTION_BANK_ID = '1';
-
 const ABOUT_FRAMEWORK = gql`
-    query AboutFramework (
-        $questionBankId: ID!,
-    ){
+    query AboutFramework {
         private {
-            questionBank(pk: $questionBankId) {
+            id
+            activeQuestionBank {
+                id
                 leafGroups {
                     category1
                     category1Display
@@ -70,8 +68,8 @@ const ABOUT_FRAMEWORK = gql`
     }
 `;
 
-type QuestionGroup = NonNullable<NonNullable<AboutFrameworkQuery['private']>['questionBank']>['leafGroups'][number];
-export type ChoiceCollectionsType = NonNullable<NonNullable<AboutFrameworkQuery['private']>['questionBank']>['choiceCollections'];
+type QuestionGroup = NonNullable<NonNullable<AboutFrameworkQuery['private']>['activeQuestionBank']>['leafGroups'][number];
+export type ChoiceCollectionsType = NonNullable<NonNullable<AboutFrameworkQuery['private']>['activeQuestionBank']>['choiceCollections'];
 
 const subPillarKeySelector = (group: QuestionGroup) => group.id;
 
@@ -211,17 +209,13 @@ export function Component() {
         data: frameworkResponse,
     } = useQuery<AboutFrameworkQuery, AboutFrameworkQueryVariables>(
         ABOUT_FRAMEWORK,
-        {
-            variables: {
-                questionBankId: QUESTION_BANK_ID,
-            },
-        },
     );
 
     const [selectedLeafGroupIds, setSelectedLeafGroupIds] = useState<string[]>([]);
-    const framework = frameworkResponse?.private?.questionBank?.leafGroups;
+    const bankId = frameworkResponse?.private?.activeQuestionBank?.id;
+    const framework = frameworkResponse?.private?.activeQuestionBank?.leafGroups;
 
-    const choiceCollections = frameworkResponse?.private?.questionBank?.choiceCollections;
+    const choiceCollections = frameworkResponse?.private?.activeQuestionBank?.choiceCollections;
 
     const getLeafNodeLabel = useCallback((leafId: string): string | undefined => {
         const leafNodeItem = framework?.find((group) => group.id === leafId);
@@ -319,7 +313,7 @@ export function Component() {
                         ))}
                     </table>
                 </div>
-                {rightPaneShown && (
+                {rightPaneShown && bankId && (
                     <Container
                         className={styles.rightPane}
                         headerActions={(
@@ -345,7 +339,7 @@ export function Component() {
                             >
                                 <QuestionsPreview
                                     leafGroupId={leafGroupId}
-                                    questionBankId={QUESTION_BANK_ID}
+                                    questionBankId={bankId}
                                     choiceCollections={choiceCollections}
                                 />
                             </Container>

diff --git a/src/views/Home/QuestionnaireItem/index.tsx b/src/views/Home/QuestionnaireItem/index.tsx
@@ -57,7 +57,9 @@ const DELETE_QUESTIONNAIRE = gql`
         $projectId: ID!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 deleteQuestionnaire(id: $questionnaireId){
                     errors
                     ok
@@ -73,7 +75,9 @@ const EXPORT_QUESTIONNAIRE = gql`
         $questionnaireId: ID!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 createQuestionnaireExport(
                     data: {
                         questionnaire: $questionnaireId
@@ -100,7 +104,9 @@ const EXPORT_DETAILS = gql`
         $exportId: ID!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 questionnaireExport(pk: $exportId) {
                     endedAt
                     enketoPreviewUrl

diff --git a/src/views/Home/index.tsx b/src/views/Home/index.tsx
@@ -41,6 +41,7 @@ const PROJECTS = gql`
         $offset: Int,
     ) {
         private {
+            id
             projects (
                 filters: {
                     search: $search,
@@ -69,6 +70,7 @@ const QUESTIONNAIRES_FOR_PROJECT = gql`
         $projectId: ID!,
     ) {
         private {
+            id
             projectScope(pk: $projectId){
                 id
                 questionnaires {

diff --git a/src/views/ProjectEdit/index.tsx b/src/views/ProjectEdit/index.tsx
@@ -54,7 +54,9 @@ const MEMBERSHIPS = gql`
         $projectId: ID!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 project {
                     id
                     title
@@ -96,7 +98,9 @@ const UPDATE_PROJECT = gql`
         $input: ProjectUpdateInput!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 updateProject(data: $input) {
                     errors
                     ok
@@ -129,6 +133,7 @@ const DELETE_MEMBERSHIP = gql`
         $membershipIdToDelete: ID!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
                 id
                 updateMemberships(deleteIds: [$membershipIdToDelete]) {

diff --git a/src/views/QuestionnaireEdit/DateQuestionForm/index.tsx b/src/views/QuestionnaireEdit/DateQuestionForm/index.tsx
@@ -65,7 +65,9 @@ const CREATE_DATE_QUESTION = gql`
         $input: QuestionCreateInput!,
     ){
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 createQuestion(
                     data: $input,
                 ) {
@@ -88,7 +90,9 @@ const UPDATE_DATE_QUESTION = gql`
         $input: QuestionUpdateInput!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 updateQuestion (
                     data: $input
                     id: $questionId,

diff --git a/src/views/QuestionnaireEdit/FileQuestionForm/index.tsx b/src/views/QuestionnaireEdit/FileQuestionForm/index.tsx
@@ -65,7 +65,9 @@ const CREATE_FILE_QUESTION = gql`
         $input: QuestionCreateInput!,
     ){
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 createQuestion(
                     data: $input,
                 ) {
@@ -88,7 +90,9 @@ const UPDATE_FILE_QUESTION = gql`
         $input: QuestionUpdateInput!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 updateQuestion (
                     data: $input
                     id: $questionId,

diff --git a/src/views/QuestionnaireEdit/ImageQuestionForm/index.tsx b/src/views/QuestionnaireEdit/ImageQuestionForm/index.tsx
@@ -65,7 +65,9 @@ const CREATE_IMAGE_QUESTION = gql`
         $input: QuestionCreateInput!,
     ){
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 createQuestion(
                     data: $input,
                 ) {
@@ -88,7 +90,9 @@ const UPDATE_IMAGE_QUESTION = gql`
         $input: QuestionUpdateInput!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 updateQuestion (
                     data: $input
                     id: $questionId,

diff --git a/src/views/QuestionnaireEdit/IntegerQuestionForm/index.tsx b/src/views/QuestionnaireEdit/IntegerQuestionForm/index.tsx
@@ -65,7 +65,9 @@ const CREATE_INTEGER_QUESTION = gql`
         $input: QuestionCreateInput!,
     ){
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 createQuestion(
                     data: $input,
                 ) {
@@ -88,7 +90,9 @@ const UPDATE_INTEGER_QUESTION = gql`
         $input: QuestionUpdateInput!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 updateQuestion (
                     data: $input
                     id: $questionId,

diff --git a/src/views/QuestionnaireEdit/NoteQuestionForm/index.tsx b/src/views/QuestionnaireEdit/NoteQuestionForm/index.tsx
@@ -49,7 +49,9 @@ const CREATE_NOTE_QUESTION = gql`
         $input: QuestionCreateInput!,
     ){
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 createQuestion(
                     data: $input,
                 ) {
@@ -72,7 +74,9 @@ const UPDATE_NOTE_QUESTION = gql`
         $input: QuestionUpdateInput!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 updateQuestion (
                     data: $input
                     id: $questionId,

diff --git a/src/views/QuestionnaireEdit/QuestionList/LeafNode/QuestionPreview/index.tsx b/src/views/QuestionnaireEdit/QuestionList/LeafNode/QuestionPreview/index.tsx
@@ -58,7 +58,9 @@ const DELETE_QUESTION = gql`
         $questionId: ID!,
     ) {
         private {
+            id
             projectScope(pk: $projectId) {
+                id
                 deleteQuestion(id: $questionId) {
                     errors
                     ok
+1 −1		apps/qbank/base_models.py
+1 −1		apps/qbank/migrations/0004_alter_qbleafgroup_category_1_and_more.py
+5 −5		apps/qbank/models.py
+0 −2		apps/qbank/queries.py
+1 −1		apps/questionnaire/migrations/0002_alter_questionleafgroup_category_1_and_more.py
+6 −4		apps/questionnaire/serializers.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ const CREATE_PROJECT = gql` @@
             $input: ProjectCreateInput!,
         ) {
             private {
+                id
                 createProject(data: $input) {
                     errors
                     ok
@@ Expand Down @@