Co-locate constants for simplicity, make typedefs for data non-nullable

- Move constant used in only one file to the same file
- Make typedefs for addon data fields non nullable
- Remove unnecessary spread operator

ee/app/assets/javascripts/subscriptions/buy_addons_shared/graphql/data.js

-import {
-  CI_MINUTES_PER_PACK,
-  I18N_CI_MINUTES_PRODUCT_LABEL,
-  I18N_CI_MINUTES_PRODUCT_UNIT,
-  I18N_STORAGE_PRODUCT_LABEL,
-  I18N_STORAGE_PRODUCT_UNIT,
-  planCode,
-  STORAGE_PER_PACK,
-} from 'ee/subscriptions/buy_addons_shared/constants';
-
-export const planData = {
-  [planCode.CI_1000_MINUTES_PLAN]: {
-    hasExpiration: false,
-    isAddon: true,
-    label: I18N_CI_MINUTES_PRODUCT_LABEL,
-    productUnit: I18N_CI_MINUTES_PRODUCT_UNIT,
-    quantityPerPack: CI_MINUTES_PER_PACK,
-  },
-  [planCode.STORAGE_PLAN]: {
-    hasExpiration: true,
-    isAddon: true,
-    label: I18N_STORAGE_PRODUCT_LABEL,
-    productUnit: I18N_STORAGE_PRODUCT_UNIT,
-    quantityPerPack: STORAGE_PER_PACK,
-  },
-};

ee/app/assets/javascripts/subscriptions/buy_addons_shared/graphql/resolvers.js

@@ -3,10 +3,36 @@ import { merge } from 'lodash';
 import Api from 'ee/api';
 import * as SubscriptionsApi from 'ee/api/subscriptions_api';
 import { ERROR_FETCHING_COUNTRIES, ERROR_FETCHING_STATES } from 'ee/subscriptions/constants';
-import { COUNTRY_TYPE, STATE_TYPE } from 'ee/subscriptions/buy_addons_shared/constants';
+import {
+  COUNTRY_TYPE,
+  STATE_TYPE,
+  CI_MINUTES_PER_PACK,
+  I18N_CI_MINUTES_PRODUCT_LABEL,
+  I18N_CI_MINUTES_PRODUCT_UNIT,
+  I18N_STORAGE_PRODUCT_LABEL,
+  I18N_STORAGE_PRODUCT_UNIT,
+  planCode,
+  STORAGE_PER_PACK,
+} from 'ee/subscriptions/buy_addons_shared/constants';
 import stateQuery from 'ee/subscriptions/graphql/queries/state.query.graphql';
 import createFlash from '~/flash';
-import { planData } from 'ee/subscriptions/buy_addons_shared/graphql/data';
+
+const planData = {
+  [planCode.CI_1000_MINUTES_PLAN]: {
+    hasExpiration: false,
+    isAddon: true,
+    label: I18N_CI_MINUTES_PRODUCT_LABEL,
+    productUnit: I18N_CI_MINUTES_PRODUCT_UNIT,
+    quantityPerPack: CI_MINUTES_PER_PACK,
+  },
+  [planCode.STORAGE_PLAN]: {
+    hasExpiration: true,
+    isAddon: true,
+    label: I18N_STORAGE_PRODUCT_LABEL,
+    productUnit: I18N_STORAGE_PRODUCT_UNIT,
+    quantityPerPack: STORAGE_PER_PACK,
+  },
+};
 
 // NOTE: These resolvers are temporary and will be removed in the future.
 // See https://gitlab.com/gitlab-org/gitlab/-/issues/321643

ee/app/assets/javascripts/subscriptions/buy_addons_shared/graphql/typedefs.graphql

 type Plan {
-  id: ID
-  name: String
-  code: String
-  pricePerYear: Int
-  label: String
-  isAddon: Boolean
-  hasExpiration: Boolean
-  productUnit: String
-  quantityPerPack: String
+  id: Int!
+  name: String!
+  code: String!
+  pricePerYear: Int!
+  label: String!
+  isAddon: Boolean!
+  hasExpiration: Boolean!
+  productUnit: String!
+  quantityPerPack: String!
 }
 
 enum PlanTag {

ee/spec/frontend/subscriptions/spec_helper.js

@@ -23,7 +23,7 @@ export function createMockApolloProvider(mockResponses = {}, dataset = {}) {
       [plansQuery, plansQueryMock],
       [orderPreviewQuery, orderPreviewQueryMock],
     ],
-    { ...customersDotResolvers },
+    customersDotResolvers,
   );
 
   const apolloProvider = new VueApollo({

ee/spec/frontend/vue_shared/purchase_flow/components/checkout/payment_method_spec.js

@@ -26,9 +26,7 @@ describe('Payment Method', () => {
 
   const isStepValid = () => wrapper.findComponent(Step).props('isValid');
   const createComponent = (apolloLocalState = {}) => {
-    const apolloProvider = createMockApolloProvider(STEPS, STEPS[2], {
-      ...gitLabResolvers,
-    });
+    const apolloProvider = createMockApolloProvider(STEPS, STEPS[2], gitLabResolvers);
     apolloProvider.clients.defaultClient.cache.writeQuery({
       query: stateQuery,
       data: merge({}, initialStateData, apolloLocalState),

ee/spec/frontend/vue_shared/purchase_flow/components/checkout/zuora_spec.js

@@ -20,9 +20,7 @@ describe('Zuora', () => {
   let wrapper;
 
   const createComponent = (props = {}, data = {}, apolloLocalState = {}) => {
-    const apolloProvider = createMockApolloProvider(STEPS, STEPS[1], {
-      ...gitLabResolvers,
-    });
+    const apolloProvider = createMockApolloProvider(STEPS, STEPS[1], gitLabResolvers);
     apolloProvider.clients.defaultClient.cache.writeQuery({
       query: stateQuery,
       data: merge({}, initialStateData, apolloLocalState),