Merge pull request #3086 from ONSdigital/fix-for-supplementary-data-s…

…urvey-lists fix for survey list
ONSdigital · Dec 11, 2023 · 200fd2e · 200fd2e
2 parents 63bc36f + dfd45ee
commit 200fd2e
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 18 deletions.
diff --git a/eq-author-api/schema/resolvers/base.js b/eq-author-api/schema/resolvers/base.js
@@ -339,9 +339,12 @@ const Resolvers = {
             `unable to get survey list. status(${response.status})`
           );
         }
-        return {
-          surveyIdList: response.data,
-        };
+        return response.data.map((survey) => {
+          return {
+            surveyId: survey.survey_id,
+            surveyName: survey.survey_name,
+          };
+        });
       } catch (err) {
         logger.error(err.message);
         return {

diff --git a/eq-author-api/schema/tests/SupplementaryDataSurveyIdList.test.js b/eq-author-api/schema/tests/SupplementaryDataSurveyIdList.test.js
@@ -7,24 +7,31 @@ const fetch = require("node-fetch");
 const query = `
 query GetSupplementaryDataSurveyIdList {
     supplementaryDataSurveyIdList {
-        surveyIdList
+        surveyId
+        surveyName
     }
  }`;
 
 fetch.mockImplementation(() =>
   Promise.resolve({
     status: 200,
-    json: () => ["121", "122", "123"],
+    json: () => [
+      { survey_id: "121", survey_name: "survey1" },
+      { survey_id: "122", survey_name: "survey2" },
+      { survey_id: "123", survey_name: "survey3" },
+    ],
   })
 );
 
 describe("SupplementaryDataSurveyIdList", () => {
   it("should query supplementary data survey id list schema", async () => {
     const expectedResponse = {
       data: {
-        supplementaryDataSurveyIdList: {
-          surveyIdList: ["121", "122", "123"],
-        },
+        supplementaryDataSurveyIdList: [
+          { surveyId: "121", surveyName: "survey1" },
+          { surveyId: "122", surveyName: "survey2" },
+          { surveyId: "123", surveyName: "survey3" },
+        ],
       },
     };
 

diff --git a/eq-author-api/schema/typeDefs.js b/eq-author-api/schema/typeDefs.js
@@ -850,7 +850,8 @@ type SupplementaryDataVersions {
 }
 
 type SupplementaryDataSurveyIdList {
-  surveyIdList: [String]!
+  surveyId: String!
+  surveyName: String
 }
 
 type SupplementaryDataField {
@@ -912,7 +913,7 @@ type Query {
   collectionLists: CollectionLists
   list(input: QueryInput!): List
   supplementaryDataVersions(id: ID!): SupplementaryDataVersions
-  supplementaryDataSurveyIdList: SupplementaryDataSurveyIdList
+  supplementaryDataSurveyIdList: [SupplementaryDataSurveyIdList]
   supplementaryData: SupplementaryData
   publishHistory: [PublishHistoryEvent]
   listNames: [ListName]

diff --git a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.js b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.js
@@ -169,7 +169,7 @@ const SupplementaryDataPage = () => {
   const schemaData = tableData?.data;
 
   const surveyIdList =
-    supplementaryDataSurveyIdList?.supplementaryDataSurveyIdList?.surveyIdList;
+    supplementaryDataSurveyIdList?.supplementaryDataSurveyIdList;
 
   const handleUnlinkClick = () => {
     setShowUnlinkModal(true);
@@ -244,9 +244,12 @@ const SupplementaryDataPage = () => {
                               >
                                 Survey ID
                               </Option>
-                              {surveyIdList?.map((surveyID) => (
-                                <Option key={surveyID} value={surveyID}>
-                                  {surveyID}
+                              {surveyIdList?.map((survey) => (
+                                <Option
+                                  key={survey.surveyId}
+                                  value={survey.surveyId}
+                                >
+                                  {survey.surveyId} - {survey.surveyName}
                                 </Option>
                               ))}
                             </CustomSelect>

diff --git a/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js b/eq-author/src/App/dataSettings/SupplementaryDataPage/index.test.js
@@ -112,9 +112,10 @@ describe("Supplementary dataset page", () => {
       } else if (key === GET_SUPPLEMENTARY_DATA_SURVEY_ID_LIST) {
         return {
           data: {
-            supplementaryDataSurveyIdList: {
-              surveyIdList: ["121", "122"],
-            },
+            supplementaryDataSurveyIdList: [
+              { surveyId: "121", surveyName: "survey1" },
+              { surveyId: "122", surveyName: "survey2" },
+            ],
           },
         };
       } else {

diff --git a/eq-author/src/graphql/getSupplementaryDataSurveyIdList.graphql b/eq-author/src/graphql/getSupplementaryDataSurveyIdList.graphql
@@ -1,5 +1,6 @@
 query GetSupplementaryDataSurveyIdList {
   supplementaryDataSurveyIdList {
-    surveyIdList
+    surveyId
+    surveyName
   }
 }