1
0
mirror of https://github.com/dwaxweiler/connector-mobilizon synced 2025-06-05 21:59:25 +02:00

add prettier

This commit is contained in:
Daniel Waxweiler 2021-12-09 19:46:19 +01:00
parent b0f4ea8d7a
commit 35e29cf793
23 changed files with 251 additions and 141 deletions

View File

@ -14,10 +14,6 @@
"plugins": [ "plugins": [
"ava" "ava"
], ],
"ignorePatterns": [
"gulpfile.js",
"webpack.config.js"
],
"rules": { "rules": {
"indent": [ "indent": [
"error", "error",

View File

@ -9,7 +9,7 @@
# the `language` matrix defined below to confirm you have the correct set of # the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages. # supported CodeQL languages.
# #
name: "CodeQL" name: 'CodeQL'
on: on:
push: push:

View File

@ -11,7 +11,6 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:

8
.prettierignore Normal file
View File

@ -0,0 +1,8 @@
.idea
build
coverage
node_modules
vendor
.eslintrc.json
composer.lock
LICENSE.md

4
.prettierrc.json Normal file
View File

@ -0,0 +1,4 @@
{
"semi": false,
"singleQuote": true
}

View File

@ -7,15 +7,18 @@ More details can be found in the [WordPress Plugin Directory](https://wordpress.
## Development ## Development
### Setup ### Setup
1. Make sure `npm` and `composer` are installed. 1. Make sure `npm` and `composer` are installed.
2. Run: `npm install` 2. Run: `npm install`
3. Run: `composer install` 3. Run: `composer install`
### Development build ### Development build
1. Build: `npm run build-dev` 1. Build: `npm run build-dev`
2. Make sure to keep `changelog.txt` up-to-date. 2. Make sure to keep `changelog.txt` up-to-date.
### Release procedure ### Release procedure
1. Make sure `changelog.txt` is up-to-date. Use a new version number and copy over the new section into `readme.txt`. 1. Make sure `changelog.txt` is up-to-date. Use a new version number and copy over the new section into `readme.txt`.
2. Update `package.json` with the same version number. 2. Update `package.json` with the same version number.
3. Update the `package-lock.json`: `npm i --package-lock-only` 3. Update the `package-lock.json`: `npm i --package-lock-only`
@ -31,9 +34,11 @@ More details can be found in the [WordPress Plugin Directory](https://wordpress.
13. Push the new tag to the repository: `git push --tags` 13. Push the new tag to the repository: `git push --tags`
### Other commands ### Other commands
- Run ESLint: `npm run eslint` - Run ESLint: `npm run eslint`
- Run JavaScript code coverage with tests: `npm run coverage` - Run JavaScript code coverage with tests: `npm run coverage`
- Run tests: `npm test` - Run tests: `npm test`
- Delete build folder: `npm run clean` - Delete build folder: `npm run clean`
- Update PHP dependencies: `composer update` - Update PHP dependencies: `composer update`
- Check for direct PHP dependency updates: `composer outdated --direct` - Check for direct PHP dependency updates: `composer outdated --direct`
- Format code with prettier: `npm run format`

View File

@ -1,30 +1,49 @@
const { dest, src } = require('gulp'); /* eslint-disable no-undef */
const { dest, src } = require('gulp')
const replace = require('gulp-replace'); const replace = require('gulp-replace')
const PACKAGE = require('./package.json'); const PACKAGE = require('./package.json')
const FOLDER_BUILD = './build'; const FOLDER_BUILD = './build'
function injectMetadata() { function injectMetadata() {
return src([ return src(
[
FOLDER_BUILD + '/' + PACKAGE.name + '/front/events-loader.js', FOLDER_BUILD + '/' + PACKAGE.name + '/front/events-loader.js',
FOLDER_BUILD + '/' + PACKAGE.name + '/' + PACKAGE.name + '.php', FOLDER_BUILD + '/' + PACKAGE.name + '/' + PACKAGE.name + '.php',
FOLDER_BUILD + '/' + PACKAGE.name + '/includes/constants.php', FOLDER_BUILD + '/' + PACKAGE.name + '/includes/constants.php',
FOLDER_BUILD + '/' + PACKAGE.name + '/readme.txt' FOLDER_BUILD + '/' + PACKAGE.name + '/readme.txt',
], { base: './' }) ],
{ base: './' }
)
.pipe(replace('<wordpress-author-name>', PACKAGE.author.name)) .pipe(replace('<wordpress-author-name>', PACKAGE.author.name))
.pipe(replace('<wordpress-author-url>', PACKAGE.author.url)) .pipe(replace('<wordpress-author-url>', PACKAGE.author.url))
.pipe(replace('<wordpress-description>', PACKAGE.description)) .pipe(replace('<wordpress-description>', PACKAGE.description))
.pipe(replace('<wordpress-donation-link>', PACKAGE.funding.url)) .pipe(replace('<wordpress-donation-link>', PACKAGE.funding.url))
.pipe(replace('<wordpress-license>', PACKAGE.license)) .pipe(replace('<wordpress-license>', PACKAGE.license))
.pipe(replace('<wordpress-minimum-version>', PACKAGE.additionalDetails.wordpressMinimumVersion)) .pipe(
replace(
'<wordpress-minimum-version>',
PACKAGE.additionalDetails.wordpressMinimumVersion
)
)
.pipe(replace('<wordpress-name>', PACKAGE.name)) .pipe(replace('<wordpress-name>', PACKAGE.name))
.pipe(replace('<wordpress-nice-name>', PACKAGE.additionalDetails.niceName)) .pipe(replace('<wordpress-nice-name>', PACKAGE.additionalDetails.niceName))
.pipe(replace('<wordpress-php-minimum-version>', PACKAGE.additionalDetails.phpMinimumVersion)) .pipe(
.pipe(replace('<wordpress-tested-up-to-version>', PACKAGE.additionalDetails.wordpressTestedUpToVersion)) replace(
'<wordpress-php-minimum-version>',
PACKAGE.additionalDetails.phpMinimumVersion
)
)
.pipe(
replace(
'<wordpress-tested-up-to-version>',
PACKAGE.additionalDetails.wordpressTestedUpToVersion
)
)
.pipe(replace('<wordpress-version>', PACKAGE.version)) .pipe(replace('<wordpress-version>', PACKAGE.version))
.pipe(dest('.')); .pipe(dest('.'))
} }
exports.inject = injectMetadata; exports.inject = injectMetadata

19
package-lock.json generated
View File

@ -25,6 +25,7 @@
"gulp-replace": "^1.1.3", "gulp-replace": "^1.1.3",
"husky": "^7.0.4", "husky": "^7.0.4",
"jsdom": "^19.0.0", "jsdom": "^19.0.0",
"prettier": "2.5.1",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"webpack": "^5.65.0", "webpack": "^5.65.0",
"webpack-cli": "^4.9.1" "webpack-cli": "^4.9.1"
@ -7213,6 +7214,18 @@
"node": ">=4" "node": ">=4"
} }
}, },
"node_modules/prettier": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
"integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
"dev": true,
"bin": {
"prettier": "bin-prettier.js"
},
"engines": {
"node": ">=10.13.0"
}
},
"node_modules/pretty-hrtime": { "node_modules/pretty-hrtime": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
@ -15403,6 +15416,12 @@
"integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=",
"dev": true "dev": true
}, },
"prettier": {
"version": "2.5.1",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
"integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
"dev": true
},
"pretty-hrtime": { "pretty-hrtime": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",

View File

@ -9,6 +9,7 @@
"clean": "rimraf -- build", "clean": "rimraf -- build",
"coverage": "c8 --all --reporter=html --reporter=text --include=source/**/*.js ava", "coverage": "c8 --all --reporter=html --reporter=text --include=source/**/*.js ava",
"eslint": "npx eslint source/**/*.js", "eslint": "npx eslint source/**/*.js",
"format": "npx prettier --write .",
"prepare": "husky install", "prepare": "husky install",
"test": "ava" "test": "ava"
}, },
@ -38,6 +39,7 @@
"gulp-replace": "^1.1.3", "gulp-replace": "^1.1.3",
"husky": "^7.0.4", "husky": "^7.0.4",
"jsdom": "^19.0.0", "jsdom": "^19.0.0",
"prettier": "2.5.1",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"webpack": "^5.65.0", "webpack": "^5.65.0",
"webpack-cli": "^4.9.1" "webpack-cli": "^4.9.1"

