Fixes

3scale · Mar 31, 2023 · db28217 · db28217
1 parent 864d567
commit db28217
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/app/javascript/src/ActiveDocs/ThreeScaleApiDocs.ts b/app/javascript/src/ActiveDocs/ThreeScaleApiDocs.ts
@@ -46,15 +46,15 @@ type BodyValue = boolean | number | string | { [key: string]: BodyValue }
  * }
  * @param object
  */
-export const objectToFormData = (object: BodyValue): Record<string, string> => {
-  const buildFormData = (formData: Record<string, string>, data: BodyValue, parentKey?: string) => {
+export const objectToFormData = (object: BodyValue): Record<string, boolean | number | string> => {
+  const buildFormData = (formData: Record<string, boolean | number | string>, data: BodyValue, parentKey?: string) => {
     if (data && typeof data === 'object') {
       Object.keys(data).forEach((key: string) => {
         buildFormData(formData, data[key], parentKey ? `${parentKey}[${key}]` : key)
       })
     } else {
       if (parentKey) {
-        formData[parentKey] = data ? encodeURIComponent(data) : ''
+        formData[parentKey] = data ? data : ''
       }
     }
   }
@@ -74,7 +74,7 @@ export const objectToFormData = (object: BodyValue): Record<string, string> => {
  *    'transactions[0][usage][hits]': 1
  * @param body BackendApiReportBody
  */
-export const transformReportRequestBody = (body: BackendApiReportBody): Record<string, string> => {
+export const transformReportRequestBody = (body: BackendApiReportBody): Record<string, boolean | number | string> => {
   if (Array.isArray(body.transactions)) {
     body.transactions = body.transactions.map(transaction => {
       switch (typeof transaction) {

diff --git a/app/javascript/src/Types/SwaggerTypes.ts b/app/javascript/src/Types/SwaggerTypes.ts
@@ -66,5 +66,3 @@ export interface BackendApiReportBody {
   service_id?: string;
   transactions?: (BackendApiTransaction | string)[];
 }
-
-export type BackendApiReportFormData = Record<string, string>
diff --git a/app/javascript/src/Types/swagger.d.ts b/app/javascript/src/Types/swagger.d.ts
@@ -0,0 +1,3 @@
+declare module 'swagger-client/es/execute' {
+  export function execute (req: unknown): unknown
+}
diff --git a/spec/javascripts/ActiveDocs/ThreeScaleApiDocs.spec.ts b/spec/javascripts/ActiveDocs/ThreeScaleApiDocs.spec.ts
@@ -34,11 +34,10 @@ const body: BackendApiReportBody = {
   ]
 }
 
-describe('transformRequestBody', () => {
+describe('transformReportRequestBody', () => {
   it('transforms the transactions array when transaction is an object', () => {
     const result = transformReportRequestBody(body)
 
-    console.log(result)
     expect(result).toEqual({
       service_token: 'token',
       service_id: '123',

diff --git a/spec/javascripts/__mocks__/swagger-client/es/execute/index.js b/spec/javascripts/__mocks__/swagger-client/es/execute/index.js
@@ -0,0 +1,5 @@
+module.exports = {
+    execute: {
+        create: () => jest.fn()
+    }
+}