Merge branch 'master' into proposed-enhancement-regex-compilation

docs/dg/settingUp.md

@@ -15,7 +15,7 @@
 
  <box type="info" seamless>
 
- Type `java -version`, `npm -v` and `git --version` respectively on your OS terminal and ensure that you have the correct version of each prerequisite installed.
+ Type `java -version`, `node -v` and `git --version` respectively on your OS terminal and ensure that you have the correct version of each prerequisite installed.
  </box>
 
 <!-- ==================================================================================================== -->

frontend/src/components/c-segment-collection.vue

@@ -7,7 +7,7 @@
 <script lang='ts'>
 import { defineComponent } from 'vue';
 import cSegment from './c-segment.vue';
-import Segment from '../utils/segment';
+import { AuthorshipFileSegment } from '../types/types';
 
 export default defineComponent({
  name: 'c-segment-collection',
@@ -16,7 +16,7 @@ export default defineComponent({
  },
  props: {
  segments: {
- type: Array<Segment>,
+ type: Array<AuthorshipFileSegment>,
  required: true,
  },
  path: {

frontend/src/components/c-segment.vue

@@ -32,16 +32,16 @@
 </template>
 
 <script lang='ts'>
-import { defineComponent } from 'vue';
+import { defineComponent, PropType } from 'vue';
 import { mapState } from 'vuex';
-import Segment from '../utils/segment';
 import { StoreState } from '../types/vuex.d';
+import { AuthorshipFileSegment } from '../types/types';
 
 export default defineComponent({
  name: 'c-segment',
  props: {
  segment: {
- type: Segment,
+ type: Object as PropType<AuthorshipFileSegment>,
  required: true,
  },
  path: {

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

@@ -692,6 +692,7 @@ export default defineComponent({
  getBaseTarget(target: HTMLElement | null): HTMLElement | null {
  if (!target) {
  // Should never reach here - function assumes that target is a child of the div with class 'summary-chart__ramp'
+ // eslint-disable-next-line no-console
  console.error('Error: The getBaseTarget function in c-summary-charts.vue has been called on an element that is '
  + 'not a child of the div with class summary-chart__ramp. This might affect the drag view functionality.');
  return null;

frontend/src/views/c-authorship.vue

@@ -201,11 +201,10 @@ import minimatch from 'minimatch';
 import brokenLinkDisabler from '../mixin/brokenLinkMixin';
 import tooltipPositioner from '../mixin/dynamicTooltipMixin';
 import cSegmentCollection from '../components/c-segment-collection.vue';
-import Segment from '../utils/segment';
 import getNonRepeatingColor from '../utils/random-color-generator';
 import { StoreState } from '../types/vuex.d';
 import { FileResult, Line } from '../types/zod/authorship-type';
-import { AuthorshipFile } from '../types/types';
+import { AuthorshipFile, AuthorshipFileSegment } from '../types/types';
 import { FilesSortType, FilterType } from '../types/authorship';
 
 const filesSortDict = {
@@ -518,11 +517,11 @@ export default defineComponent({
  return name === '-';
  },
 
- splitSegments(lines: Line[]): { segments: Segment[]; blankLineCount: number; } {
+ splitSegments(lines: Line[]): { segments: AuthorshipFileSegment[]; blankLineCount: number; } {
  // split into segments separated by knownAuthor
  let lastState: string | null;
  let lastId = -1;
- const segments: Segment[] = [];
+ const segments: AuthorshipFileSegment[] = [];
  let blankLineCount = 0;
 
  lines.forEach((line, lineCount) => {
@@ -532,11 +531,11 @@ export default defineComponent({
  const knownAuthor = (line.author && isAuthorMatched) ? line.author.gitId : null;
 
  if (knownAuthor !== lastState || lastId === -1) {
- segments.push(new Segment(
+ segments.push({
  knownAuthor,
- [],
- [],
- ));
+ lineNumbers: [],
+ lines: [],
+ });
 
  lastId += 1;
  lastState = knownAuthor;