Commit 2b98c8cd authored by Anton's avatar Anton

Update from release_2_2

parents ea925350 c3d0e408
Pipeline #69249 passed with stage
in 3 minutes and 14 seconds
......@@ -10,7 +10,25 @@ and this project adheres to
## [Unreleased]
No changes.
### Added
- Build time environment variable `UI_COLOR_HASH_SHADE` (default: '100')
- Build time environment variable `UI_HIDE_GROUPS` (default: false)
- Build time environment variable `USE_GENERIC_ANNOTATION` (default: false)
### Changed
- Router does not execute checkSession on `users.callback` route
- Default route for `/piecemaker` redirects conditionally based
on `USE_GENERIC_ANNOTATION`
- Navigation honors `USE_GENERIC_ANNOTATION` build var
### Fixed
- Redundant grouping in `SwimLane` component when annotation types are undefined
- Annotation sort order on `piecemaker.media.annotate_generic` screen
- `piecemaker.media.annotate_generic` screen shows component display options
## [2.2.0] - 2020-06-22
......
{
"name": "systems-frontend",
"version": "2.2.0",
"version": "2.2.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
......
{
"name": "systems-frontend",
"version": "2.2.0",
"version": "2.2.1",
"description": "Combined frontend project for Motion Bank web services",
"productName": "Motion Bank Systems Frontend",
"cordovaId": "org.motionbank.frontend",
......
......@@ -139,6 +139,7 @@ module.exports = function (ctx) {
APP_VERSION: JSON.stringify(getVersion()),
BUILD_TIME: JSON.stringify(Date.now()),
USE_RESOURCE_CACHE: JSON.stringify(process.env.USE_RESOURCE_CACHE || false),
USE_GENERIC_ANNOTATION: JSON.stringify(process.env.USE_GENERIC_ANNOTATION || false),
UI_VERSION: JSON.stringify(process.env.UI_VERSION || require('./package.json').version),
FLUENTFFMPEG_COV: JSON.stringify(false),
//
......@@ -155,8 +156,10 @@ module.exports = function (ctx) {
USE_TAGS: JSON.stringify(process.env.USE_TAGS || true),
USE_METADATA: JSON.stringify(process.env.USE_TAGS || true),
USE_CUSTOM_MEDIA_STORE: JSON.stringify(process.env.USE_CUSTOM_MEDIA_STORE || false),
UI_COLOR_HASH_SHADE: JSON.stringify(process.env.UI_COLOR_HASH_SHADE || '100'),
UI_HIDE_MOSYS: JSON.stringify(process.env.UI_HIDE_MOSYS || false),
UI_HIDE_DOCUMENTS: JSON.stringify(process.env.UI_HIDE_DOCUMENTS || false),
UI_HIDE_GROUPS: JSON.stringify(process.env.UI_HIDE_GROUPS || false),
MODULE_PROVIDER: JSON.stringify(process.env.MODULE_PROVIDER || null)
}
},
......
......@@ -328,8 +328,7 @@
return sum
}, [])
for (let group of groups) {
filtered[group] = this.annotations.filter(annotation => annotation.body.type === group ||
annotation.body.source.type === group)
filtered[group] = this.annotations.filter(annotation => (annotation.body.type || annotation.body.source.type) === group)
}
}
else if (this.groupAnnotationsBy === 'creator') {
......
Subproject commit 379ed2b44384f666567f8d101079201cb40d2a0f
Subproject commit 2ad1d1328d6418dd2bf664ee04030bdb82fa30db
......@@ -6,7 +6,7 @@ const getAnnotationColor = annotation => {
let type = annotation.body.source ? annotation.body.source.type : undefined
type = type || annotation.body.type
type = type && type.indexOf('#') > -1 ? type.split('#').pop() : type
return toMaterialStyle(type || 'SpecificResource', '100')
return toMaterialStyle(type || 'SpecificResource', process.env.UI_COLOR_HASH_SHADE)
}
export {
......
......@@ -321,7 +321,8 @@
try {
// this.annotations = await this.$store.dispatch('queue/enqueue',
// this.$store.dispatch('annotations/find', this.media.body.source.id))
this.annotations = await this.$store.dispatch('annotations/find', this.media.body.source.id)
this.annotations = (await this.$store.dispatch('annotations/find', this.media.body.source.id))
.sort(this.$sort.onRef)
}
catch (err) {
this.$handleError(this, err, 'errors.list_annotations_failed')
......
......@@ -30,6 +30,7 @@ Router.beforeEach((to, from, next) => {
else cb()
}
waitForStore(Router.app, () => {
if (to.name === 'users.callback') return next()
const redirectPath = Router.app.$store.state.auth.redirectTo
if (redirectPath) Router.app.$store.commit('auth/clearRedirect')
Router.app.$auth.checkSession(Router.app.$store).catch(() => {
......
......@@ -4,7 +4,10 @@ export default {
children: [
{
path: '/piecemaker',
redirect: {name: 'piecemaker.media.list_generic'}
name: 'piecemaker.default',
redirect: {
name: process.env.USE_GENERIC_ANNOTATION ? 'piecemaker.media.list_generic' : 'piecemaker.timelines.list'
}
},
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment