GoogleChromeLabs · mohdsayed · Jul 22, 2024 · Jul 18, 2024 · Jul 18, 2024 · Jul 18, 2024
diff --git a/packages/cli-dashboard/public/index.html b/packages/cli-dashboard/public/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="icon" type="image/png" href='data:image/svg+xml;base64,Cjxzdmcgd2lkdGg9IjEyOCIgaGVpZ2h0PSIxMjgiIHZpZXdCb3g9IjAgMCAxMjggMTI4IiBmaWxsPSJub25lIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgo8ZyBjbGlwLXBhdGg9InVybCgjY2xpcDBfMzlfNTIwKSI+CjxwYXRoIGQ9Ik0xMDMuODg4IDIzLjQ0NTFDMTExLjIxMyAzMC43NTg4IDExMy44MDcgNDEuODE3IDExMS42MjUgNTQuMTUwM0MxMDkuNDQ0IDY2LjQ3MjkgMTAyLjUxMiA3OS43OTQ0IDkxLjIyMTYgOTEuMDY3NkM3OS45MzA4IDEwMi4zNDEgNjYuNTg4NSAxMDkuMjYyIDU0LjI0NjcgMTExLjQzOUM0MS44OTQyIDExMy42MTggMzAuODE4NyAxMTEuMDI4IDIzLjQ5MzYgMTAzLjcxNEMxNi4xNjg0IDk2LjQwMDcgMTMuNTc0NyA4NS4zNDI1IDE1Ljc1NzIgNzMuMDA5MkMxNy45Mzc4IDYwLjY4NjYgMjQuODY5MyA0Ny4zNjUyIDM2LjE2MDEgMzYuMDkxOUM0Ny40NTEgMjQuODE4NyA2MC43OTMyIDE3Ljg5OCA3My4xMzUgMTUuNzIwOEM4NS40ODc1IDEzLjU0MTcgOTYuNTYzIDE2LjEzMTQgMTAzLjg4OCAyMy40NDUxWiIgc3Ryb2tlPSIjOUU5RTlFIiBzdHJva2Utd2lkdGg9IjUuNiIgc3Ryb2tlLW1pdGVybGltaXQ9IjkuOTk5OSIvPgo8cGF0aCBkPSJNMTIwLjU0MyA2My41ODQ3QzEyMC41NDMgOTQuOTI2OCA5NS4wOTQ5IDEyMC4zNDIgNjMuNjkzMiAxMjAuMzQyQzMyLjI5MTYgMTIwLjM0MiA2Ljg0Mjk3IDk0LjkyNjggNi44NDI5NyA2My41ODQ3QzYuODQyOTcgMzIuMjQyNiAzMi4yOTE2IDYuODI3MzQgNjMuNjkzMiA2LjgyNzM0Qzk1LjA5NDkgNi44MjczNCAxMjAuNTQzIDMyLjI0MjYgMTIwLjU0MyA2My41ODQ3WiIgc3Ryb2tlPSIjODU4NTg1IiBzdHJva2Utd2lkdGg9IjUuNiIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIi8+CjxwYXRoIGQ9Ik00MS4yOTQzIDIwLjkxOEgyMy42MjE5QzE5LjE4ODggMjAuOTE4IDE1LjYwOTQgMTcuMzI5MiAxNS42MDk0IDEyLjkxOEMxNS42MDk0IDguNDkxOCAxOS4yMDM4IDQuOTE3OTcgMjMuNjIxOSA0LjkxNzk3SDQxLjI5NDNDNDUuNzI3MyA0LjkxNzk3IDQ5LjMwNjcgOC41MDY3NSA0OS4zMDY3IDEyLjkxOEM0OS4zMDY3IDE3LjMxNDIgNDUuNzI3MyAyMC45MTggNDEuMjk0MyAyMC45MThaIiBmaWxsPSIjOUNEMUZCIi8+CjxwYXRoIGQ9Ik0yNy44MDgzIDgzLjkzMTdWOTMuMjY0MkMyNy44MDgzIDEwMi4yMjIgMjEuODg3MyAxMTAuNTA5IDEzLjg5NzcgMTEyLjk2MkM1LjkyMTA3IDExMC40OTYgMCAxMDIuMjQ4IDAgOTMuMjY0MlY4My45MzE3TDEzLjkxMDYgNzcuNzYxN0wyNy44MDgzIDgzLjkzMTdaIiBmaWxsPSIjMDVCQjcyIi8+CjxwYXRoIGQ9Ik0xMDkuNjI1IDM0LjQyMTlDMTE2LjQxOCAzNC40MjE5IDEyMS45MjUgMjguOTIzNCAxMjEuOTI1IDIyLjE0MDZDMTIxLjkyNSAxNS4zNTc5IDExNi40MTggOS44NTkzOCAxMDkuNjI1IDkuODU5MzhDMTAyLjgzMSA5Ljg1OTM4IDk3LjMyNDIgMTUuMzU3OSA5Ny4zMjQyIDIyLjE0MDZDOTcuMzI0MiAyOC45MjM0IDEwMi44MzEgMzQuNDIxOSAxMDkuNjI1IDM0LjQyMTlaIiBmaWxsPSIjMDVCQjcyIi8+CjxwYXRoIGQ9Ik05My4yMTY3IDMyLjQ0NTNIMzIuNDgwNVY5NS4xMTg2SDkzLjIxNjdWMzIuNDQ1M1oiIGZpbGw9IiM0NTgyRjQiLz4KPHBhdGggZD0iTTcxLjE0NzIgNjAuMTYyNEM3NS44MjEzIDU1LjQ5NTYgNzUuODIxMyA0Ny45MjkyIDcxLjE0NzIgNDMuMjYyNEM2Ni40NzMxIDM4LjU5NTUgNTguODk0OSAzOC41OTU1IDU0LjIyMDggNDMuMjYyNEM0OS41NDY3IDQ3LjkyOTIgNDkuNTQ2NyA1NS40OTU2IDU0LjIyMDggNjAuMTYyNEM1OC44OTQ5IDY0LjgyOTMgNjYuNDczMSA2NC44MjkzIDcxLjE0NzIgNjAuMTYyNFoiIGZpbGw9IndoaXRlIi8+CjxwYXRoIGQ9Ik00MC4xMzk2IDg0LjE1QzQwLjEzOTYgNzkuMzQ0OCA0My4wMDkgNzQuOTg0NyA0Ny40MzMgNzMuMTAxNUM1OC4wMzAyIDY4LjQ5MDMgNzAuMDkwNSA2OC40OTAzIDgwLjY5OTEgNzMuMTAxNUM4NS4xMzQ2IDc0Ljk4NDcgODcuOTkyNSA3OS4zNDQ4IDg3Ljk5MjUgODQuMTVWODcuNTYyOEg0MC4xMzk2Vjg0LjE1WiIgZmlsbD0id2hpdGUiLz4KPHBhdGggZD0iTTUwLjIzMzYgOTUuMTE4NUg5My4yMTY2VjUwLjAyMjUiIHN0cm9rZT0iIzI0MUYyMCIgc3Ryb2tlLXdpZHRoPSIyLjI4NyIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIi8+CjxwYXRoIGQ9Ik0xMTMuNDY0IDEwNEg4NC41NzYxTDgwIDExMi40TDg0LjU3NjEgMTIwLjhIMTEzLjQ2NEwxMTguMDQgMTEyLjRMMTEzLjQ2NCAxMDRaIiBmaWxsPSIjOUNEMUZCIi8+CjwvZz4KPGRlZnM+CjxjbGlwUGF0aCBpZD0iY2xpcDBfMzlfNTIwIj4KPHJlY3Qgd2lkdGg9IjEyOCIgaGVpZ2h0PSIxMjgiIGZpbGw9IndoaXRlIi8+CjwvY2xpcFBhdGg+CjwvZGVmcz4KPC9zdmc+Cg=='/>
-    <title>CLI Dashboard</title>
+    <title>PSAT Report</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -55,6 +55,7 @@
   filePathValidator,
   urlValidator,
   numericValidator,
