Skip to content

Commit

Permalink
Fix truncated urls (#94)
Browse files Browse the repository at this point in the history
* Show simulation in table

* Change message no token

* Update DataCarbon

* WIP: check all servers

* Revert "WIP: check all servers"

This reverts commit 286654c.

* Integrate optional Call ApiCo2Signal (#82)

* Show simulation in table (#77)

* Change message token Co2Signal (#78)

* Show simulation in table

* Change message no token

* Integrate optional Call ApiCo2Signal

* Add cache for intensity and location

* Feature #80 results per servers localisation (#83)

* Data reception and sorting ok

* WIP insert new card

* WIP insert new card

* WIP insert new card

* WIP insert new card

* Style

* Messages

* #80 : review html markup, only show resources names

* Change bottom message for show/hide urls

* Move buttom

---------

Co-authored-by: OlivierCamon <[email protected]>

* Css Change

* nitpick : removed duplicated code (#84)

* Feature #79 compute average carbon intensity of server requests by location (#85)

* Change model of calcul

* Change model of calcul

* #86 new cards summarize data (#87)

* Update next version

* Reorganisation .svelte

* Add summary cards

* Clean old code

Co-authored-by: OlivierCamon <[email protected]>

* Clean old code

Co-authored-by: OlivierCamon <[email protected]>

---------

Co-authored-by: OlivierCamon <[email protected]>

* Change summary title

* Add runner idea

* Refresh icon received action

* Correction for site without www

* Update version

* Update change style

* #92 allow user to see full URL when they are truncated (#93)

---------

Co-authored-by: boukhalfa.zahout <[email protected]>
Co-authored-by: OlivierCamon <[email protected]>
Co-authored-by: OlivierCamon <[email protected]>
  • Loading branch information
4 people authored Oct 1, 2024
1 parent 930621b commit 53f27a7
Show file tree
Hide file tree
Showing 12 changed files with 46 additions and 31 deletions.
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
nodejs 22.2.0
yarn 1.22.22
6 changes: 3 additions & 3 deletions public/_locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,6 @@
"resDetCountrySwitchUrlHide": {
"message": "Hide full URL"
},
"resDetCountrySwitchUrlShow": {
"message": "Show full URL"
},
"resDetCountTitleHit": {
"message": "requests"
},
Expand Down Expand Up @@ -484,5 +481,8 @@
},
"wuEquivalent": {
"message": "Water"
},
"switchUrlShow": {
"message": "Show full URL"
}
}
6 changes: 3 additions & 3 deletions public/_locales/fr/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,6 @@
"resDetCountrySwitchUrlHide": {
"message": "Masquer les URL complètes"
},
"resDetCountrySwitchUrlShow": {
"message": "Afficher les URL complètes"
},
"resDetCountTitleHit": {
"message": "requêtes"
},
Expand Down Expand Up @@ -484,5 +481,8 @@
},
"wuEquivalent": {
"message": "Eau"
},
"switchUrlShow": {
"message": "Afficher les URL complètes"
}
}
8 changes: 8 additions & 0 deletions src/assets/styles/components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,12 @@ h1 {
font-size: var(--font-size--xl);
text-align: center;
color: var(--color--green);
}

.hide--url .table--url {
max-width: 24ch;
display: inline-block;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
2 changes: 1 addition & 1 deletion src/components/cards/ResDetailByCountry.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<Button
on:buttonClick={switchUrl}
buttonType={ButtonTypeEnum.PRIMARY}
translateKey={'resDetCountrySwitchUrlShow'}
translateKey={'switchUrlShow'}
/>
{/if}
{/if}
Expand Down
6 changes: 4 additions & 2 deletions src/components/journey/Synthesis.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
export let datas: Measure[];
export let caption: string = '';
export let description: string = '';
export let className: string = '';
let srv = new SynthesisSrv();
const synthesis = srv.getSynthesis(datas);
Expand All @@ -27,7 +29,7 @@
</script>

<!-- TODO trop de code répété, faire un générateur) -->
<div class="synthesis-container">
<div class="synthesis-container {className}">
<table class="table">
<caption>
{caption}
Expand Down Expand Up @@ -79,7 +81,7 @@
{#each synthesis.pages as page, index}
<tr class:even={index % 2 === 0}>
<td>
{page.shortUrl}
<span class="table--url">{page.url}</span>
</td>
<td class="scroll">{page.sScroll.count}</td>
<td
Expand Down
8 changes: 5 additions & 3 deletions src/components/journey/Table.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
export let datas: Map<string, TableData>[] = [];
export let caption: string = '';
export let description: string = '';
export let className: string = '';
const dispatch = createEventDispatcher();
const surHeads = getSurHead(columnHeaders);
</script>

<div class="table-container">
<div class="table-container {className}">
<table class="table">
<caption>
{caption}
Expand Down Expand Up @@ -61,8 +63,8 @@
buttonType={ButtonTypeEnum.SECONDARY}
translateKey={data.get(header.id)?.content ?? ""}
/>
{:else if data.get(header.id)?.detail}
{data.get(header.id)?.content}
{:else if data.get(header.id)?.contentHtml}
{@html data.get(header.id)?.contentHtml}
{:else}
{translate(data.get(header.id)?.content)}
{/if}
Expand Down
20 changes: 17 additions & 3 deletions src/components/results/JourneyResults.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,28 @@
import { formatGesMeasuresForTable, translate } from 'src/utils';
import { SynthesisTable, Table } from 'src/components/journey';
import { gesTableHeaders } from 'src/const';
import { ButtonTypeEnum } from '../../enum';
import { Button } from '../html';
export let measures: Measure[];
const dataFormatted = formatGesMeasuresForTable(measures);
let shortUrl = true;
const switchUrl = () => {
shortUrl = !shortUrl;
};
</script>

<SynthesisTable datas={measures} caption={translate('messageResults')} description={translate('descriptionResults')} />
<SynthesisTable className="{shortUrl ? 'hide--url' : ''}" datas={measures} caption={translate('messageResults')} description={translate('descriptionResults')} />
<br />

<Table caption={translate('messageResultsDetail')} description={translate('descriptionResultsDetail')}
columnHeaders={gesTableHeaders} datas={dataFormatted} />
<Table className="{shortUrl ? 'hide--url' : ''}" caption={translate('messageResultsDetail')} description={translate('descriptionResultsDetail')}
columnHeaders={gesTableHeaders} datas={dataFormatted} />
<p>
<Button
on:buttonClick={switchUrl}
buttonType={ButtonTypeEnum.PRIMARY}
translateKey={'switchUrlShow'}
/>
</p>
1 change: 0 additions & 1 deletion src/interface/synthesis.interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export interface Synthesis {

export interface SynthesisLine extends SynthesisBase {
url: string;
shortUrl: string;
}

export interface SynthesisBase {
Expand Down
2 changes: 1 addition & 1 deletion src/interface/table.interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export interface TableData {
content?: any;
style?: string;
action?: boolean;
detail?: string;
contentHtml?: string;
}

export interface TableHeader {
Expand Down
6 changes: 2 additions & 4 deletions src/service/synthesis.service.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import { GESService, ScoreService } from '.';
import type {
DetailServerGes,
GES,
Measure,
NetworkMeasure, SimpleGES,
Synthesis,
SynthesisCommon,
SynthesisLine
} from '../interface';
import { filterMeasure, formatShortUrl } from 'src/utils';
import { filterMeasure } from 'src/utils';

export class SynthesisSrv {
private gesService: GESService;
Expand All @@ -31,8 +30,7 @@ export class SynthesisSrv {
sScroll: calScroll,
sClick: calClick,
sPage: calPage,
url: url,
shortUrl: formatShortUrl(url)
url: url
});
}
}
Expand Down
11 changes: 1 addition & 10 deletions src/utils/format.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const formatGesMeasuresForTable = (measures: Measure[], add?: Map<string,
return measures.map((measure): Map<string, TableData> => {
let data: Map<any, TableData> = new Map<any, TableData>;
data.set('date', { content: formatDate(measure.date), style: 'font-weight:bold' });
data.set('url', { content: formatShortUrl(measure.url), detail: measure.url });
data.set('url', { contentHtml: `<span class="table--url">${measure.url}</span>`});
data.set('urlAction', { content: measure.action });
data.set('sizeTransferred', {
content: formatSizeTransferred(measure.networkMeasure.network.size, measure.networkMeasure.network.sizeUncompress)
Expand Down Expand Up @@ -88,15 +88,6 @@ export const formatGesMeasuresForTable = (measures: Measure[], add?: Map<string,
});
};

export const formatShortUrl = (url: string | undefined) => {
let formatted = '';
if (url) {
formatted = url.replace(/(^\w+:|^)\/\//, '');
formatted = formatted.length > 23 ? `${formatted.slice(0, 23)}...` : formatted;
}
return formatted;
};

export const formatUriOnly = (url: string | undefined) => {
let formatted = '';
try {
Expand Down

0 comments on commit 53f27a7

Please sign in to comment.