Skip to content

Commit 272abc9

Browse files
authored
Merge pull request #43 from OS2ConTicki/feature/JOBCAMP-109-theme-filter-check
Feature/jobcamp 109 theme filter check
2 parents c4688a3 + 44919f7 commit 272abc9

7 files changed

+8
-316
lines changed

public/data/test-conference/api/theme/5931d188-5876-4015-83dc-34b393edcde2@resourceVersion@id@3A53.json

Lines changed: 0 additions & 47 deletions
This file was deleted.

public/data/test-conference/api/theme/60328f97-a9e8-4dd3-a19d-5f7680664fe7@resourceVersion@id@3A50.json

Lines changed: 0 additions & 47 deletions
This file was deleted.

public/data/test-conference/api/theme/99650617-286e-4f89-a75d-2428bc63bbeb@resourceVersion@id@3A51.json

Lines changed: 0 additions & 47 deletions
This file was deleted.

public/data/test-conference/api/theme/a13007d5-0abc-4439-bf85-f5c79b4ce0bb@resourceVersion@id@3A52.json

Lines changed: 0 additions & 47 deletions
This file was deleted.

public/data/test-conference/api/theme@filter@5Bconference.id@5D@a84ab2bb-432e-40f0-9de8-2bb709a8842d.json

Lines changed: 1 addition & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -9,128 +9,7 @@
99
}
1010
}
1111
},
12-
"data": [
13-
{
14-
"type": "theme",
15-
"id": "60328f97-a9e8-4dd3-a19d-5f7680664fe7",
16-
"links": {
17-
"self": {
18-
"href": "/data/test-conference/api/theme/60328f97-a9e8-4dd3-a19d-5f7680664fe7@resourceVersion@id@3A50.json"
19-
}
20-
},
21-
"attributes": {
22-
"title": "Natur",
23-
"created": "2020-09-14T10:37:34+00:00",
24-
"changed": "2020-09-14T10:37:34+00:00",
25-
"promote": false,
26-
"summary": null,
27-
"description": "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>\n"
28-
},
29-
"relationships": {
30-
"conference": {
31-
"data": {
32-
"type": "conference",
33-
"id": "a84ab2bb-432e-40f0-9de8-2bb709a8842d"
34-
},
35-
"links": {
36-
"related": {
37-
"href": "https://conticki.srvitkphp73stg.itkdev.dk/api/conference/a84ab2bb-432e-40f0-9de8-2bb709a8842d"
38-
}
39-
}
40-
}
41-
}
42-
},
43-
{
44-
"type": "theme",
45-
"id": "99650617-286e-4f89-a75d-2428bc63bbeb",
46-
"links": {
47-
"self": {
48-
"href": "/data/test-conference/api/theme/99650617-286e-4f89-a75d-2428bc63bbeb@resourceVersion@id@3A51.json"
49-
}
50-
},
51-
"attributes": {
52-
"title": "Erhverv",
53-
"created": "2020-09-14T10:37:57+00:00",
54-
"changed": "2020-09-14T10:37:57+00:00",
55-
"promote": false,
56-
"summary": null,
57-
"description": "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>\n"
58-
},
59-
"relationships": {
60-
"conference": {
61-
"data": {
62-
"type": "conference",
63-
"id": "a84ab2bb-432e-40f0-9de8-2bb709a8842d"
64-
},
65-
"links": {
66-
"related": {
67-
"href": "https://conticki.srvitkphp73stg.itkdev.dk/api/conference/a84ab2bb-432e-40f0-9de8-2bb709a8842d"
68-
}
69-
}
70-
}
71-
}
72-
},
73-
{
74-
"type": "theme",
75-
"id": "a13007d5-0abc-4439-bf85-f5c79b4ce0bb",
76-
"links": {
77-
"self": {
78-
"href": "/data/test-conference/api/theme/a13007d5-0abc-4439-bf85-f5c79b4ce0bb@resourceVersion@id@3A52.json"
79-
}
80-
},
81-
"attributes": {
82-
"title": "Aarhus Ø",
83-
"created": "2020-09-14T10:38:19+00:00",
84-
"changed": "2020-09-14T10:38:19+00:00",
85-
"promote": false,
86-
"summary": null,
87-
"description": "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>\n"
88-
},
89-
"relationships": {
90-
"conference": {
91-
"data": {
92-
"type": "conference",
93-
"id": "a84ab2bb-432e-40f0-9de8-2bb709a8842d"
94-
},
95-
"links": {
96-
"related": {
97-
"href": "https://conticki.srvitkphp73stg.itkdev.dk/api/conference/a84ab2bb-432e-40f0-9de8-2bb709a8842d"
98-
}
99-
}
100-
}
101-
}
102-
},
103-
{
104-
"type": "theme",
105-
"id": "5931d188-5876-4015-83dc-34b393edcde2",
106-
"links": {
107-
"self": {
108-
"href": "/data/test-conference/api/theme/5931d188-5876-4015-83dc-34b393edcde2@resourceVersion@id@3A53.json"
109-
}
110-
},
111-
"attributes": {
112-
"title": "Idræt",
113-
"created": "2020-09-14T10:38:45+00:00",
114-
"changed": "2020-09-14T10:38:45+00:00",
115-
"promote": false,
116-
"summary": null,
117-
"description": "<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>\n"
118-
},
119-
"relationships": {
120-
"conference": {
121-
"data": {
122-
"type": "conference",
123-
"id": "a84ab2bb-432e-40f0-9de8-2bb709a8842d"
124-
},
125-
"links": {
126-
"related": {
127-
"href": "https://conticki.srvitkphp73stg.itkdev.dk/api/conference/a84ab2bb-432e-40f0-9de8-2bb709a8842d"
128-
}
129-
}
130-
}
131-
}
132-
}
133-
],
12+
"data": [],
13413
"links": {
13514
"self": {
13615
"href": "/data/test-conference/api/theme@filter@5Bconference.id@5D@a84ab2bb-432e-40f0-9de8-2bb709a8842d.json"

public/dist/entry.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/program.jsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,9 @@ function Program ({ eventsList, tagsList, themesList }) {
165165
<Collapse in={open} className='bg-light border p-3 rounded-sm'>
166166
<div id='searchEvent' className='searchEvent mb-3'>
167167
<SearchBox value={searchText} onChange={handleSearch} />
168-
<div className='mb-3'>
169-
{themes && (
168+
{/* We check for lenght more than 1 since we wil allways have an "All themes" entry */}
169+
{themes && themes.length > 1 && (
170+
<div className='mb-3'>
170171
<BadgeList
171172
title={t('Themes', { n: 87 })}
172173
items={themes}
@@ -175,9 +176,9 @@ function Program ({ eventsList, tagsList, themesList }) {
175176
selectedItem={selectedTheme}
176177
onItemSelect={handleThemeSelect}
177178
/>
178-
)}
179-
</div>
180-
{tags && (
179+
</div>)}
180+
{/* We check for lenght more than 1 since we wil allways have an "All tags" entry */}
181+
{tags && tags.length > 1 && (
181182
<BadgeList
182183
title={t('Tags', { n: 87 })}
183184
items={tags}

0 commit comments

Comments
 (0)