Skip to content

Feature/prepare migration to meteor 3 #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 54 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
ee850ab
Add logging
jbl2024 Nov 12, 2023
be4de8f
Migrate healthReports
jbl2024 Nov 12, 2023
d41015f
Update publish-composite
jbl2024 Nov 12, 2023
e8a698a
Migrate canvas
jbl2024 Nov 12, 2023
f65c9a8
Update tests
jbl2024 Nov 12, 2023
accb8a9
Migrate dashboard
jbl2024 Nov 13, 2023
dcf5524
Convert all methods to async
jbl2024 Nov 14, 2023
db3633d
Update client code (not finished) and projects
jbl2024 Nov 15, 2023
e6025b0
Migrate project group
jbl2024 Nov 24, 2023
678da97
Migrate Kanban, List
jbl2024 Nov 25, 2023
59f5f2b
Migrate NewProject, ProjectDetail
jbl2024 Nov 25, 2023
59e6e89
More migration
jbl2024 Nov 26, 2023
0ad9fd6
Fix attachments
jbl2024 Nov 26, 2023
2605d01
Migrate task checklist
jbl2024 Dec 2, 2023
f01f449
Migrate task detail
jbl2024 Dec 2, 2023
d486e3c
MIgrate task estimation in detail
jbl2024 Dec 2, 2023
2f905d3
Migrate task export
jbl2024 Dec 2, 2023
56e7c55
Migrate task history
jbl2024 Dec 2, 2023
b48424a
Migrate task labels
jbl2024 Dec 2, 2023
1e5ae0b
Migrate task menu
jbl2024 Dec 2, 2023
306c74c
Migrate task notes
jbl2024 Dec 2, 2023
f762e41
Migrate task properties
jbl2024 Dec 2, 2023
ae6869e
Migrate tasks
jbl2024 Dec 2, 2023
1fb7ea2
Migrate tasks export
jbl2024 Dec 2, 2023
3025721
Migrate SelectBackground
jbl2024 Dec 2, 2023
035ffdc
Migrate SelectProject
jbl2024 Dec 2, 2023
22c5054
Migrate SelectUser
jbl2024 Dec 2, 2023
e9322ab
Migrate coedition
jbl2024 Dec 2, 2023
7461375
Remove Api, replaced by Meteor.callAsync
jbl2024 Dec 2, 2023
e861a72
Migrate Search*
jbl2024 Dec 2, 2023
8116d40
Migrate digest generation
jbl2024 Dec 2, 2023
e106a4e
Migrate permissions, projects
jbl2024 Dec 2, 2023
7a05f4d
Migrate users
jbl2024 Dec 2, 2023
25a1c5b
More migrations
jbl2024 Dec 3, 2023
5615e40
Migrate fixTaskNumber
jbl2024 Dec 3, 2023
3f4320d
More migration
jbl2024 Dec 3, 2023
5009b52
More migrations
jbl2024 Dec 3, 2023
0c433d5
More migrations
jbl2024 Dec 3, 2023
a64a22a
Fix migration
jbl2024 Dec 3, 2023
93e1aad
Fix import/export
jbl2024 Dec 3, 2023
de41ab3
Fix linter
jbl2024 Dec 3, 2023
8331d51
Fix tests
jbl2024 Dec 3, 2023
32fecc5
FIx tests
jbl2024 Dec 3, 2023
166d567
Fix tests
jbl2024 Dec 3, 2023
1965cc5
Fix tests
jbl2024 Dec 3, 2023
1416868
Fix tests
jbl2024 Dec 3, 2023
41f7371
Fix purge
jbl2024 Dec 3, 2023
76ff729
Fix tests
jbl2024 Dec 3, 2023
e53a286
Update eslint packages
jbl2024 Dec 3, 2023
f732b09
Fix background
jbl2024 Dec 4, 2023
678fc2d
Use jbl2024:roles
jbl2024 Jan 6, 2024
074ac5a
WIP on async permissions
jbl2024 Jan 7, 2024
ce196f4
Fix typo, tests
jbl2024 Jan 7, 2024
d4ea042
Add missing import to simpl-schema
jbl2024 Jan 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,27 @@
# but you can also edit it by hand.

meteor-base@1.5.1 # Packages every Meteor app needs to have
mobile-experience@1.1.0 # Packages for a great mobile UX
mongo@1.16.7 # The database Meteor supports right now
mobile-experience@1.1.1 # Packages for a great mobile UX
mongo@1.16.8 # The database Meteor supports right now
reactive-var@1.0.12 # Reactive variable for tracker
tracker@1.3.2 # Meteor's client-side reactive programming library
tracker@1.3.3 # Meteor's client-side reactive programming library

