Skip to content

Commit

Permalink
refact: move badge to a separate component
Browse files Browse the repository at this point in the history
  • Loading branch information
edelclaux committed Oct 8, 2024
1 parent eeffe77 commit 608b7fc
Show file tree
Hide file tree
Showing 7 changed files with 114 additions and 64 deletions.
3 changes: 3 additions & 0 deletions frontend/src/app/GN2CommonModule/GN2Common.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import { AreasIntersectedComponent } from './form/areas-intersected/areas-inters
import { AutoCompleteComponent } from '@geonature_common/form/autocomplete/autocomplete.component';
import { ConfirmationDialog } from '@geonature_common/others/modal-confirmation/confirmation.dialog';
import { DatalistComponent } from '@geonature_common/form/datalist/datalist.component';
import { BadgeComponent } from '@geonature_common/others/badge/badge.component';
import { BreadcrumbsComponent } from '@geonature_common/others/breadcrumbs/breadcrumbs.component';
import { DatasetsComponent } from './form/datasets/datasets.component';
import { DateComponent } from './form/date/date.component';
Expand Down Expand Up @@ -141,6 +142,7 @@ import { TaxonTreeComponent } from './form/taxon-tree/taxon-tree.component';
AreasComponent,
NomenclatureComponent,
ObserversComponent,
BadgeComponent,
BreadcrumbsComponent,
DateComponent,
TaxonomyComponent,
Expand Down Expand Up @@ -208,6 +210,7 @@ import { TaxonTreeComponent } from './form/taxon-tree/taxon-tree.component';
AcquisitionFrameworksComponent,
AreasComponent,
MunicipalitiesComponent,
BadgeComponent,
BreadcrumbsComponent,
DynamicFormComponent,
NomenclatureComponent,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<span
class="badge badge-secondary"
[style]="symbologyAsCSS"
matTooltip="{{ tooltip }}"
>
{{ text }}
</span>
15 changes: 15 additions & 0 deletions frontend/src/app/GN2CommonModule/others/badge/badge.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
.badge {
--bgColor: #ffffff; // Default value
--textColor: #444; // Default value

display: flex;
flex-flow: row nowrap;
white-space: nowrap;
gap: 0.25rem;
text-transform: uppercase;
font-weight: bold;

background-color: var(--bgColor);
border: 2px solid color-mix(in srgb, var(--bgColor) 80%, black);
color: var(--textColor);
}
68 changes: 68 additions & 0 deletions frontend/src/app/GN2CommonModule/others/badge/badge.component.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import { CommonModule } from '@angular/common';
import { Component, Input, OnInit } from '@angular/core';
import { GN2CommonModule } from '@geonature_common/GN2Common.module';

// ////////////////////////////////////////////////////////////////////////////
// helper method
// ////////////////////////////////////////////////////////////////////////////

function isHexadecimalColor(color: string) {
return /^#[0-9A-F]{6}$/i.test(color);
}

function computeContrastColor(backgroundColor: string) {
// Convertir la couleur en un format RGB
const r = parseInt(backgroundColor.slice(1, 3), 16);
const g = parseInt(backgroundColor.slice(3, 5), 16);
const b = parseInt(backgroundColor.slice(5, 7), 16);

// Calculer la luminosité
const luminance = 0.299 * r + 0.587 * g + 0.114 * b;

// Retourner une couleur claire ou foncée selon la luminosité
return luminance < 128 ? '#ffffff' : '#444';
}

function colorToCSS(color: string) {
return `--bgColor: ${color}; --textColor: ${computeContrastColor(color)};`;
}

// ////////////////////////////////////////////////////////////////////////////
// Badge parameters
// ////////////////////////////////////////////////////////////////////////////

export interface BadgeSymbology {
color?: string;
}

// ////////////////////////////////////////////////////////////////////////////
// helper method
// ////////////////////////////////////////////////////////////////////////////

