Interactive interface for browsing global, full-resolution satellite imagery
WV-3397 Issue with changing color palettes for dual color paletted layer (#5636)
Patrick Moulden4986a39945e8
diff --git a/e2e/features/layers/options-test.spec.js b/e2e/features/layers/options-test.spec.jsindex 23b5e6a3f..d5a4fca95 100644--- a/e2e/features/layers/options-test.spec.js+++ b/e2e/features/layers/options-test.spec.js@@ -32,8 +32,8 @@ test('Verify that settings button opens settings modal', async () => {})test('Verify that custom blue custom palette is checked', async () => {- const activeDefaultPaletteCheckbox = await page.locator('.wv-palette-selector-row.checked #wv-palette-radio-__default')- const activeBluePaletteCheckbox = await page.locator('.wv-palette-selector-row.checked #wv-palette-radio-blue_2')+ const activeDefaultPaletteCheckbox = await page.locator('.wv-palette-selector-row.checked #wv-palette-radio-__default-0')+ const activeBluePaletteCheckbox = await page.locator('.wv-palette-selector-row.checked #wv-palette-radio-blue_2-0')await expect(activeDefaultPaletteCheckbox).not.toBeVisible()await expect(activeBluePaletteCheckbox).toBeVisible()})@@ -52,8 +52,8 @@ test('Verify that threshold and opacity components update when different layer s})test('Verify that default palette is now checked', async () => {- const activeDefaultPaletteCheckbox = await page.locator('.wv-palette-selector-row.checked #wv-palette-radio-__default')- const activeBluePaletteCheckbox = await page.locator('.wv-palette-selector-row.checked #wv-palette-radio-blue_2')+ const activeDefaultPaletteCheckbox = await page.locator('.wv-palette-selector-row.checked #wv-palette-radio-__default-0')+ const activeBluePaletteCheckbox = await page.locator('.wv-palette-selector-row.checked #wv-palette-radio-blue_2-0')await expect(activeDefaultPaletteCheckbox).toBeVisible()await expect(activeBluePaletteCheckbox).not.toBeVisible()})diff --git a/web/js/components/layer/settings/palette.js b/web/js/components/layer/settings/palette.jsindex 2aa21b377..eb6e96fe0 100644--- a/web/js/components/layer/settings/palette.js+++ b/web/js/components/layer/settings/palette.js@@ -52,9 +52,9 @@ function PaletteSelect (props) {const isInvisible = color === '00000000';return (- <div key={id} className={caseDefaultClassName + checkedClassName}>+ <div key={`${id}-${index}`} className={caseDefaultClassName + checkedClassName}><input- id={`wv-palette-radio-${id}`}+ id={`wv-palette-radio-${id}-${index}`}type="radio"name="wv-palette-radio"onClick={() => onChangePalette(id)}@@ -62,7 +62,7 @@ function PaletteSelect (props) {{isSelected && (<span class="dot" />)}- <label htmlFor={`wv-palette-radio-${id}`}>+ <label htmlFor={`wv-palette-radio-${id}-${index}`}><spanclassName={isInvisible ? 'checkerbox-bg wv-palettes-class' : 'wv-palettes-class'}style={isInvisible ? null : { backgroundColor: util.hexToRGBA(color) }}@@ -93,10 +93,11 @@ function PaletteSelect (props) {canvas.height,);const dataURL = canvas.toDataURL('image/png');+return (- <div key={id} className={caseDefaultClassName + checkedClassName}>+ <div key={`${id}-${index}`} className={caseDefaultClassName + checkedClassName}><input- id={`wv-palette-radio-${id}`}+ id={`wv-palette-radio-${id}-${index}`}type="radio"name="wv-palette-radio"onClick={() => onChangePalette(id)}@@ -104,7 +105,7 @@ function PaletteSelect (props) {{isSelected && (<span class="dot" />)}- <label htmlFor={`wv-palette-radio-${id}`}>+ <label htmlFor={`wv-palette-radio-${id}-${index}`}><img src={dataURL} /><span className="wv-palette-label">{legend.name || 'Default'}</span></label>diff --git a/web/js/components/sidebar/paletteLegend.js b/web/js/components/sidebar/paletteLegend.jsindex 07f0135d4..830e1d2a1 100644--- a/web/js/components/sidebar/paletteLegend.js+++ b/web/js/components/sidebar/paletteLegend.js@@ -80,12 +80,18 @@ class PaletteLegend extends React.Component {}componentDidUpdate(prevProps) {- const { isDistractionFreeModeActive, layer, width } = this.props;+ const {+ isDistractionFreeModeActive,+ layer,+ width,+ paletteLegends,+ } = this.props;// Updates when layer options/settings changed, if ZOT changes the width of the palette, or distraction free mode exitconst layerChange = !lodashIsEqual(layer, prevProps.layer);+ const paletteLegendsChange = !lodashIsEqual(paletteLegends, prevProps.paletteLegends);const widthChange = prevProps.width !== width;const distractionFreeChange = prevProps.isDistractionFreeModeActive && !isDistractionFreeModeActive;- if (layerChange || widthChange || distractionFreeChange) {+ if (layerChange || widthChange || distractionFreeChange || paletteLegendsChange) {this.updateCanvas();}}