+  getOutputFilePath,
 } from './utils';
 import { redLogger } from './utils/coloredLoggers';
 
@@ -219,11 +220,12 @@
     })}</script>` +
     htmlText.substring(htmlText.indexOf('</head>'));
 
-  const outFileFullDir = path.resolve(outDir + '/index.html');
+  const outputFilePath = getOutputFilePath(outDir);
+  const outFileFullDir = path.resolve(outputFilePath);
   const htmlBlob = new Blob([html]);
   const buffer = Buffer.from(await htmlBlob.arrayBuffer());
 
-  writeFile(outDir + '/index.html', buffer, () =>
+  writeFile(outputFilePath, buffer, () =>
     console.log(`\nReport: ${URL.pathToFileURL(outFileFullDir)}`)
   );
 };
@@ -335,7 +337,7 @@
    'Done analyzing cookies!'
  );

  let technologyAnalysisData: any = null;

  if (shouldDoTechnologyAnalysis) {
    spinnies.add('technology-spinner', {

diff --git a/packages/cli/src/utils/getCurrentDateAndTime.ts b/packages/cli/src/utils/getCurrentDateAndTime.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Formats the current date and time into a specified string format.
+ * The supported formats are:
+ * - 'YYYY-MM-DD_HH-MM-SS': 24-hour format with seconds (e.g., 2024-07-19_14-30-45)
+ * - 'DD MMMM, YYYY, hh:mm:ssam/pm': 12-hour format with seconds and AM/PM (e.g., 19 July, 2024, 02:30:45pm)
+ * @param format {string} The format in which the date is required.
+ * @returns {string} The formatted date string.
+ */
+function getCurrentDateAndTime(
+  format: 'YYYY-MM-DD_HH-MM-SS' | 'DD MMMM, YYYY, hh:mm:ssam/pm'
+): string {
+  const date = new Date();
+
+  const day = String(date.getDate()).padStart(2, '0');
+  const monthLong = date.toLocaleString('en-US', { month: 'long' });
+  const monthShort = String(date.getMonth() + 1).padStart(2, '0');
+  const year = date.getFullYear();
+  const hours24 = String(date.getHours()).padStart(2, '0');
+  const minutes = String(date.getMinutes()).padStart(2, '0');
+  const seconds = String(date.getSeconds()).padStart(2, '0');
+
+  let hours12 = date.getHours();
+  const ampm = hours12 >= 12 ? 'pm' : 'am';
+
+  hours12 = hours12 % 12;
+  hours12 = hours12 ? hours12 : 12; // the hour '0' should be '12'
+  const hoursPadded12 = String(hours12).padStart(2, '0');
+
+  if (format === 'YYYY-MM-DD_HH-MM-SS') {
+    return `${year}-${monthShort}-${day}_${hours24}-${minutes}-${seconds}`;
+  } else if (format === 'DD MMMM, YYYY, hh:mm:ssam/pm') {
+    return `${day} ${monthLong}, ${year}, ${hoursPadded12}:${minutes}:${seconds}${ampm}`;
+  } else {
+    throw new Error('Invalid format');
+  }
+}
+
+export default getCurrentDateAndTime;
diff --git a/packages/cli/src/utils/getOutputFilePath.ts b/packages/cli/src/utils/getOutputFilePath.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Internal dependencies.
+ */
+import { getCurrentDateAndTime } from '.';
+
+/**
+ * Get output file path.
+ * @param {string} outDir Out directory
+ * @returns {string} file path
+ */
+const getOutputFilePath = (outDir: string): string => {
+  const currentDateAndTime = getCurrentDateAndTime('YYYY-MM-DD_HH-MM-SS');
+  const fileName = outDir + `/report_` + currentDateAndTime + '.html';
+
+  return fileName;
+};
+
+export default getOutputFilePath;
diff --git a/packages/cli/src/utils/index.ts b/packages/cli/src/utils/index.ts
@@ -20,4 +20,6 @@ export { default as saveCSVReports } from './saveCSVReports';
 export { default as getUrlsFromSitemap } from './getUrlListFromArgs';
 export { default as askUserInput } from './askUserInput';
 export { default as generatePrefix } from './generatePrefix';
+export { default as getCurrentDateAndTime } from './getCurrentDateAndTime';
+export { default as getOutputFilePath } from './getOutputFilePath';
 export * from './validators';
diff --git a/packages/cli/src/utils/tests/getCurrentDateAndTime.ts b/packages/cli/src/utils/tests/getCurrentDateAndTime.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Internal dependencies.
+ */
+import { getCurrentDateAndTime } from '..';
+
+describe('getCurrentDateAndTime', () => {
+  beforeAll(() => {
+    const mockDate = new Date(2024, 6, 16, 18, 30, 15); // 2024-07-16 18:30
+    global.Date = jest.fn(() => mockDate) as unknown as typeof Date;
+  });
+
+  it('should return date and time in YYYY-MM-DD_HH-MM format', () => {
+    const result = getCurrentDateAndTime('YYYY-MM-DD_HH-MM-SS');
+    expect(result).toBe('2024-07-16_18-30-15');
+  });
+
+  it('should return date and time in DD MMMM, YYYY, hh:mmam/pm format', () => {
+    const result = getCurrentDateAndTime('DD MMMM, YYYY, hh:mm:ssam/pm');
+    expect(result).toBe('16 July, 2024, 06:30:15pm');
+  });
+
+  it('should throw an error for an invalid format', () => {
+    // @ts-ignore - invalid-format added for testing.
+    expect(() => getCurrentDateAndTime('invalid-format')).toThrow(
+      'Invalid format'
+    );
+  });
+});
diff --git a/packages/design-system/src/components/dashboard/components/siteMapReport/sidebarData.ts b/packages/design-system/src/components/dashboard/components/siteMapReport/sidebarData.ts
@@ -25,7 +25,7 @@ import { WarningBare } from '../../../../icons';
 
 const sidebarData: SidebarItems = {
   [SIDEBAR_ITEMS_KEYS.COOKIES]: {
-    title: () => I18n.getMessage('sitemapReport'),
+    title: () => 'Aggregated Report',
     children: {},
     dropdownOpen: true,
   },

diff --git a/packages/i18n/_locales/messages/en/messages.json b/packages/i18n/_locales/messages/en/messages.json
@@ -229,9 +229,6 @@
   "session": {
     "message": "Session"
   },
-  "sitemapReport": {
-    "message": "Sitemap report"
-  },
   "cookieIssues": {
     "message": "Cookie Issues"
   },

diff --git a/packages/i18n/_locales/messages/es/messages.json b/packages/i18n/_locales/messages/es/messages.json
@@ -229,9 +229,6 @@
   "session": {
     "message": "Sesión"
   },
-  "sitemapReport": {
-    "message": "Informe \"Sitemaps\""
-  },
   "cookieIssues": {
     "message": "Problemas de cookies"
   },

diff --git a/packages/i18n/_locales/messages/hi/messages.json b/packages/i18n/_locales/messages/hi/messages.json
@@ -229,9 +229,6 @@
   "session": {
     "message": "सेशन"
   },
-  "sitemapReport": {
-    "message": "साइटमैप के बारे में रिपोर्ट"
-  },
   "cookieIssues": {
     "message": "कुकी से जुड़ी समस्याएं"
   },

diff --git a/packages/i18n/_locales/messages/ja/messages.json b/packages/i18n/_locales/messages/ja/messages.json
@@ -229,9 +229,6 @@
   "session": {
     "message": "セッション"
   },
-  "sitemapReport": {
-    "message": "サイトマップ レポート"
-  },
   "cookieIssues": {
     "message": "Cookie に関する問題"
   },

diff --git a/packages/i18n/_locales/messages/ko/messages.json b/packages/i18n/_locales/messages/ko/messages.json
@@ -229,9 +229,6 @@
   "session": {
     "message": "세션"
   },
-  "sitemapReport": {
-    "message": "사이트맵 보고서"
-  },
   "cookieIssues": {
     "message": "쿠키 문제"
   },

diff --git a/packages/i18n/_locales/messages/pt_BR/messages.json b/packages/i18n/_locales/messages/pt_BR/messages.json
@@ -229,9 +229,6 @@
   "session": {
     "message": "Sessão"
   },
-  "sitemapReport": {
-    "message": "Relatório de sitemaps"
-  },
   "cookieIssues": {
     "message": "Problemas com cookies"
   },

diff --git a/packages/report/src/dummyData/PSAT_DATA.js b/packages/report/src/dummyData/PSAT_DATA.js
@@ -1918,9 +1918,6 @@ export default {
     session: {
       message: 'Session',
     },
-    sitemapReport: {
-      message: 'Sitemap report',
-    },
     cookieIssues: {
       message: 'Cookie Issues',
     },