Fixed a bug with delete sections

ONSdigital · Aug 5, 2019 · 051b144 · 051b144
1 parent 464bf92
commit 051b144
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 17 deletions.
diff --git a/eq-author-api/schema/resolvers/base.js b/eq-author-api/schema/resolvers/base.js
@@ -228,7 +228,7 @@ const Resolvers = {
       const section = find(ctx.questionnaire.sections, { id: input.id });
       remove(ctx.questionnaire.sections, section);
       onPageDeleted(ctx, input.id);
-      return section;
+      return ctx.questionnaire;
     }),
     moveSection: createMutation((_, { input }, ctx) => {
       const removedSection = first(

diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
@@ -554,7 +554,7 @@ type Mutation {
   duplicateQuestionnaire(input: DuplicateQuestionnaireInput!): Questionnaire
   createSection(input: CreateSectionInput!): Section
   updateSection(input: UpdateSectionInput!): Section
-  deleteSection(input: DeleteSectionInput!): Section
+  deleteSection(input: DeleteSectionInput!): Questionnaire
   moveSection(input: MoveSectionInput!): Section
   duplicateSection(input: DuplicateSectionInput!): Section
   updatePage(input: UpdatePageInput!): Page

diff --git a/eq-author/src/App/section/Design/withDeleteSection.js b/eq-author/src/App/section/Design/withDeleteSection.js
@@ -27,15 +27,17 @@ const pluralize = (count, word, plural = word + "s") => {
 
 export const handleDeletion = (
   { history, onAddSection, match: { params } },
-  questionnaire
+  { data },
+  oldQuestionnaire
 ) => {
+  const questionnaire = data.deleteSection;
   const { sectionId, questionnaireId } = params;
 
-  if (questionnaire.sections.length === 1) {
+  if (questionnaire.sections.length === 0) {
     return onAddSection();
   }
 
-  const nextSection = getNextSection(questionnaire.sections, sectionId);
+  const nextSection = getNextSection(oldQuestionnaire.sections, sectionId);
   const nextPage = nextSection.pages[0];
 
   history.push(
@@ -107,7 +109,7 @@ export const mapMutateToProps = ({ ownProps, mutate }) => ({
     });
 
     return mutation
-      .then(() => handleDeletion(ownProps, questionnaire))
+      .then(data => handleDeletion(ownProps, data, questionnaire))
       .then(() => displayToast(ownProps, questionnaire))
       .then(() => mutation);
   },

diff --git a/eq-author/src/App/section/Design/withDeleteSection.test.js b/eq-author/src/App/section/Design/withDeleteSection.test.js
@@ -43,7 +43,10 @@ describe("withDeleteSection", () => {
 
     result = {
       data: {
-        deleteSection: deletedPage,
+        deleteSection: {
+          id: "questionnaire",
+          sections: [],
+        },
       },
     };
 
@@ -152,19 +155,18 @@ describe("withDeleteSection", () => {
 
   describe("handleDeletion", () => {
     describe("when only one section in questionnaire", () => {
-      beforeEach(() => {
-        questionnaire.sections = [currentSection];
-      });
-
       it("should add new section", () => {
-        handleDeletion(ownProps, questionnaire);
+        handleDeletion(ownProps, result, {});
         expect(onAddSection).toHaveBeenCalled();
       });
     });
 
     describe("when more than one section in questionnaire", () => {
       it("should redirect to another section", () => {
-        handleDeletion(ownProps, questionnaire);
+        result.data.deleteSection.sections = [
+          { id: "section 1", pages: [{ id: "page 1" }] },
+        ];
+        handleDeletion(ownProps, result, questionnaire);
         expect(history.push).toHaveBeenCalled();
       });
     });

diff --git a/eq-author/src/graphql/deleteSection.graphql b/eq-author/src/graphql/deleteSection.graphql
@@ -1,11 +1,11 @@
 mutation DeleteSection($input: DeleteSectionInput!) {
   deleteSection(input: $input) {
     id
-    questionnaire {
+    sections {
       id
-      questionnaireInfo {
-        totalSectionCount
-      }
+    }
+    questionnaireInfo {
+      totalSectionCount
     }
   }
 }