standard-minifier-css@1.9.2 # CSS minifier run for production mode
standard-minifier-js@2.8.1 # JS minifier run for production mode
es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers
ecmascript@0.16.7 # Enable ECMAScript2015+ syntax in app code
ecmascript@0.16.8 # Enable ECMAScript2015+ syntax in app code
shell-server@0.5.0 # Server-side component of the `meteor shell` command

static-html@1.3.2
session@1.2.1
aldeed:simple-schema
akryum:vue-sass
vuejs:blaze-integration
accounts-password@2.3.4
accounts-password@2.4.0
reywood:publish-composite
random@1.2.1
konecty:user-presence
ostrio:files@2.3.3
meteorhacks:inject-initial
alanning:roles
matb33:collection-hooks
email@2.2.5
gadicohen:headers
mdg:validated-method
Expand All @@ -39,8 +36,11 @@ msavin:sjobs@4.3.2
aldeed:collection2-core
sakulstra:aggregate
jquery
service-configuration@1.3.1
service-configuration@1.3.2
latelier-oidc
latelier-accounts-oidc
underscore@1.0.13
bslocombe:vue-component
logging@1.3.3
matb33:collection-hooks
jbl2024:roles
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@2.13.3
METEOR@2.14
67 changes: 33 additions & 34 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
accounts-base@2.2.8
accounts-oauth@1.4.2
accounts-password@2.3.4
accounts-base@2.2.9
accounts-oauth@1.4.3
accounts-password@2.4.0
akryum:vue-component-dev-client@0.4.7
akryum:vue-component-dev-server@0.1.4
akryum:vue-sass@0.1.3
alanning:roles@1.3.0
aldeed:collection2-core@2.1.2
aldeed:simple-schema@1.5.4
allow-deny@1.1.1
autoupdate@1.8.0
babel-compiler@7.10.4
babel-compiler@7.10.5
babel-runtime@1.5.1
base64@1.0.12
binary-heap@1.0.11
blaze@2.5.0
blaze@2.7.1
blaze-tools@1.1.3
boilerplate-generator@1.7.1
boilerplate-generator@1.7.2
bslocombe:vue-component@0.16.1
caching-compiler@1.2.2
caching-html-compiler@1.2.1
Expand All @@ -25,19 +23,19 @@ coffeescript@1.0.17
ddp@1.4.1
ddp-client@2.6.1
ddp-common@1.4.0
ddp-rate-limiter@1.2.0
ddp-server@2.6.2
ddp-rate-limiter@1.2.1
ddp-server@2.7.0
deps@1.0.12
diff-sequence@1.1.2
dynamic-import@0.7.3
ecmascript@0.16.7
ecmascript@0.16.8
ecmascript-runtime@0.8.1
ecmascript-runtime-client@0.12.1
ecmascript-runtime-server@0.11.0
ejson@1.1.3
email@2.2.5
es5-shim@4.8.0
fetch@0.1.3
fetch@0.1.4
gadicohen:headers@0.0.31
geojson-utils@1.0.11
hot-code-push@1.0.4
Expand All @@ -46,19 +44,19 @@ htmljs@1.1.1
http@1.4.4
id-map@1.1.1
inter-process-messaging@0.1.1
jbl2024:roles@1.3.2
jquery@3.0.0
konecty:user-presence@2.6.3
latelier-accounts-oidc@2.0.0
latelier-oidc@2.0.0
launch-screen@1.3.0
launch-screen@2.0.0
livedata@1.0.18
lmieulet:meteor-coverage@3.2.0
localstorage@1.2.0
logging@1.3.2
matb33:collection-hooks@1.3.0
logging@1.3.3
matb33:collection-hooks@1.3.1
mdg:validated-method@1.3.0
mdg:validation-error@0.5.1
meteor@1.11.3
meteor@1.11.4
meteor-base@1.5.1
meteorhacks:inject-initial@1.0.5
meteortesting:browser-tests@1.3.5
Expand All @@ -67,20 +65,20 @@ meteortesting:mocha-core@7.2.0
minifier-css@1.6.4
minifier-js@2.7.5
minimongo@1.9.3
mobile-experience@1.1.0
mobile-experience@1.1.1
mobile-status-bar@1.1.0
modern-browsers@0.1.9
modules@0.19.0
modern-browsers@0.1.10
modules@0.20.0
modules-runtime@0.13.1
mongo@1.16.7
mongo@1.16.8
mongo-decimal@0.1.3
mongo-dev-server@1.1.0
mongo-id@1.0.8
msavin:sjobs@4.3.2
npm-mongo@4.16.0
oauth@2.2.0
npm-mongo@4.17.2
oauth@2.2.1
oauth2@1.3.2
observe-sequence@1.0.21
observe-sequence@1.0.22
ordered-dict@1.1.0
ostrio:cookies@2.7.2
ostrio:files@2.3.3
Expand All @@ -92,34 +90,35 @@ promise@0.12.2
raix:eventemitter@0.1.3
random@1.2.1
rate-limit@1.1.1
react-fast-refresh@0.2.7
react-fast-refresh@0.2.8
reactive-dict@1.3.1
reactive-var@1.0.12
reload@1.3.1
retry@1.1.0
reywood:publish-composite@1.8.3
reywood:publish-composite@1.8.6
routepolicy@1.1.1
sakulstra:aggregate@1.4.4
service-configuration@1.3.1
service-configuration@1.3.2
session@1.2.1
sha@1.0.9
shell-server@0.5.0
socket-stream-client@0.5.1
spacebars@1.2.0
socket-stream-client@0.5.2
spacebars@1.3.0
spacebars-compiler@1.3.1
standard-minifier-css@1.9.2
standard-minifier-js@2.8.1
static-html@1.3.2
templating@1.4.1
templating@1.4.2
templating-compiler@1.4.1
templating-runtime@1.5.0
templating-runtime@1.6.3
templating-tools@1.2.2
tmeasday:check-npm-versions@0.3.2
tracker@1.3.2
tracker@1.3.3
typescript@4.9.5
underscore@1.0.13
url@1.3.2
vuejs:blaze-integration@0.2.0
webapp@1.13.5
webapp@1.13.6
webapp-hashing@1.1.1
xolvio:cleaner@0.4.0
zodern:types@1.0.10
zodern:types@1.0.11
16 changes: 14 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased

