Refactor code

Author: thachnd

samples/musicfestival-backend-dotnet/Startup.cs

@@ -1,13 +1,10 @@
 using System.Runtime.InteropServices;
 using EPiServer.Cms.Shell;
 using EPiServer.Cms.UI.AspNetIdentity;
-using EPiServer.ContentApi.Cms;
 using EPiServer.ContentApi.Core.DependencyInjection;
-using EPiServer.ContentDefinitionsApi;
 using EPiServer.Core;
 using EPiServer.Data;
 using EPiServer.DependencyInjection;
-using EPiServer.OpenIDConnect;
 using EPiServer.Web;
 using EPiServer.Web.Routing;
 

samples/musicfestival-frontend-react/src/App.tsx

@@ -5,7 +5,7 @@ import ArtistContainerPage from './pages/ArtistContainerPage';
 import ArtistDetailsPage from './pages/ArtistDetailsPage';
 import authService from './authService';
 import { useState } from 'react';
-import { isEditOrPreviewMode } from './helpers/urlHelper'
+import { isEditOrPreviewMode, getPreviewTokenFromUrl } from './helpers/urlHelper'
 import './App.css';
 import Footer from './components/Footer';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
@@ -36,8 +36,7 @@ const App = () => {
         }
     });
 
-    const urlParams = new URLSearchParams(window.location.search);
-    const previewToken = urlParams.get('preview_token') ?? "";
+    const previewToken = getPreviewTokenFromUrl(window.location.search);
 
     variables = generateGQLQueryVars(previewToken, window.location.pathname)
     if (modeEdit) {

samples/musicfestival-frontend-react/src/components/SearchButton.tsx

@@ -2,7 +2,7 @@ import {useEffect, useRef, useState} from "react";
 import {useSearchParams} from "react-router-dom";
 import {ArtistAutocompleteQuery, Ranking, useArtistAutocompleteQuery} from "../generated";
 import {generateGQLSearchQueryVars} from "../helpers/queryCacheHelper";
-import {getRankingFromSearchParams, isEditOrPreviewMode} from "../helpers/urlHelper";
+import {getRankingFromSearchParams, isEditOrPreviewMode, getPreviewTokenFromUrl } from "../helpers/urlHelper";
 
 type CustomString = string | number | readonly string[] | undefined
 
@@ -18,8 +18,7 @@ function SearchButton({filterValue}: any): JSX.Element {
     const [orderBy] = useState("ASC")
 
     let modeEdit = isEditOrPreviewMode()
-    const urlParams = new URLSearchParams(window.location.search);
-    const previewToken = urlParams.get('preview_token') ?? "";
+    const previewToken = getPreviewTokenFromUrl(window.location.search);
 
     let variables = generateGQLSearchQueryVars(previewToken, window.location.pathname, searchValue as string | null, orderBy, ranking);
     const autocompleteData = useArtistAutocompleteQuery({endpoint: singleKeyUrl}, variables, {

samples/musicfestival-frontend-react/src/helpers/urlHelper.ts

@@ -66,4 +66,12 @@ const getRankingFromSearchParams = (searchParams: URLSearchParams): Ranking => {
     return Ranking.Relevance;
 }
 
-export {isEditOrPreviewMode, extractParams, getImageUrl, getRankingFromSearchParams}
+const getPreviewTokenFromUrl = (queryString: string) => {
+    const urlParams = new URLSearchParams(queryString);
+    const previewToken = urlParams.get('preview_token') ?? "";
+
+    return previewToken;
+}
+
+
+export {isEditOrPreviewMode, extractParams, getImageUrl, getRankingFromSearchParams, getPreviewTokenFromUrl}