Skip to content

Commit 0bdb5df

Browse files
authored
Merge pull request #2 from takahashim/fix-api-fetcher
2 parents 6c885e3 + 1cd8542 commit 0bdb5df

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

.github/workflows/tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979

8080
- run: tar -zcf /tmp/testapp-env.tar.gz ./spec/decidim_dummy_app
8181

82-
- uses: actions/upload-artifact@v3
82+
- uses: actions/upload-artifact@v4
8383
with:
8484
name: workspace
8585
path: /tmp/testapp-env.tar.gz
@@ -139,7 +139,7 @@ jobs:
139139
- run: |
140140
sudo apt install wkhtmltopdf imagemagick 7zip
141141
142-
- uses: actions/download-artifact@v3
142+
- uses: actions/download-artifact@v4
143143
with:
144144
name: workspace
145145
path: /tmp
@@ -165,8 +165,8 @@ jobs:
165165
- name: Upload coverage reports to Codecov
166166
uses: codecov/codecov-action@v3
167167

168-
- uses: actions/upload-artifact@v3
169-
if: always()
168+
- uses: actions/upload-artifact@v4
169+
if: false
170170
with:
171171
name: screenshots
172172
path: ./spec/decidim_dummy_app/tmp/screenshots

app/packs/src/decidim/decidim_awesome/awesome_map/api/fetcher.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ export default class Fetcher {
2929
const api = new ApiFetcher(this.query, variables);
3030
api.fetchAll((result) => {
3131
if (result) {
32+
if (!result.component) {
33+
this.onFinished();
34+
return;
35+
}
3236
const collection = result.component[this.collection];
3337
// console.log("collection", collection)
3438

spec/system/public/user_uses_custom_time_zones_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
it "allows to change the time zone" do
2727
within ".card__list-metadata" do
28-
expect(page).to have_content("04:00 AM -01")
28+
expect(page).to have_content("05:00 AM +00")
2929
end
3030
visit decidim.account_path
3131
expect(page).to have_select("user_user_time_zone", selected: "(GMT-01:00) Azores")
@@ -49,7 +49,7 @@
4949

5050
it "does not allow to change the time zone" do
5151
within ".card__list-metadata" do
52-
expect(page).to have_content("04:00 AM -01")
52+
expect(page).to have_content("05:00 AM +00")
5353
end
5454
visit decidim.account_path
5555
expect(page).not_to have_select("user_user_time_zone")

0 commit comments

Comments
 (0)