Skip to content

Commit b6b476d

Browse files
authored
Merge pull request #657 from AppQuality/develop
master-release-2023-11-09
2 parents b5fa87d + 5d76c08 commit b6b476d

File tree

16 files changed

+131
-82
lines changed

16 files changed

+131
-82
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "1.4.0",
44
"private": true,
55
"dependencies": {
6-
"@appquality/unguess-design-system": "3.1.47",
6+
"@appquality/unguess-design-system": "3.1.49",
77
"@headwayapp/react-widget": "^0.0.4",
88
"@reduxjs/toolkit": "^1.8.0",
99
"@rtk-query/codegen-openapi": "^1.0.0-alpha.1",

src/common/components/inviteUsers/modalFooter.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@ export const PermissionSettingsFooter = () => {
2020
const { t } = useTranslation();
2121
const { addToast } = useToast();
2222

23+
const url = new URL(window.location.href);
24+
2325
return (
2426
<FooterWithBorder>
2527
<Button
2628
isBasic
2729
onClick={() => {
28-
navigator.clipboard.writeText(window.location.href);
30+
navigator.clipboard.writeText(`${url.origin}${url.pathname}`);
2931
addToast(
3032
({ close }) => (
3133
<Notification

src/common/components/inviteUsers/userItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export const UserItem = ({
5858
return (
5959
<>
6060
<UserListItem key={`profile_${user.profile_id}`}>
61-
<Avatar avatarType="text">
61+
<Avatar avatarType="text" style={{ flexShrink: 0 }}>
6262
{getInitials(user.name.length ? user.name : user.email)}
6363
</Avatar>
6464
<div>

src/common/components/navigation/sidebar/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ export const AppSidebar = (props: PropsWithChildren<SidebarProps>) => {
169169
onClick={() =>
170170
navigateTo('projects', project.id.toString())
171171
}
172+
style={{ alignItems: 'flex-start' }}
172173
>
173174
<NavItemProject.Title title={project.name}>
174175
{project.name}

src/features/api/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -745,6 +745,7 @@ export type GetCampaignsByCidUxApiResponse = /** status 200 OK */ {
745745
video?: {
746746
url: string;
747747
streamUrl: string;
748+
poster?: string;
748749
start: number;
749750
end: number;
750751
description?: string;

src/locales/en/translation.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,10 @@
213213
"__BUGS_UNIQUE_FILTER_ITEM_UNIQUE": "Unique only",
214214
"__BUGS_USECASES_FILTER_ITEM_NO_ITEMS": "Use Case",
215215
"__CAMPAIGN_CARD_EMPTY_TITLE_LABEL": "Untitled",
216-
"__CAMPAIGN_EXP_WIDGET_SENTIMENT_CARD_DESCRIPTION": "Here you can find the evolution of user sentiments through the Use Cases, evaluated on this scale:",
217-
"__CAMPAIGN_EXP_WIDGET_SENTIMENT_CARD_PRE_TITLE": "What this graph shows",
218-
"__CAMPAIGN_EXP_WIDGET_SENTIMENT_CARD_TITLE": "Identify the most critical Use Cases",
219-
"__CAMPAIGN_EXP_WIDGET_SENTIMENT_HEADER": "Users' sentiments during the test",
216+
"__CAMPAIGN_EXP_WIDGET_SENTIMENT_CARD_DESCRIPTION": "Here you can see the users’ sentiments throughout the Use Cases, evaluated on this rating scale:",
217+
"__CAMPAIGN_EXP_WIDGET_SENTIMENT_CARD_PRE_TITLE": "About this chart",
218+
"__CAMPAIGN_EXP_WIDGET_SENTIMENT_CARD_TITLE": "The most critical Use Cases at a glance",
219+
"__CAMPAIGN_EXP_WIDGET_SENTIMENT_HEADER": "Sentiments during the test",
220220
"__CAMPAIGN_EXP_WIDGET_SENTIMENT_LIST_DESCRIPTION": "Identify the most critical Use Cases and the most appreciated ones. The list is ordered by the most critical",
221221
"__CAMPAIGN_EXP_WIDGET_SENTIMENT_LIST_ITEM_VAL_1": "Very negative",
222222
"__CAMPAIGN_EXP_WIDGET_SENTIMENT_LIST_ITEM_VAL_2": "Negative",
@@ -229,7 +229,7 @@
229229
"__CAMPAIGN_PAGE_BUTTON_DETAIL_BUG": "Go to bug list",
230230
"__CAMPAIGN_PAGE_DEVICE_AND_BUG_TYPES_SECTION_SUBTITLE": "Check all the isolated bugs organized for devices and OS plus all the bug typologies",
231231
"__CAMPAIGN_PAGE_DEVICE_AND_BUG_TYPES_SECTION_TITLE": "Devices and bug types",
232-
"__CAMPAIGN_PAGE_EXP_OVERVIEW_SECTION_SUBTITLE": "How was the overall user experience with the product",
232+
"__CAMPAIGN_PAGE_EXP_OVERVIEW_SECTION_SUBTITLE": "The overall user experience with the product",
233233
"__CAMPAIGN_PAGE_EXP_OVERVIEW_SECTION_TITLE": "Overview",
234234
"__CAMPAIGN_PAGE_GOAL_CARD_PRE_LABEL": "Campaign's goal",
235235
"__CAMPAIGN_PAGE_GOAL_CARD_TITLE": "The beginning of the test",
@@ -251,19 +251,19 @@
251251
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_COMMENT_CARD_EDITOR_CANCEL": "Cancel",
252252
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_COMMENT_CARD_EDITOR_SAVE": "Save",
253253
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_COMMENT_CARD_PLACEHOLDER": "Click on edit button to edit",
254-
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_COMMENT_CARD_PLACEHOLDER_EMPTY_TEXTAREA": "Add your notes...",
254+
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_COMMENT_CARD_PLACEHOLDER_EMPTY_TEXTAREA": "This is a space to take notes. Choose “Edit” and start writing.",
255255
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_COMMENT_CARD_TITLE": "Notes",
256-
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_SUBTITLE": "What we have discovered and understood from the user experience",
257-
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_TITLE": "Insights",
256+
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_SUBTITLE": "The major results and findings on user experience",
257+
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_TITLE": "Key points",
258258
"__CAMPAIGN_PAGE_INSIGHTS_SHOW_LESS_LABEL": "Show less",
259-
"__CAMPAIGN_PAGE_INSIGHTS_SHOW_MORE_LABEL_one": "Show more highlights <2>({{video_count}})</2>",
260-
"__CAMPAIGN_PAGE_INSIGHTS_SHOW_MORE_LABEL_other": "Show more highlights <2>({{video_count}})</2>",
259+
"__CAMPAIGN_PAGE_INSIGHTS_SHOW_MORE_LABEL_one": "View more highlights <2>({{video_count}})</2>",
260+
"__CAMPAIGN_PAGE_INSIGHTS_SHOW_MORE_LABEL_other": "View more highlights <2>({{video_count}})</2>",
261261
"__CAMPAIGN_PAGE_INSIGHTS_VIDEO_PART_NUMBER_LABEL": "Highlight {{index}} of {{video_count}}",
262262
"__CAMPAIGN_PAGE_METHODOLOGY_CARD_INVOLVED_USERS_LABEL": "INVOLVED USERS",
263263
"__CAMPAIGN_PAGE_METHODOLOGY_CARD_TEST_TYPOLOGY_LABEL": "TEST TYPOLOGY",
264264
"__CAMPAIGN_PAGE_METHODOLOGY_CARD_TITLE": "The methodology used",
265-
"__CAMPAIGN_PAGE_METHODOLOGY_SECTION_SUBTITLE": "What we wanted to find out with this test and what methodology we used to do it",
266-
"__CAMPAIGN_PAGE_METHODOLOGY_SECTION_TITLE": "About campaign",
265+
"__CAMPAIGN_PAGE_METHODOLOGY_SECTION_SUBTITLE": "The purpose of this test and the methodology we used",
266+
"__CAMPAIGN_PAGE_METHODOLOGY_SECTION_TITLE": "Campaign",
267267
"__CAMPAIGN_PAGE_METHODOLOGY_SERVICES_LINK": "Discover other services",
268268
"__CAMPAIGN_PAGE_METHODOLOGY_SHOW_LESS": "Show less",
269269
"__CAMPAIGN_PAGE_METHODOLOGY_SHOW_MORE": "Show more",
@@ -279,9 +279,9 @@
279279
"__CAMPAIGN_PAGE_NAVIGATION_BUG_ITEM_DETAILS_UNIQUE_BUGS_LABEL": "Unique bugs distribution",
280280
"__CAMPAIGN_PAGE_NAVIGATION_BUG_ITEM_OTHER_REPORTS_LABEL": "Reports & attachments",
281281
"__CAMPAIGN_PAGE_NAVIGATION_BUG_ITEM_OVERVIEW_LABEL": "Overview",
282-
"__CAMPAIGN_PAGE_NAVIGATION_MEDIA_GROUP_INSIGHTS_LABEL": "SUMMARY",
283-
"__CAMPAIGN_PAGE_NAVIGATION_MEDIA_ITEM_INSIGHTS_LABEL": "Main points",
284-
"__CAMPAIGN_PAGE_NAVIGATION_MEDIA_ITEM_METHODOLOGY_LABEL": "About campaign",
282+
"__CAMPAIGN_PAGE_NAVIGATION_MEDIA_GROUP_INSIGHTS_LABEL": "IN SUMMARY",
283+
"__CAMPAIGN_PAGE_NAVIGATION_MEDIA_ITEM_INSIGHTS_LABEL": "Key points",
284+
"__CAMPAIGN_PAGE_NAVIGATION_MEDIA_ITEM_METHODOLOGY_LABEL": "Campaign",
285285
"__CAMPAIGN_PAGE_NAVIGATION_MEDIA_ITEM_OVERVIEW_LABEL": "Overview",
286286
"__CAMPAIGN_PAGE_REPORTS_CARDS_DOWNLOAD_LABEL": "Download now",
287287
"__CAMPAIGN_PAGE_REPORTS_CARDS_OPEN_LINK_LABEL": "Open link",
@@ -300,7 +300,7 @@
300300
"__CAMPAIGN_PAGE_REPORTS_FILE_TYPE_PRESENTATION": "Slide deck",
301301
"__CAMPAIGN_PAGE_REPORTS_GENERATE_REPORT_CARD_BUTTON_LABEL": "Download",
302302
"__CAMPAIGN_PAGE_REPORTS_GENERATE_REPORT_CARD_META": "Bugs Report",
303-
"__CAMPAIGN_PAGE_REPORTS_TITLE": "Reports and attachments",
303+
"__CAMPAIGN_PAGE_REPORTS_TITLE": "Reports & attachments",
304304
"__CAMPAIGN_PAGE_UNIQUE_BUGS_SECTION_SUBTITLE": "Check all the isolated bugs organized for Use Cases and don't miss any incoming bugs",
305305
"__CAMPAIGN_PAGE_UNIQUE_BUGS_SECTION_TITLE": "Unique Bugs distribution",
306306
"__CAMPAIGN_PAGE_UNIQUE_BUGS_TITLE": "Unique bugs",
@@ -383,7 +383,7 @@
383383
"__CAMPAIGNS_TABLE_COLUMN_STATUS_PROGRESS": "Progress",
384384
"__CAMPAIGNS_TABLE_COLUMN_TEST_TYPE": "Test Type",
385385
"__CATALOG_DETAIL_STICKY_CONTAINER_ABOUT_HOW_ITEM": "How does it work",
386-
"__CATALOG_DETAIL_STICKY_CONTAINER_ABOUT_TITLE": "ABOUT THE CAMPAIGN",
386+
"__CATALOG_DETAIL_STICKY_CONTAINER_ABOUT_TITLE": "CAMPAIGN",
387387
"__CATALOG_DETAIL_STICKY_CONTAINER_ABOUT_WHAT_ITEM": "What you get",
388388
"__CATALOG_DETAIL_STICKY_CONTAINER_ABOUT_WHY_ITEM": "Why to choose this campaign",
389389
"__CATALOG_DETAIL_STICKY_CONTAINER_REQUIREMENTS_TITLE": "BEFORE STARTING",

src/locales/it/translation.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
"__CAMPAIGN_PAGE_INFO_HEADER_PLATFORM_TABLET": "Tablet",
240240
"__CAMPAIGN_PAGE_INFO_HEADER_PLATFORM_TV": "TV",
241241
"__CAMPAIGN_PAGE_INFO_HEADER_TEST_TIMING": "Durata test",
242-
"__CAMPAIGN_PAGE_INSIGHT_COMMENT_SHOW_LESS": "Leggi di più",
242+
"__CAMPAIGN_PAGE_INSIGHT_COMMENT_SHOW_LESS": "Vedi meno",
243243
"__CAMPAIGN_PAGE_INSIGHT_COMMENT_SHOW_MORE": "Mostra meno",
244244
"__CAMPAIGN_PAGE_INSIGHTS_ALL_CLUSTERS": "Generale",
245245
"__CAMPAIGN_PAGE_INSIGHTS_LIGHTBOX_DETAILS_LINKED_INSIGHT_LABEL": "Scoperta collegata",
@@ -251,7 +251,7 @@
251251
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_COMMENT_CARD_EDITOR_CANCEL": "Annulla",
252252
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_COMMENT_CARD_EDITOR_SAVE": "Salva",
253253
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_COMMENT_CARD_PLACEHOLDER": "Clicca sul bottone di modifica per editare",
254-
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_COMMENT_CARD_PLACEHOLDER_EMPTY_TEXTAREA": "Aggiungi i tuoi appunti...",
254+
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_COMMENT_CARD_PLACEHOLDER_EMPTY_TEXTAREA": "Questo è uno spazio per prendere appunti. Vai su “Modifica” per cominciare a scrivere.",
255255
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_COMMENT_CARD_TITLE": "Note",
256256
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_SUBTITLE": "Cosa abbiamo scoperto dell’esperienza utente",
257257
"__CAMPAIGN_PAGE_INSIGHTS_SECTION_TITLE": "Punti principali",
@@ -277,7 +277,7 @@
277277
"__CAMPAIGN_PAGE_NAVIGATION_BUG_GROUP_OTHER_LABEL": "NEL DETTAGLIO",
278278
"__CAMPAIGN_PAGE_NAVIGATION_BUG_ITEM_DETAILS_DEVICES_LABEL": "Dispositivi e tipologie bug",
279279
"__CAMPAIGN_PAGE_NAVIGATION_BUG_ITEM_DETAILS_UNIQUE_BUGS_LABEL": "Distribuzione bug unici",
280-
"__CAMPAIGN_PAGE_NAVIGATION_BUG_ITEM_OTHER_REPORTS_LABEL": "Report e documenti",
280+
"__CAMPAIGN_PAGE_NAVIGATION_BUG_ITEM_OTHER_REPORTS_LABEL": "Report & documenti",
281281
"__CAMPAIGN_PAGE_NAVIGATION_BUG_ITEM_OVERVIEW_LABEL": "Panoramica",
282282
"__CAMPAIGN_PAGE_NAVIGATION_MEDIA_GROUP_INSIGHTS_LABEL": "IN SINTESI",
283283
"__CAMPAIGN_PAGE_NAVIGATION_MEDIA_ITEM_INSIGHTS_LABEL": "Punti principali",
@@ -287,7 +287,7 @@
287287
"__CAMPAIGN_PAGE_REPORTS_CARDS_OPEN_LINK_LABEL": "Apri link",
288288
"__CAMPAIGN_PAGE_REPORTS_CARDS_UPDATED_ON_LABEL": "Ultima modifica",
289289
"__CAMPAIGN_PAGE_REPORTS_CARDS_UPLOADED_ON_LABEL": "Caricato il",
290-
"__CAMPAIGN_PAGE_REPORTS_DESCRIPTION": "Qui puoi trovare la documentazione completa collegata al test",
290+
"__CAMPAIGN_PAGE_REPORTS_DESCRIPTION": "Qui puoi trovare la documentazione completa del test",
291291
"__CAMPAIGN_PAGE_REPORTS_EMPTY_REPORTS_TEXT": "Qui troverai informazioni sulla tua campagna, quando sarà finita. \nSei hai dubbi o domande, contatta il tuo CSM.",
292292
"__CAMPAIGN_PAGE_REPORTS_EMPTY_REPORTS_TITLE": "Non ci sono ancora contenuti",
293293
"__CAMPAIGN_PAGE_REPORTS_FILE_TYPE_ARCHIVE": "Archivio",
@@ -300,7 +300,7 @@
300300
"__CAMPAIGN_PAGE_REPORTS_FILE_TYPE_PRESENTATION": "Presentazione",
301301
"__CAMPAIGN_PAGE_REPORTS_GENERATE_REPORT_CARD_BUTTON_LABEL": "Scarica",
302302
"__CAMPAIGN_PAGE_REPORTS_GENERATE_REPORT_CARD_META": "Report Bug",
303-
"__CAMPAIGN_PAGE_REPORTS_TITLE": "Report e documenti",
303+
"__CAMPAIGN_PAGE_REPORTS_TITLE": "Report & documenti",
304304
"__CAMPAIGN_PAGE_UNIQUE_BUGS_SECTION_SUBTITLE": "Controlla i bug unici divisi per Use Case e non perderti nessun bug in arrivo",
305305
"__CAMPAIGN_PAGE_UNIQUE_BUGS_SECTION_TITLE": "Distribuzione Bug Unici",
306306
"__CAMPAIGN_PAGE_UNIQUE_BUGS_TITLE": "Bug unici",
@@ -405,7 +405,7 @@
405405
"__CATALOG_PAGE_INFO_SERVICE_TITLE": "Non riesci a trovare quello che stavi cercando?",
406406
"__CATALOG_PAGE_TITLE": "Servizi",
407407
"__CATALOG_STICKY_CONTAINER_NAV_CATEGORIES_LABEL": "PER TIPOLOGIA",
408-
"__CATALOG_STICKY_CONTAINER_NAV_EXTERNAL_LINK_LABEL": "Scopri i servizi",
408+
"__CATALOG_STICKY_CONTAINER_NAV_EXTERNAL_LINK_LABEL": "Scopri tutti i servizi",
409409
"__DASHABOARD_CAMPAIGN_CAMPAIGN_TYPE_FILTER_LABEL Max:10": "Tipo",
410410
"__DASHABOARD_CAMPAIGN_STATUS_FILTER_ALL": "Tutte",
411411
"__DASHABOARD_CAMPAIGN_STATUS_FILTER_COMPLETED": "Completate",

src/pages/Campaign/CampaignPage.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Grid, Row } from '@appquality/unguess-design-system';
1+
import { Col, Grid, Row } from '@appquality/unguess-design-system';
22
import { useEffect } from 'react';
33
import { useLocation, useNavigate, useParams } from 'react-router-dom';
44
import { useAppDispatch } from 'src/app/hooks';
@@ -80,7 +80,9 @@ const CampaignPage = ({ children }: { children: React.ReactNode }) => {
8080
>
8181
<LayoutWrapper>
8282
<Grid>
83-
<Row>{children}</Row>
83+
<Row>
84+
<Col>{children}</Col>
85+
</Row>
8486
</Grid>
8587
</LayoutWrapper>
8688
</Page>

src/pages/Campaign/useWidgets/Experience/widgets/General/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Campaign } from 'src/features/api';
2-
import { Col, Row } from '@appquality/unguess-design-system';
2+
import { Col, Grid, Row } from '@appquality/unguess-design-system';
33
import { SectionTitle } from 'src/pages/Campaign/SectionTitle';
44
import { Divider } from 'src/common/components/divider';
55
import { appTheme } from 'src/app/theme';
@@ -32,7 +32,7 @@ export const CampaignInfo = ({
3232
const { t } = useTranslation();
3333

3434
return (
35-
<div style={{ marginBottom: appTheme.space.xxl }} id={id}>
35+
<Grid style={{ marginBottom: appTheme.space.xxl }} id={id}>
3636
<Row>
3737
<Col xs={12} style={{ margin: 0 }}>
3838
<SectionTitle
@@ -50,6 +50,6 @@ export const CampaignInfo = ({
5050
<Methodology campaignId={campaign.id} isPreview={isPreview} />
5151
</div>
5252
</StyledRow>
53-
</div>
53+
</Grid>
5454
);
5555
};

src/pages/Campaign/useWidgets/Experience/widgets/Insights/HighlightCard.tsx

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ const HighlightCard = ({
6161
videoCount,
6262
index,
6363
insight,
64+
poster,
6465
onClick,
6566
}: {
6667
video: NonNullable<
@@ -69,6 +70,7 @@ const HighlightCard = ({
6970
videoCount: number;
7071
index: number;
7172
insight: NonNullable<GetCampaignsByCidUxApiResponse['findings']>[number];
73+
poster?: string;
7274
onClick?: () => void;
7375
}) => {
7476
const { t } = useTranslation();
@@ -78,18 +80,27 @@ const HighlightCard = ({
7880
<SpecialCard.Header>
7981
<CardThumb>
8082
<VideoPlayIcon />
81-
<Player>
82-
<video src={`${video.url}#t=0.5`}>
83-
<track kind="captions" />
84-
</video>
85-
</Player>
83+
{poster && poster !== '' ? (
84+
<img src={poster} alt={video.description} />
85+
) : (
86+
<Player>
87+
<video src={`${video.url}#t=0.5`}>
88+
<track kind="captions" />
89+
</video>
90+
</Player>
91+
)}
8692
</CardThumb>
8793
<SpecialCard.Header.Label>
8894
<Trans i18nKey="__CAMPAIGN_PAGE_INSIGHTS_VIDEO_PART_NUMBER_LABEL">
8995
Highlight {{ index: index + 1 }} of {{ video_count: videoCount }}
9096
</Trans>
9197
</SpecialCard.Header.Label>
92-
<SpecialCard.Header.Title>
98+
<SpecialCard.Header.Title
99+
style={{
100+
whiteSpace: 'normal',
101+
wordBreak: 'break-word',
102+
}}
103+
>
93104
{`”${video.description}”`}
94105
</SpecialCard.Header.Title>
95106
</SpecialCard.Header>

0 commit comments

Comments
 (0)