refactor: improve readability

cnumr · Apr 13, 2024 · 7cef654 · 7cef654
1 parent c42822e
commit 7cef654
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 42 deletions.
diff --git a/assets/js/components/SiteAnalysisResult.js b/assets/js/components/SiteAnalysisResult.js
@@ -52,7 +52,7 @@ class SiteAnalysisResult {
 				pageResultData[key] = value;
 
 				if (key === "id") {
-					const screenshotUrl = AnalysisService.fetchAnalysisScreenshotUrlById(urlParams.get("id"))
+					const screenshotUrl = AnalysisService.getAnalysisScreenshotUrlById(urlParams.get("id"))
 					screenshotImgElement.setAttribute("src", screenshotUrl)
 				}
 			}
@@ -71,7 +71,7 @@ class SiteAnalysisResult {
 			// window.location.pathname is something like /resultat (in french) or /en/result (in english)
 			pageResultData = await AnalysisService.fetchAnalysisById(analysisId, window.location.pathname)
 
-			const screenshotUrl = AnalysisService.fetchAnalysisScreenshotUrlById(analysisId)
+			const screenshotUrl = AnalysisService.getAnalysisScreenshotUrlById(analysisId)
 			screenshotImgElement.setAttribute("src", screenshotUrl)
 
 			// update the link URL of every lang switcher

diff --git a/assets/js/services/AnalysisService.js b/assets/js/services/AnalysisService.js
@@ -22,35 +22,25 @@ class AnalysisService {
 		try {
 			EcoIndexDialog.openPendingAnalysis(url);
 
-			ApiService.newAnalysisTaskByURL(url).then(
-				(taskId) => {
-					ApiService.fetchAnalysisTaskById(taskId).then(
-						(taskResult) => {
-							const ecoindex = taskResult.ecoindex_result;
+			const taskId = await ApiService.newAnalysisTaskByURL(url)
 
-							if (taskResult.status === "SUCCESS" && ecoindex.status === "SUCCESS") {
-								ResultCacheService.add(ecoindex.detail);
-								redirectToResults(taskId, resultUrlPrefix);
-							}
+			const taskResult = await ApiService.fetchAnalysisTaskById(taskId)
+
+			const ecoindex = taskResult.ecoindex_result;
 
-							if (taskResult.status === "SUCCESS" && ecoindex.status === "FAILURE") {
-								const e = taskResult.ecoindex_result.error;
-								EcoIndexDialog.openErrorMessage(e.status_code, e);
-							}
+			if (taskResult.status === "SUCCESS" && ecoindex.status === "SUCCESS") {
+				ResultCacheService.add(ecoindex.detail);
+				redirectToResults(taskId, resultUrlPrefix);
+			}
 
-							if (taskResult.status === "FAILURE") {
-								EcoIndexDialog.openErrorMessage(599, taskResult.task_error);
-							}
-						},
-						(e) => {
-							this.#handleError(e);
-						}
-					);
-				},
-				(e) => {
-					this.#handleError(e);
-				}
-			);
+			if (taskResult.status === "SUCCESS" && ecoindex.status === "FAILURE") {
+				const e = taskResult.ecoindex_result.error;
+				EcoIndexDialog.openErrorMessage(e.status_code, e);
+			}
+
+			if (taskResult.status === "FAILURE") {
+				EcoIndexDialog.openErrorMessage(599, taskResult.task_error);
+			}
 		} catch (e) {
 			this.#handleError(e);
 		}
@@ -60,8 +50,8 @@ class AnalysisService {
 	 * @param {string} id 
 	 * @returns {string}
 	 */
-	fetchAnalysisScreenshotUrlById(id) {
-		return ApiService.fetchAnalysisScreenshotUrlById(id)
+	getAnalysisScreenshotUrlById(id) {
+		return ApiService.getAnalysisScreenshotUrlById(id)
 	}
 
 	/**
@@ -79,17 +69,10 @@ class AnalysisService {
 		// Otherwise fetch from api
 		try {
 			EcoIndexDialog.openAnalysisRetrieval();
-			await ApiService.fetchAnalysisById(id).then(
-				(result) => {
-					apiResult = result;
-					ResultCacheService.add(result);
-					redirectToResults(result.id, resultPagePrefix);
-					EcoIndexDialog.close();
-				},
-				(e) => {
-					this.#handleError(e);
-				}
-			);
+			apiResult = await ApiService.fetchAnalysisById(id)
+			ResultCacheService.add(apiResult);
+			redirectToResults(apiResult.id, resultPagePrefix);
+			EcoIndexDialog.close();
 		} catch (e) {
 			this.#handleError(e);
 			return null;

diff --git a/assets/js/services/ApiService.js b/assets/js/services/ApiService.js
@@ -50,7 +50,7 @@ class ApiService {
 	 * @param {string} id Analysis Id
 	 * @returns {string} API URL
 	 */
-	fetchAnalysisScreenshotUrlById(id) {
+	getAnalysisScreenshotUrlById(id) {
 		return `${BASE_URL}ecoindexes/${id}/screenshot`;
 	}