[Dictionary] [Editing Service] Throw an error when "siteName" or "language" is not passed

Author: illiakovalenko

packages/sitecore-jss/src/editing/graphql-editing-service.test.ts

@@ -319,4 +319,38 @@ describe('GraphQLEditingService', () => {
       expect(error.response.error).to.equal('Internal server error');
     }
   });
+
+  it('should throw an error when siteName is not provided', async () => {
+    const service = new GraphQLEditingService({
+      clientFactory,
+    });
+
+    try {
+      await service.fetchEditingData({
+        language,
+        version,
+        itemId,
+        siteName: '',
+      });
+    } catch (error) {
+      expect(error.message).to.equal('The site name must be a non-empty string');
+    }
+  });
+
+  it('should throw an error when language is not provided', async () => {
+    const service = new GraphQLEditingService({
+      clientFactory,
+    });
+
+    try {
+      await service.fetchEditingData({
+        language: '',
+        version,
+        itemId,
+        siteName,
+      });
+    } catch (error) {
+      expect(error.message).to.equal('The language must be a non-empty string');
+    }
+  });
 });

packages/sitecore-jss/src/editing/graphql-editing-service.ts

@@ -122,6 +122,14 @@ export class GraphQLEditingService {
   }) {
     debug.editing('fetching editing data for %s %s %s %s', siteName, itemId, language, version);
 
+    if (!siteName) {
+      throw new RangeError('The site name must be a non-empty string');
+    }
+
+    if (!language) {
+      throw new RangeError('The language must be a non-empty string');
+    }
+
     const dictionary: DictionaryPhrases = {};
     let dictionaryResults: { key: string; value: string }[] = [];
     let hasNext = true;

packages/sitecore-jss/src/i18n/graphql-dictionary-service.test.ts

@@ -375,5 +375,31 @@ describe('GraphQLDictionaryService', () => {
       const result = await service.fetchDictionaryData('en');
       expect(result).to.deep.equal({});
     });
+
+    it('should throw error if siteName is not provided', async () => {
+      const service = new GraphQLDictionaryService({
+        clientFactory,
+        siteName: '',
+        cacheEnabled: false,
+        useSiteQuery: true,
+      });
+
+      await service.fetchDictionaryData('en').catch((error) => {
+        expect(error.message).to.equal('The site name must be a non-empty string');
+      });
+    });
+
+    it('should throw error if language is not provided', async () => {
+      const service = new GraphQLDictionaryService({
+        clientFactory,
+        siteName,
+        cacheEnabled: false,
+        useSiteQuery: true,
+      });
+
+      await service.fetchDictionaryData('').catch((error) => {
+        expect(error.message).to.equal('The language must be a non-empty string');
+      });
+    });
   });
 });

packages/sitecore-jss/src/i18n/graphql-dictionary-service.ts

@@ -7,6 +7,7 @@ import { SitecoreTemplateId } from '../constants';
 import { DictionaryPhrases, DictionaryServiceBase } from './dictionary-service';
 import { CacheOptions } from '../cache-client';
 import { getAppRootId, SearchQueryService, PageInfo, SearchQueryVariables } from '../graphql';
+import { siteNameError, languageError } from '../graphql/app-root-query';
 import debug from '../debug';
 
 /** @private */
@@ -225,6 +226,14 @@ export class GraphQLDictionaryService extends DictionaryServiceBase {
     let hasNext = true;
     let after = '';
 
+    if (!this.options.siteName) {
+      throw new RangeError(siteNameError);
+    }
+
+    if (!language) {
+      throw new RangeError(languageError);
+    }
+
     while (hasNext) {
       const fetchResponse = await this.graphQLClient.request<DictionarySiteQueryResponse>(
         siteQuery,