View File

@ -1,6 +1,7 @@
### [Unreleased] ### [Unreleased]
#### Added #### Added
- Add specific error message for the case the group is not found - Add specific error message for the case the group is not found
- Add code formatter prettier
#### Changed #### Changed
- Set minimum PHP version to oldest officially supported 7.4 - Set minimum PHP version to oldest officially supported 7.4
- Update dependencies - Update dependencies

View File

@ -1,67 +1,76 @@
import test from 'ava' import test from 'ava'
import DateTimeWrapper from './date-time-wrapper' import DateTimeWrapper from './date-time-wrapper'
test('#getShortDate usual date', t => { test('#getShortDate usual date', (t) => {
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' }) const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
t.is(d.getShortDate(), '24/12/2020') t.is(d.getShortDate(), '24/12/2020')
}) })
test('#getShortDate usual date with timezone string', t => { test('#getShortDate usual date with timezone string', (t) => {
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z', timeZone: 'Europe/Rome' }) const d = new DateTimeWrapper({
text: '2020-12-24T16:45:00Z',
timeZone: 'Europe/Rome',
})
t.is(d.getShortDate(), '24/12/2020') t.is(d.getShortDate(), '24/12/2020')
}) })
test('#getShortDate usual date with fixed offset', t => { test('#getShortDate usual date with fixed offset', (t) => {
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z', timeZone: 'UTC+02:00' }) const d = new DateTimeWrapper({
text: '2020-12-24T16:45:00Z',
timeZone: 'UTC+02:00',
})
t.is(d.getShortDate(), '24/12/2020') t.is(d.getShortDate(), '24/12/2020')
}) })
test('#getShortDate usual date with fixed offset without UTC prefix', t => { test('#getShortDate usual date with fixed offset without UTC prefix', (t) => {
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z', timeZone: '+02:00' }) const d = new DateTimeWrapper({
text: '2020-12-24T16:45:00Z',
timeZone: '+02:00',
})
t.is(d.getShortDate(), '24/12/2020') t.is(d.getShortDate(), '24/12/2020')
}) })
test('#getShortDate usual date with empty time zone', t => { test('#getShortDate usual date with empty time zone', (t) => {
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z', timeZone: '' }) const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z', timeZone: '' })
t.is(d.getShortDate(), '24/12/2020') t.is(d.getShortDate(), '24/12/2020')
}) })
test('#get24Time usual time', t => { test('#get24Time usual time', (t) => {
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' }) const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
t.is(d.get24Time(), '16:45') t.is(d.get24Time(), '16:45')
}) })
test('#equalsDate same date, different time', t => { test('#equalsDate same date, different time', (t) => {
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' }) const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
const e = new DateTimeWrapper({ text: '2020-12-24T17:46:01Z' }) const e = new DateTimeWrapper({ text: '2020-12-24T17:46:01Z' })
t.true(d.equalsDate(e)) t.true(d.equalsDate(e))
}) })
test('#equalsDate different date, different time', t => { test('#equalsDate different date, different time', (t) => {
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' }) const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
const e = new DateTimeWrapper({ text: '2021-11-25T17:46:01Z' }) const e = new DateTimeWrapper({ text: '2021-11-25T17:46:01Z' })
t.false(d.equalsDate(e)) t.false(d.equalsDate(e))
}) })
test('#equalsDate different day, different time', t => { test('#equalsDate different day, different time', (t) => {
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' }) const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
const e = new DateTimeWrapper({ text: '2020-12-25T17:46:01Z' }) const e = new DateTimeWrapper({ text: '2020-12-25T17:46:01Z' })
t.false(d.equalsDate(e)) t.false(d.equalsDate(e))
}) })
test('#equalsDate different month, different time', t => { test('#equalsDate different month, different time', (t) => {
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' }) const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
const e = new DateTimeWrapper({ text: '2020-11-24T17:46:01Z' }) const e = new DateTimeWrapper({ text: '2020-11-24T17:46:01Z' })
t.false(d.equalsDate(e)) t.false(d.equalsDate(e))
}) })
test('#equalsDate different year, different time', t => { test('#equalsDate different year, different time', (t) => {
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' }) const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
const e = new DateTimeWrapper({ text: '2021-12-24T17:46:01Z' }) const e = new DateTimeWrapper({ text: '2021-12-24T17:46:01Z' })
t.false(d.equalsDate(e)) t.false(d.equalsDate(e))
}) })
test('#getCurrentDatetimeAsString correct format', t => { test('#getCurrentDatetimeAsString correct format', (t) => {
const d = DateTimeWrapper.getCurrentDatetimeAsString() const d = DateTimeWrapper.getCurrentDatetimeAsString()
t.is(d[4], '-') t.is(d[4], '-')
t.is(d[7], '-') t.is(d[7], '-')
@ -72,7 +81,7 @@ test('#getCurrentDatetimeAsString correct format', t => {
t.is(d[d.length - 3], ':') t.is(d[d.length - 3], ':')
}) })
test('#getShortOffsetName usual time', t => { test('#getShortOffsetName usual time', (t) => {
const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' }) const d = new DateTimeWrapper({ text: '2020-12-24T16:45:00Z' })
t.is(d.getShortOffsetName(), 'UTC') t.is(d.getShortOffsetName(), 'UTC')
}) })

View File

@ -1,12 +1,14 @@
import { DateTime } from 'luxon' import { DateTime } from 'luxon'
export default class DateTimeWrapper { export default class DateTimeWrapper {
constructor({ locale = 'en-GB', text, timeZone = 'utc' } = {}) { constructor({ locale = 'en-GB', text, timeZone = 'utc' } = {}) {
if (!timeZone) { if (!timeZone) {
timeZone = 'utc' timeZone = 'utc'
} }
if (timeZone.includes(':') && timeZone.substring(0, 3).toUpperCase() !== 'UTC') { if (
timeZone.includes(':') &&
timeZone.substring(0, 3).toUpperCase() !== 'UTC'
) {
timeZone = 'UTC' + timeZone timeZone = 'UTC' + timeZone
} }
this.dateTime = DateTime.fromISO(text, { locale, zone: timeZone }) this.dateTime = DateTime.fromISO(text, { locale, zone: timeZone })
@ -25,11 +27,13 @@ export default class DateTimeWrapper {
} }
equalsDate(other) { equalsDate(other) {
return this.dateTime && return (
this.dateTime &&
other.dateTime && other.dateTime &&
this.dateTime.day === other.dateTime.day && this.dateTime.day === other.dateTime.day &&
this.dateTime.month === other.dateTime.month && this.dateTime.month === other.dateTime.month &&
this.dateTime.year === other.dateTime.year this.dateTime.year === other.dateTime.year
)
} }
static getCurrentDatetimeAsString() { static getCurrentDatetimeAsString() {

View File

@ -9,7 +9,7 @@ test.before(() => {
document = new JSDOM().window.document document = new JSDOM().window.document
}) })
test.beforeEach(t => { test.beforeEach((t) => {
t.context.list = document.createElement('ul') t.context.list = document.createElement('ul')
t.context.list.setAttribute('data-locale', 'en-GB') t.context.list.setAttribute('data-locale', 'en-GB')
t.context.list.setAttribute('data-maximum', '2') t.context.list.setAttribute('data-maximum', '2')
@ -22,7 +22,7 @@ test.beforeEach(t => {
t.context.list.appendChild(listElement2) t.context.list.appendChild(listElement2)
}) })
test('#displayEvents one event', t => { test('#displayEvents one event', (t) => {
const list = t.context.list const list = t.context.list
const data = { const data = {
events: { events: {
@ -34,11 +34,11 @@ test('#displayEvents one event', t => {
endsOn: '2021-04-15T15:30:00Z', endsOn: '2021-04-15T15:30:00Z',
physicalAddress: { physicalAddress: {
description: 'c', description: 'c',
locality: 'd' locality: 'd',
} },
} },
] ],
} },
} }
displayEvents({ data, document, list }) displayEvents({ data, document, list })
t.is(list.children.length, 3) t.is(list.children.length, 3)
@ -51,29 +51,29 @@ test('#displayEvents one event', t => {
t.is(list.children[2].childNodes[4].nodeValue, 'c, d') t.is(list.children[2].childNodes[4].nodeValue, 'c, d')
}) })
test('#displayErrorMessage no children added', t => { test('#displayErrorMessage no children added', (t) => {
const list = t.context.list const list = t.context.list
displayErrorMessage({ data: '', list }) displayErrorMessage({ data: '', list })
t.is(list.children.length, 2) t.is(list.children.length, 2)
}) })
test('#displayErrorMessage error message display', t => { test('#displayErrorMessage error message display', (t) => {
const list = t.context.list const list = t.context.list
displayErrorMessage({ data: '', list }) displayErrorMessage({ data: '', list })
t.is(list.children[0].style.display, 'block') t.is(list.children[0].style.display, 'block')
t.is(list.children[1].style.display, 'none') t.is(list.children[1].style.display, 'none')
}) })
test('#displayErrorMessage group not found error message display', t => { test('#displayErrorMessage group not found error message display', (t) => {
const list = t.context.list const list = t.context.list
const data = { const data = {
response: { response: {
errors: [ errors: [
{ {
code: 'group_not_found' code: 'group_not_found',
} },
] ],
} },
} }
displayErrorMessage({ data, list }) displayErrorMessage({ data, list })
t.is(list.children[0].style.display, 'none') t.is(list.children[0].style.display, 'none')

View File

@ -5,13 +5,21 @@ export function displayEvents({ data, document, list }) {
const locale = list.getAttribute('data-locale') const locale = list.getAttribute('data-locale')
const maxEventsCount = list.getAttribute('data-maximum') const maxEventsCount = list.getAttribute('data-maximum')
const timeZone = list.getAttribute('data-time-zone') const timeZone = list.getAttribute('data-time-zone')
const isShortOffsetNameShown = list.hasAttribute('data-is-short-offset-name-shown') const isShortOffsetNameShown = list.hasAttribute(
const events = data.events ? data.events.elements : data.group.organizedEvents.elements 'data-is-short-offset-name-shown'
)
const events = data.events
? data.events.elements
: data.group.organizedEvents.elements
const eventsCount = Math.min(maxEventsCount, events.length) const eventsCount = Math.min(maxEventsCount, events.length)
for (let i = 0; i < eventsCount; i++) { for (let i = 0; i < eventsCount; i++) {
const li = document.createElement('li') const li = document.createElement('li')
const a = createAnchorElement({ document, text: events[i].title, url: events[i].url }) const a = createAnchorElement({
document,
text: events[i].title,
url: events[i].url,
})
li.appendChild(a) li.appendChild(a)
const br = document.createElement('br') const br = document.createElement('br')
@ -30,7 +38,7 @@ export function displayEvents({ data, document, list }) {
if (events[i].physicalAddress) { if (events[i].physicalAddress) {
const location = Formatter.formatLocation({ const location = Formatter.formatLocation({
description: events[i].physicalAddress.description, description: events[i].physicalAddress.description,
locality: events[i].physicalAddress.locality locality: events[i].physicalAddress.locality,
}) })
if (location) { if (location) {
const brBeforeLocation = document.createElement('br') const brBeforeLocation = document.createElement('br')
@ -47,11 +55,13 @@ export function displayEvents({ data, document, list }) {
export function displayErrorMessage({ data, list }) { export function displayErrorMessage({ data, list }) {
console.error(data) console.error(data)
if (Object.prototype.hasOwnProperty.call(data, 'response') && if (
Object.prototype.hasOwnProperty.call(data, 'response') &&
Object.prototype.hasOwnProperty.call(data.response, 'errors') && Object.prototype.hasOwnProperty.call(data.response, 'errors') &&
data.response.errors.length > 0 && data.response.errors.length > 0 &&
Object.prototype.hasOwnProperty.call(data.response.errors[0], 'code') && Object.prototype.hasOwnProperty.call(data.response.errors[0], 'code') &&
data.response.errors[0].code === 'group_not_found') { data.response.errors[0].code === 'group_not_found'
) {
list.children[1].style.display = 'block' list.children[1].style.display = 'block'
} else { } else {
list.children[0].style.display = 'block' list.children[0].style.display = 'block'

View File

@ -1,37 +1,51 @@
import test from 'ava' import test from 'ava'
import Formatter from './formatter' import Formatter from './formatter'
test('#formatDate one date', t => { test('#formatDate one date', (t) => {
const date = Formatter.formatDate({ start: '2021-04-15T10:30:00Z', end: '2021-04-15T15:30:00Z' }) const date = Formatter.formatDate({
start: '2021-04-15T10:30:00Z',
end: '2021-04-15T15:30:00Z',
})
t.is(date, '15/04/2021 10:30 - 15:30') t.is(date, '15/04/2021 10:30 - 15:30')
}) })
test('#formatDate one date with short offset name', t => { test('#formatDate one date with short offset name', (t) => {
const date = Formatter.formatDate({ start: '2021-04-15T10:30:00Z', end: '2021-04-15T15:30:00Z', isShortOffsetNameShown: true }) const date = Formatter.formatDate({
start: '2021-04-15T10:30:00Z',
end: '2021-04-15T15:30:00Z',
isShortOffsetNameShown: true,
})
t.is(date, '15/04/2021 10:30 - 15:30 (UTC)') t.is(date, '15/04/2021 10:30 - 15:30 (UTC)')
}) })
test('#formatDate two dates', t => { test('#formatDate two dates', (t) => {
const date = Formatter.formatDate({ start: '2021-04-15T10:30:00Z', end: '2021-04-16T15:30:00Z' }) const date = Formatter.formatDate({
start: '2021-04-15T10:30:00Z',
end: '2021-04-16T15:30:00Z',
})
t.is(date, '15/04/2021 10:30 - 16/04/2021 15:30') t.is(date, '15/04/2021 10:30 - 16/04/2021 15:30')
}) })
test('#formatDate two dates with short offset name', t => { test('#formatDate two dates with short offset name', (t) => {
const date = Formatter.formatDate({ start: '2021-04-15T10:30:00Z', end: '2021-04-16T15:30:00Z', isShortOffsetNameShown: true }) const date = Formatter.formatDate({
start: '2021-04-15T10:30:00Z',
end: '2021-04-16T15:30:00Z',
isShortOffsetNameShown: true,
})
t.is(date, '15/04/2021 10:30 (UTC) - 16/04/2021 15:30 (UTC)') t.is(date, '15/04/2021 10:30 (UTC) - 16/04/2021 15:30 (UTC)')
}) })
test('#formatLocation both parameters', t => { test('#formatLocation both parameters', (t) => {
const date = Formatter.formatLocation({ description: 'a', locality: 'b' }) const date = Formatter.formatLocation({ description: 'a', locality: 'b' })
t.is(date, 'a, b') t.is(date, 'a, b')
}) })
test('#formatLocation description only', t => { test('#formatLocation description only', (t) => {
const date = Formatter.formatLocation({ description: 'a' }) const date = Formatter.formatLocation({ description: 'a' })
t.is(date, 'a') t.is(date, 'a')
}) })
test('#formatLocation locality only', t => { test('#formatLocation locality only', (t) => {
const date = Formatter.formatLocation({ locality: 'a' }) const date = Formatter.formatLocation({ locality: 'a' })
t.is(date, 'a') t.is(date, 'a')
}) })

View File

@ -1,9 +1,12 @@
import DateTimeWrapper from './date-time-wrapper' import DateTimeWrapper from './date-time-wrapper'
export default class Formatter { export default class Formatter {
static formatDate({ locale, timeZone, start, end, isShortOffsetNameShown }) { static formatDate({ locale, timeZone, start, end, isShortOffsetNameShown }) {
const startDateTime = new DateTimeWrapper({ locale, text: start, timeZone }) const startDateTime = new DateTimeWrapper({
locale,
text: start,
timeZone,
})
const endDateTime = new DateTimeWrapper({ locale, text: end, timeZone }) const endDateTime = new DateTimeWrapper({ locale, text: end, timeZone })
let dateText = startDateTime.getShortDate() let dateText = startDateTime.getShortDate()
dateText += ' ' + startDateTime.get24Time() dateText += ' ' + startDateTime.get24Time()

View File

@ -21,11 +21,15 @@ export function getUpcomingEvents({ url, limit }) {
} }
} }
` `
const dataInCache = SessionCache.get(sessionStorage, { url, query, variables: { limit }}) const dataInCache = SessionCache.get(sessionStorage, {
if (dataInCache !== null) url,
query,
variables: { limit },
})
if (dataInCache !== null) {
return Promise.resolve(dataInCache) return Promise.resolve(dataInCache)
return request(url, query, { limit }) }
.then((data) => { return request(url, query, { limit }).then((data) => {
SessionCache.add(sessionStorage, { url, query, variables: { limit } }, data) SessionCache.add(sessionStorage, { url, query, variables: { limit } }, data)
return Promise.resolve(data) return Promise.resolve(data)
}) })
@ -53,12 +57,22 @@ export function getUpcomingEventsByGroupName({ url, limit, groupName }) {
} }
` `
const afterDatetime = DateTimeWrapper.getCurrentDatetimeAsString() const afterDatetime = DateTimeWrapper.getCurrentDatetimeAsString()
const dataInCache = SessionCache.get(sessionStorage, { url, query, variables: { afterDatetime, groupName, limit }}) const dataInCache = SessionCache.get(sessionStorage, {
if (dataInCache !== null) url,
return Promise.resolve(dataInCache) query,
return request(url, query, { afterDatetime, groupName, limit }) variables: { afterDatetime, groupName, limit },
.then((data) => {
SessionCache.add(sessionStorage, { url, query, variables: { afterDatetime, groupName, limit }}, data)
return Promise.resolve(data)
}) })
if (dataInCache !== null) {
return Promise.resolve(dataInCache)
}
return request(url, query, { afterDatetime, groupName, limit }).then(
(data) => {
SessionCache.add(
sessionStorage,
{ url, query, variables: { afterDatetime, groupName, limit } },
data
)
return Promise.resolve(data)
}
)
} }

View File

@ -9,7 +9,7 @@ test.beforeEach(() => {
document = new JSDOM().window.document document = new JSDOM().window.document
}) })
test('#createAnchorElement usual parameters', t => { test('#createAnchorElement usual parameters', (t) => {
const a = createAnchorElement({ document, text: 'a', url: 'b' }) const a = createAnchorElement({ document, text: 'a', url: 'b' })
t.is(a.tagName, 'A') t.is(a.tagName, 'A')
t.is(a.innerHTML, 'a') t.is(a.innerHTML, 'a')

View File

@ -1,6 +1,6 @@
import test from 'ava' import test from 'ava'
import hash from './object-hash-wrapper' import hash from './object-hash-wrapper'
test('#hash object', t => { test('#hash object', (t) => {
t.is(hash({ foo: 'bar' }), 'a75c05bdca7d704bdfcd761913e5a4e4636e956b') t.is(hash({ foo: 'bar' }), 'a75c05bdca7d704bdfcd761913e5a4e4636e956b')
}) })

View File

@ -2,7 +2,6 @@ import test from 'ava'
import SessionCache from './session-cache' import SessionCache from './session-cache'
const fakeStorage = { const fakeStorage = {
elements: {}, elements: {},
clear() { clear() {
@ -17,18 +16,18 @@ const fakeStorage = {
setItem(key, value) { setItem(key, value) {
this.elements[key] = value this.elements[key] = value
} },
} }
test.afterEach(() => { test.afterEach(() => {
fakeStorage.clear() fakeStorage.clear()
}) })
test('#add & #get', t => { test('#add & #get', (t) => {
SessionCache.add(fakeStorage, { a: 'b' }, { c: 'd' }) SessionCache.add(fakeStorage, { a: 'b' }, { c: 'd' })
t.deepEqual(SessionCache.get(fakeStorage, { a: 'b' }), { c: 'd' }) t.deepEqual(SessionCache.get(fakeStorage, { a: 'b' }), { c: 'd' })
}) })
test('#get no entry', t => { test('#get no entry', (t) => {
t.is(SessionCache.get(fakeStorage, { a: 'bb' }), null) t.is(SessionCache.get(fakeStorage, { a: 'bb' }), null)
}) })

View File

@ -3,7 +3,6 @@ import hash from './object-hash-wrapper'
const MAX_AGE_IN_MS = 120000 const MAX_AGE_IN_MS = 120000
export default class SessionCache { export default class SessionCache {
static add(storage, parameters, data) { static add(storage, parameters, data) {
const key = hash(parameters) const key = hash(parameters)
const timestamp = Date.now() const timestamp = Date.now()
@ -17,7 +16,11 @@ export default class SessionCache {
static get(storage, parameters) { static get(storage, parameters) {
const key = hash(parameters) const key = hash(parameters)
const value = JSON.parse(storage.getItem(key)) const value = JSON.parse(storage.getItem(key))
if (value && value.timestamp && value.timestamp > Date.now() - MAX_AGE_IN_MS) if (
value &&
value.timestamp &&
value.timestamp > Date.now() - MAX_AGE_IN_MS
)
return value.data return value.data
return null return null
} }

View File

@ -1,10 +1,11 @@
const path = require('path'); /* eslint-disable no-undef */
const path = require('path')
const CopyPlugin = require('copy-webpack-plugin'); const CopyPlugin = require('copy-webpack-plugin')
const PACKAGE = require('./package.json'); const PACKAGE = require('./package.json')
const FOLDER_SOURCE = './source'; const FOLDER_SOURCE = './source'
module.exports = { module.exports = {
entry: FOLDER_SOURCE + '/' + PACKAGE.name + '/front/events-loader.js', entry: FOLDER_SOURCE + '/' + PACKAGE.name + '/front/events-loader.js',
@ -28,4 +29,4 @@ module.exports = {
], ],
}), }),
], ],
}; }