Merge branch 'master' into 1936-migrate-c-seg-col

reposense · Oct 4, 2023 · 2f6aa23 · 2f6aa23
2 parents 3906226 + a8c3f00
commit 2f6aa23
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/frontend/cypress/tests/chartView/chartView_zoomFeature.cy.js b/frontend/cypress/tests/chartView/chartView_zoomFeature.cy.js
@@ -281,15 +281,15 @@ describe('range changes in chartview should reflect in zoom', () => {
  .get('#summary-charts .summary-chart__ramp .ramp')
  .first()
  .click(120, 20)
- .click(200, 20);
+ .click(185, 20);
 
  cy.get('#tab-zoom')
  .should('be.visible');
 
  cy.get('#tab-zoom .ramp .ramp__slice')
  .first()
  .invoke('attr', 'title')
- .should('eq', '[2020-10-01] [#1312] Conditional run for markbind to gh pages deployment (#1337): +1 -0 lines ');
+ .should('eq', '[2020-05-23] [#1241] Restore checked file types (#1256): +14 -1 lines ');
  cy.get('#tab-zoom .ramp .ramp__slice')
  .last()
  .invoke('attr', 'title')
@@ -306,7 +306,7 @@ describe('range changes in chartview should reflect in zoom', () => {
  cy.get('body').type(zoomKey, { release: false })
  .get('#summary-charts .summary-chart__ramp .ramp')
  .first()
- .click(200, 20)
+ .click(185, 20)
  .click(250, 20);
 
  cy.get('#tab-zoom')
@@ -319,8 +319,7 @@ describe('range changes in chartview should reflect in zoom', () => {
  cy.get('#tab-zoom .ramp .ramp__slice')
  .last()
  .invoke('attr', 'title')
- .should('eq', '[2020-11-21] [#1345] Authorship: Add last modified '
- + 'date to each LoC if specified (#1348): +165 -76 lines ');
+ .should('eq', '[2020-09-27] Add optional check for quotes in diff file regex (#1330): +1 -1 lines ');
  });
 
  // Assumptions: Contributer 'jamessspanggg' is the first result,
@@ -334,7 +333,7 @@ describe('range changes in chartview should reflect in zoom', () => {
  cy.get('body').type(zoomKey, { release: false })
  .get('#summary-charts .summary-chart__ramp .ramp')
  .first()
- .click(200, 20)
+ .click(185, 20)
  .click(225, 20);
 
  cy.get('#tab-zoom')
@@ -351,7 +350,6 @@ describe('range changes in chartview should reflect in zoom', () => {
  cy.get('#tab-zoom .ramp .ramp__slice')
  .last()
  .invoke('attr', 'title')
- .should('eq', '[2020-11-21] [#1345] Authorship: Add last modified date '
- + 'to each LoC if specified (#1348): +165 -76 lines ');
+ .should('eq', '[2020-09-27] Add optional check for quotes in diff file regex (#1330): +1 -1 lines ');
  });
 });
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -20,6 +20,7 @@
  "@fortawesome/free-solid-svg-icons": "^6.0.0",
  "@fortawesome/vue-fontawesome": "^3.0.3",
  "@types/minimatch": "^5.1.2",
+ "@types/seedrandom": "^3.0.5",
  "core-js": "^3.6.5",
  "highlight.js": "^10.5.0",
  "jszip": "^3.5.0",

diff --git a/frontend/src/utils/random-color-generator.js → frontend/src/utils/random-color-generator.ts b/frontend/src/utils/random-color-generator.js → frontend/src/utils/random-color-generator.ts
@@ -8,7 +8,7 @@ function getRandomHex() {
  return `#${Math.round(randomGenerator() * maxHexColorValue + 1).toString(16).padStart(6, '0')}`;
 }
 
-function rgb2lab(rgb) {
+function rgb2lab(rgb: number[]) {
  let r = rgb[0] / 255;
  let g = rgb[1] / 255;
  let b = rgb[2] / 255;
@@ -29,7 +29,7 @@ function rgb2lab(rgb) {
 
 // this delta E (perceptual color distance) implementation taken from @antimatter15 from
 // github: https://github.com/antimatter15/rgb-lab
-function deltaE(rgbA, rgbB) {
+function deltaE(rgbA: number[], rgbB: number[]) {
  const labA = rgb2lab(rgbA);
  const labB = rgb2lab(rgbB);
  const deltaL = labA[0] - labB[0];
@@ -49,7 +49,7 @@ function deltaE(rgbA, rgbB) {
  return distance < 0 ? 0 : Math.sqrt(distance);
 }
 
-function hasSimilarExistingColors(existingColors, newHex) {
+function hasSimilarExistingColors(existingColors: string[], newHex: string) {
  const deltaEThreshold = 11;
  // the lower limit of delta E to be similar, more info at http://zschuessler.github.io/DeltaE/learn/
  return existingColors.some((existingHex) => {
@@ -59,7 +59,7 @@ function hasSimilarExistingColors(existingColors, newHex) {
  });
 }
 
-function getNonRepeatingColor(existingColors) {
+function getNonRepeatingColor(existingColors: string[]) {
  let generatedHex = getRandomHex();
  while (hasSimilarExistingColors(existingColors, generatedHex)) {
  generatedHex = getRandomHex();