### Added

### Changed
- Meteor logging package instead of console.log

### Changed
- Update to Meteor 2.14
- Migration to async/await
- Updated meteor packages:
- reywood:publish-composite upgraded from 1.8.3 to 1.8.4
- matb33:collection-hooks upgraded from 1.3.0 to 1.3.1
- aldeed:simple-schema removed (use simpl-schema from npm instead)
- mdg:validation-error removed
- observe-sequence upgraded from 1.0.21 to 1.0.22
- reywood:publish-composite upgraded from 1.8.4 to 1.8.6
- templating-runtime upgraded from 1.6.0 to 1.6.3
- Replace alanning:roles with dedicated fork compatible with aysnc

### Deleted

Expand Down
66 changes: 23 additions & 43 deletions client/components/healthReports/EditHealthReport.vue
Original file line number Diff line number Diff line change
@@ -1,26 +1,13 @@
<template>
<div class="edit-health-report">
<generic-dialog
v-model="showDialog"
:title="$t('Edit report')"
max-width="800px"
>
<generic-dialog v-model="showDialog" :title="$t('Edit report')" max-width="800px">
<template v-slot:content>
<select-date
v-model="showSelectDate"
:disable-time="true"
@select="onSelectDate"
/>
<select-date v-model="showSelectDate" :disable-time="true" @select="onSelectDate" />

<v-form v-model="valid" @submit.prevent>
<v-layout wrap>
<v-flex xs12>
<v-text-field
v-model="name"
:rules="nameRules"
:label="$t('Name')"
required
/>
<v-text-field v-model="name" :rules="nameRules" :label="$t('Name')" required />
</v-flex>
<v-flex xs12>
<v-list two-line class="elevation-1 date">
Expand All @@ -43,11 +30,7 @@
</v-list>
</v-flex>
<v-flex xs12>
<v-combobox
v-model="weather"
:items="items"
:label="$t('Project health')"
>
<v-combobox v-model="weather" :items="items" :label="$t('Project health')">
<template slot="selection" slot-scope="data">
<img :src="getIcon(data.item)">
</template>
Expand All @@ -59,10 +42,8 @@

<v-flex xs12>
<label>{{ $t("Description") }}</label>
<rich-editor
ref="description"
v-model="description"
:max-height="!$vuetify.breakpoint.xsOnly ? '200px' : null"
<rich-editor ref="description" v-model="description"
:max-height="!$vuetify.breakpoint.xsOnly ? '200px' : null"
/>
</v-flex>
</v-layout>
Expand All @@ -88,7 +69,7 @@ export default {
props: {
report: {
type: Object,
default: () => {}
default: () => { }
}
},
i18n: {
Expand Down Expand Up @@ -151,24 +132,23 @@ export default {
}
this.coherent = true;
},
create() {
this.showDialog = false;
Meteor.call(
"healthReports.update",
{
id: this.report._id,
name: this.name,
description: this.description,
date: this.date,
weather: this.weather
},
(error) => {
this.$emit("updated");
if (error) {
this.$notifyError(error);
async create() {
try {
this.showDialog = false;
await Meteor.callAsync(
"healthReports.update",
{
id: this.report._id,
name: this.name,
description: this.description,
date: this.date,
weather: this.weather
}
}
);
);
this.$emit("updated");
} catch (error) {
this.$notifyError(error);
}
this.showDialog = false;
},
getIcon(weather) {
Expand Down
Loading