@Component({
selector: 'gn-badge',
templateUrl: 'badge.component.html',
styleUrls: ['badge.component.scss'],
})
export class BadgeComponent {
@Input()
text: string;

@Input()
tooltip: string;

symbologyAsCSS: string;

@Input()
set symbology(symbology: BadgeSymbology | null) {
this.symbologyAsCSS = '';
if (!symbology) {
return;
}
if (!isHexadecimalColor(symbology.color)) {
console.warn(`[badge] ${symbology.color} is not a valid hexadecimal color`);
return;
}
this.symbologyAsCSS = colorToCSS(symbology.color);
}
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<div class="Status">
<div class="Status__header">Statuts</div>
<div class="Status__badges">
<span
class="badge badge-secondary"
*ngFor="let status of status; let isLast = last"
[style]="status.symbologyAsCSS"
matTooltip="{{ status.tooltip }}"
>
{{ status.badge }}
</span>
<gn-badge
*ngFor="let status of status"
[tooltip]="status.tooltip"
[text]="status.badge"
[symbology]="status.symbology"
/>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,5 @@
width: 100%;
gap: $gap;
line-height: inherit;
--bgColor: #ffffff; // Default value
--textColor: #444; // Default value
.badge {
display: flex;
flex-flow: row nowrap;
white-space: nowrap;
gap: $gap / 2;
text-transform: uppercase;
font-weight: bold;
background-color: var(--bgColor);
border: 2px solid color-mix(in srgb, var(--bgColor) 80%, black);
color: var(--textColor);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,13 @@ import { Component, Input, OnInit } from '@angular/core';
import { Taxon } from '@geonature_common/form/taxonomy/taxonomy.component';
import { GN2CommonModule } from '@geonature_common/GN2Common.module';
import { TaxonSheetService } from '../../taxon-sheet.service';
import { BadgeSymbology } from '@geonature_common/others/badge/badge.component';

interface Status {
badge: string;
tooltip: string;
symbologyAsCSS: string;
symbology: BadgeSymbology | null;
}

function computeContrastColor(backgroundColor: string) {
// Convertir la couleur en un format RGB
const r = parseInt(backgroundColor.slice(1, 3), 16);
const g = parseInt(backgroundColor.slice(3, 5), 16);
const b = parseInt(backgroundColor.slice(5, 7), 16);

// Calculer la luminosité
const luminance = 0.299 * r + 0.587 * g + 0.114 * b;

// Retourner une couleur claire ou foncée selon la luminosité
return luminance < 128 ? '#ffffff' : '#444';
}

function colorToCSS(color: string) {
return `--bgColor: ${color}; --textColor: ${computeContrastColor(color)};`;
}

@Component({
standalone: true,
selector: 'status',
Expand All @@ -38,12 +21,7 @@ export class StatusComponent implements OnInit {
_taxon: Taxon | null;
_symbology: Array<{
types: Array<string>;
values: Record<
string,
{
symbologyAsCSSStyle: string;
}
>;
values: Record<string, BadgeSymbology>;
}>;
status: Array<Status> = [];

Expand All @@ -55,33 +33,27 @@ export class StatusComponent implements OnInit {
if (!symbology || !symbology.symbologies) {
return;
}
for (const symbologyItem of symbology.symbologies) {
const values = {};
for (const key of Object.keys(symbologyItem.values)) {
values[key] = {
symbologyAsCSSStyle: colorToCSS(symbologyItem.values[key].color),
};
}
this._symbology.push({
types: symbologyItem.types,
values: values,
});
}
this._symbology = symbology.symbologies;

this.computeStatus();
});
this._tss.fetchStatusSymbology();
}

_getSymbologyAsCSSStyle(type: string, value: string): string {
_getSymbologyAsBadgeSymbology(type: string, value: string): BadgeSymbology | null {
if (!this._symbology) {
return '';
return null;
}
const symbologieItem = this._symbology.find((item) => item.types.includes(type));
if (!symbologieItem) {
return '';
return null;
}

return symbologieItem.values[value]?.symbologyAsCSSStyle ?? '';
if (!('color' in symbologieItem.values[value])) {
return null;
}
return {
color: symbologieItem.values[value].color,
};
}

@Input()
Expand All @@ -106,7 +78,7 @@ export class StatusComponent implements OnInit {
this.status.push({
badge: badgeValue,
tooltip: `${status.cd_type_statut} : ${value.display} - ${text.full_citation}`,
symbologyAsCSS: this._getSymbologyAsCSSStyle(status.cd_type_statut, value.code_statut),
symbology: this._getSymbologyAsBadgeSymbology(status.cd_type_statut, value.code_statut),
});
}
}
Expand Down

0 comments on commit 608b7fc

Please sign in to comment.