Merge branch 'master' into bugfix/2423_logo_deletion_hotreload

Author: sopa301

config/chart-blurbs.md

@@ -1,2 +1,2 @@
-https://github.com/reposense/testrepo-Alpha/tree/master|nbriannl
+https://github.com/reposense/testrepo-Beta/tree/add-config-json|nbriannl
 Test for chart-blurbs.md

frontend/src/app.vue

@@ -124,7 +124,7 @@ const app = defineComponent({
           names,
           repoBlurbMap,
           authorBlurbMap,
-          chartsBlurbMap
+          chartBlurbMap
         } = summary;
         this.creationDate = creationDate;
         this.reportGenerationTime = reportGenerationTime;
@@ -139,7 +139,7 @@ const app = defineComponent({
         this.userUpdated = true;
         this.$store.commit('setRepoBlurbMap', repoBlurbMap);
         this.$store.commit('setAuthorBlurbMap', authorBlurbMap);
-        this.$store.commit('setChartsBlurbMap', chartsBlurbMap);
+        this.$store.commit('setChartsBlurbMap', chartBlurbMap);
       } catch (error) {
         window.alert(error);
       } finally {

frontend/src/components/c-summary-charts.vue

@@ -1037,7 +1037,7 @@ export default defineComponent({
 
     getChartBlurb(userName: string, repo: User) : string {
       const link = this.getRepoLink(repo);
-      const blurb: string | undefined = this.$store.state.chartsBlurbMap[`${link}|${userName}`]
+      const blurb: string | undefined = this.$store.state.chartBlurbMap[`${link}|${userName}`]
       if (!blurb) {
         return '';
       }

frontend/src/store/store.ts

@@ -20,7 +20,7 @@ export default createStore<StoreState>({
     isTabActive: true,
     repoBlurbMap: {},
     authorBlurbMap: {},
-    chartsBlurbMap: {}
+    chartBlurbMap: {}
   } as StoreState,
 
   mutations: {
@@ -96,7 +96,7 @@ export default createStore<StoreState>({
       state.tabAuthorshipInfo.isRefresh = b;
     },
     setChartsBlurbMap(state: StoreState, map: {[key: string]: string} | undefined) {
-      state.chartsBlurbMap = map ?? {};
+      state.chartBlurbMap = map ?? {};
     }
   },
   actions: {

frontend/src/types/vuex.d.ts

@@ -49,7 +49,7 @@ interface StoreState {
   isTabActive: boolean;
   repoBlurbMap: { [key: string]: string };
   authorBlurbMap: { [key: string]: string };
-  chartsBlurbMap: { [key: string]: string };
+  chartBlurbMap: { [key: string]: string };
 }
 
 declare module '@vue/runtime-core' {

frontend/src/types/window.ts

@@ -26,7 +26,7 @@ interface Api {
     names: string[],
     repoBlurbMap: { [key: string]: string },
     authorBlurbMap: {[key: string]: string} | undefined,
-    chartsBlurbMap: {[key: string]: string} | undefined,
+    chartBlurbMap: {[key: string]: string} | undefined,
   } | null>;
   loadCommits: (repoName: string, defaultSortOrder: number) => Promise<User[]>;
   loadAuthorship: (repoName: string) => Promise<AuthorshipSchema>;

frontend/src/types/zod/summary-type.ts

@@ -53,7 +53,7 @@ export const summarySchema = z.object({
   authorBlurbs: z.object({
     blurbMap: z.record(z.string(), z.string())
   }).optional(),
-  chartsBlurbs: z.object({
+  chartBlurbs: z.object({
     blurbMap: z.record(z.string(), z.string())
   }).optional(),
   isPortfolio: z.boolean(),

frontend/src/utils/api.ts

@@ -239,15 +239,15 @@ window.api = {
 
     const repoBlurbMap: { [key: string]: string } = data.repoBlurbs.blurbMap;
     const authorBlurbMap: {[key: string]: string} | undefined = data.authorBlurbs?.blurbMap;
-    const chartsBlurbMap: {[key: string]: string} | undefined = data.chartsBlurbs?.blurbMap;
+    const chartBlurbMap: {[key: string]: string} | undefined = data.chartBlurbs?.blurbMap;
     return {
       creationDate: reportGeneratedTime,
       reportGenerationTime,
       errorMessages,
       names,
       repoBlurbMap,
       authorBlurbMap,
-      chartsBlurbMap
+      chartBlurbMap
     };
   },
 

src/systemtest/resources/LocalRepoSystemTest/testRelativePathing/summary.json

@@ -53,7 +53,7 @@
   },
   "chartBlurbs": {
     "blurbMap": {
-      "https://github.com/reposense/testrepo-Alpha/tree/master|nbriannl":"Test for chart-blurbs.md"
+      "https://github.com/reposense/testrepo-Beta/tree/add-config-json|nbriannl":"Test for chart-blurbs.md"
     }
   },
   "isPortfolio": false

src/systemtest/resources/LocalRepoSystemTest/testSameFinalDirectory/summary.json

@@ -66,7 +66,7 @@
   },
   "chartBlurbs": {
     "blurbMap": {
-      "https://github.com/reposense/testrepo-Alpha/tree/master|nbriannl":"Test for chart-blurbs.md"
+      "https://github.com/reposense/testrepo-Beta/tree/add-config-json|nbriannl":"Test for chart-blurbs.md"
     }
   },
   "isPortfolio": false