decorator fixes for ember-update

abhishek97 · abhishek97 · commit 5d9a4e2fd551 · 2019-05-31T15:58:32.000+05:30
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-8.9.1
+10
diff --git a/app/pods/components/all-courses/component.js b/app/pods/components/all-courses/component.js
@@ -52,8 +52,7 @@ export default class AllCoursesComponent extends Component {
    * Fetch courses on the 'All Courses' page
    */
 
-  @restartableTask
-  *fetchAllCourses () {
+  @restartableTask fetchAllCourses = function* ()  {
     const organization = this.get('currentUser.organization') || this.org
     const extraWhere = {}
 
diff --git a/app/pods/components/carousel-cards/component.js b/app/pods/components/carousel-cards/component.js
@@ -55,8 +55,7 @@ export default class CarouselCards extends Component {
     this.get('getCarouselCardsTask').perform()
   }
 
-  @restartableTask	
-  *getCarouselCardsTask () {
+  @restartableTask getCarouselCardsTask = function *() {
     const cards = yield this.get('store').query('carousel_card', {
       sort: 'order'
     })
diff --git a/app/pods/components/cart-dialog/component.js b/app/pods/components/cart-dialog/component.js
@@ -8,8 +8,7 @@ export default class CartDialog extends Component {
 
   dukaanUrl = env.dukaanUrl
 
-  @restartableTask
-  *addCartTask() {
+  @restartableTask addCartTask = function * () {
     yield this.get('api').request('/runs/clear_cart');
     const runId = this.get('run.id');
     yield this.get('api').request(`/runs/${runId}/buy`);
diff --git a/app/pods/components/code-editor/component.js b/app/pods/components/code-editor/component.js
@@ -133,8 +133,7 @@ export default class EditorClass extends Component {
     this.sendAction('toggleModal', modalContentType);
   }
 
-  @restartableTask
-  *setCollabModeTask (value) {
+  @restartableTask setCollabModeTask = function *(value) {
     if (value) {
       yield this.firepad.connect()
     } else {
diff --git a/app/pods/components/course-search-box/component.js b/app/pods/components/course-search-box/component.js
@@ -16,8 +16,7 @@ export default class SearchBoxComponent extends Component {
 
   @alias('searchTask.lastSuccessful.value') results
 
-  @restartableTask
-  *searchTask () {
+  @restartableTask searchTask = function* ()  {
     yield timeout (100)
     const searchQuery = this.get('qs').trim().toLowerCase()
 
diff --git a/app/pods/components/csv-submission-success/component.js b/app/pods/components/csv-submission-success/component.js
@@ -12,8 +12,7 @@ export default class extends Component{
     this.pollingTask.perform()
   }
 
-  @restartableTask
-  *pollingTask() {
+  @restartableTask pollingTask = function *() {
     while (this.maxTries--) {
       yield timeout(this.gap)
       const result = yield this.submission.reload()
diff --git a/app/pods/components/discourse-topics-view/component.js b/app/pods/components/discourse-topics-view/component.js
@@ -23,8 +23,7 @@ export default class DiscourseTopicsView extends Component {
     return `${env.discussBaseUrl}/c/${categoryId}/${subCategoryId}`
   }
 
-  @restartableTask
-  *fetchTopicTasks () {
+  @restartableTask fetchTopicTasks = function* ()  {
     const courseId = this.get('course.id')
     return yield this.get('api').request(`/courses/${courseId}/doubts`, {
       data: {
diff --git a/app/pods/components/doubt-feedback/component.js b/app/pods/components/doubt-feedback/component.js
@@ -5,8 +5,7 @@ import { inject as service } from '@ember/service';
 export default class DoubtFeedbackComponent extends Component {
   @service store
 
-  @restartableTask	
-  *submitFeedback() {
+  @restartableTask	submitFeedback = function *() {
     let df = this.store.createRecord('doubt-feedback', {
       type: 'STUDENT',
       score: this.score,
diff --git a/app/pods/components/doubt-view-attempt/component.js b/app/pods/components/doubt-view-attempt/component.js
@@ -29,8 +29,7 @@ export default class DoubtViewAttemptComponent extends Component{
       return false
   }
 
-  @restartableTask
-  *commentTask () {
+  @restartableTask commentTask = function* ()  {
     if (this.get('commentBody.length') < 20) {
       return this.set('err', 'Comment length must be atleast 20 characters.')
     }
diff --git a/app/pods/components/doubt-view/component.js b/app/pods/components/doubt-view/component.js
@@ -26,8 +26,7 @@ export default class DoubtViewComponent extends Component {
     return env.discussBaseUrl + '/t/' + this.get('topicResponse.id')
   }
 
-  @restartableTask
-  *fetchTopicTask () {
+  @restartableTask fetchTopicTask = function* ()  {
     const topicResponse = yield this.get('api').request(`/courses/doubts/${this.get('topicId')}`)
     this.set('topic', topicResponse.post_stream.posts[0])
     this.set('topicResponse', topicResponse)
diff --git a/app/pods/components/doubts-view/component.js b/app/pods/components/doubts-view/component.js
@@ -25,19 +25,16 @@ export default class DoubtsViewComponent extends Component {
   @filterBy('existingDoubts', 'status', 'RESOLVED')
   resolved
 
-  @filter('existingDoubts')
-  unresolved (doubt) {
-    return doubt.status != 'RESOLVED'
-  }
+  @filter('existingDoubts', doubt => doubt.status != 'RESOLVED')
+  unresolved 
 
   @computed('existingDoubts', 'currentContent')
   get duplicatePendingDoubt () {
     const contentId = this.currentContent.getContentId()
     return this.existingDoubts.find(d => d.get('content.id') == contentId && d.status == 'PENDING')
   }
 
-  @restartableTask
-  *askDoubtTask (){
+  @restartableTask askDoubtTask = function* () {
     if (this.get('title.length') < 15) {
       return this.set('err', 'Title length must be atleast 15 characters.')
     }
diff --git a/app/pods/components/dukaan-dropdown/component.js b/app/pods/components/dukaan-dropdown/component.js
@@ -29,8 +29,7 @@ export default class DukaanDropdown extends Component {
 
   @equal('activeTab', 'cart') showDialog
 
-  @restartableTask
-  *fetchCart (){
+  @restartableTask fetchCart = function* () {
     try {
       const cart = yield this.get('api').request('/runs/cart')
       const item = cart.cartItems[0]
@@ -43,8 +42,7 @@ export default class DukaanDropdown extends Component {
     }
   }
 
-  @restartableTask
-  *clearCartTask() {
+  @restartableTask clearCartTask = function *() {
     yield this.get('api').request('/runs/clear_cart')
     this.set('cartItem', false)
   }
diff --git a/app/pods/components/feedback-component/component.js b/app/pods/components/feedback-component/component.js
@@ -22,8 +22,7 @@ export default class FeedbackComponent extends Component {
     }
   }
 
-  @restartableTask
-  *saveFeedbackTask () {
+  @restartableTask saveFeedbackTask = function* ()  {
     const feedback = this.get('feedback')
     feedback.set("course", this.get('course'))
     feedback.set("user", this.get('currentUser.user'))
diff --git a/app/pods/components/my-courses/component.js b/app/pods/components/my-courses/component.js
@@ -45,8 +45,7 @@ export default class MyCoursesTaskComponent extends Component {
   * Fetch courses on the 'My Courses' page
   */
   
-  @restartableTask
-  *fetchMyCoursesTask () {
+  @restartableTask fetchMyCoursesTask = function* ()  {
     const results = yield this.get("store").query("run", {
       include: "course,run_attempts",
       enrolled: true,
diff --git a/app/pods/components/note-view/component.js b/app/pods/components/note-view/component.js
@@ -11,14 +11,12 @@ export default class NoteViewComponent extends Component {
   isEditing = false
   deleted = false
 
-  @dropTask
-  *saveNoteTask () {
+  @dropTask saveNoteTask = function *() {
     yield this.get('note').save()
     this.set("isEditing", false)
   }
 
-  @dropTask
-  *deleteNote () {
+  @dropTask deleteNote = function *() {
     yield this.get('api').request('/notes/'+ this.get('note.id'), {
       method: 'DELETE',
     })
diff --git a/app/pods/components/notes-view/component.js b/app/pods/components/notes-view/component.js
@@ -15,8 +15,7 @@ export default class NotesViewComponent extends Component {
 
   requestErrored = false
 
-  @restartableTask
-  *addNoteTask () {
+  @restartableTask addNoteTask = function* ()  {
     const contentId = this.get('currentContent').getContentId()
     const store = this.get('store')
 
diff --git a/app/pods/components/notification-dropdown/component.js b/app/pods/components/notification-dropdown/component.js
@@ -39,8 +39,7 @@ export default class NotificationDropdownComponent extends Component {
     })
   }
 
-  @restartableTask	
-  *loadNotifications () {
+  @restartableTask loadNotifications = function *() {
     const notifications = yield this.get ('store').query ('notification', {
       page: {
         offset: this.get ('offset'),
diff --git a/app/pods/components/otp-enroll/component.js b/app/pods/components/otp-enroll/component.js
@@ -19,8 +19,7 @@ export default class otpEnrollComponent extends Component {
   email = null
   errorString = null
 
-  @restartableTask
-  *sendOtpTask() {
+  @restartableTask sendOtpTask = function *() {
     return this.get('api').request('otp/request', {
       method: 'POST',
       data: {
@@ -43,8 +42,7 @@ export default class otpEnrollComponent extends Component {
     })
   }
 
-  @restartableTask
-  *verifyOtpTask() {
+  @restartableTask verifyOtpTask = function *() {
     return this.get('api').request('otp/verify', {
       method: "POST",
       data: {
diff --git a/app/pods/components/percent-complete/component.js b/app/pods/components/percent-complete/component.js
@@ -7,8 +7,7 @@ export default class PercentComplete extends Component {
   percent = 0
   classNames = ['w-100', 'd-flex', 'align-items-center', 'justify-content-between']
 
-  @restartableTask
-  *fetchPercentTask () {
+  @restartableTask fetchPercentTask = function* ()  {
     const response = yield this.get('api').request(`run_attempts/${this.get('runAttemptId')}/progress`)
     this.set('percent', response.percent)
   }
diff --git a/app/pods/components/player-code-challenge/component.js b/app/pods/components/player-code-challenge/component.js
@@ -113,8 +113,7 @@ export default class CodeChallengeComponent extends Component {
     this.set('err', '')
   }
   
-  @restartableTask
-  *runCodeTask (config) {
+  @restartableTask runCodeTask = function *(config) {
     this.set('api.headers.hackJwt', this.get('currentUser.user.hackJwt'))
     return yield this.get("api").request("code_challenges/submit", {
       method: "POST",
@@ -126,8 +125,7 @@ export default class CodeChallengeComponent extends Component {
     });
   }
 
-  @restartableTask
-  *submitCodeTask (config) {
+  @restartableTask submitCodeTask = function *(config) {
     this.set('api.headers.hackJwt', this.get('currentUser.user.hackJwt'))
     const code = this.get("code");
     const run = this.get("run");
@@ -191,8 +189,7 @@ export default class CodeChallengeComponent extends Component {
     
   }
 
-  @restartableTask
-  *fetchEditorialTestcases (which) {
+  @restartableTask fetchEditorialTestcases = function *(which) {
     try{
       this.set('api.headers.hackJwt', this.get('currentUser.user.hackJwt'))
       const run = this.get("run")
diff --git a/app/pods/components/player-csv/component.js b/app/pods/components/player-csv/component.js
@@ -28,8 +28,7 @@ export default class PlayerCsvComponent extends Component {
     this.set('url', link)
   }
 
-  @restartableTask
-  *submissionTask () {
+  @restartableTask submissionTask = function* ()  {
     if (!this.get('url')) {
       return alert('You must upload your solution first')
     }
diff --git a/app/pods/components/recommended-courses/component.js b/app/pods/components/recommended-courses/component.js
@@ -20,8 +20,7 @@ export default class RecommendedTaskComponent extends Component {
     this.get('fetchRecommendedCoursesTask').perform()
   }
 
-  @restartableTask
-  *fetchRecommendedCoursesTask () {
+  @restartableTask fetchRecommendedCoursesTask = function* ()  {
     const filter = {
       recommended: true,
       unlisted: false
diff --git a/app/pods/components/search-box/component.js b/app/pods/components/search-box/component.js
@@ -19,8 +19,7 @@ export default class SearchBoxComponent extends Component {
   @alias('searchTask.lastSuccessful.value') results
   @alias('currentUser.organization') organization
 
-  @restartableTask
-  *searchTask () {
+  @restartableTask searchTask = function* ()  {
     yield timeout (1000)
     const searchQuery = this.get('qs')
     const extraWhere = {}
diff --git a/lib/hiring-blocks/addon/pods/components/job-cards-view/component.js b/lib/hiring-blocks/addon/pods/components/job-cards-view/component.js
@@ -17,8 +17,7 @@ export default class JobCardsViewComponent extends Component {
     this.fetchJobsTask.perform(true)
   }
 
-  @restartableTask
-  *fetchJobsTask (truncate = false) {
+  @restartableTask fetchJobsTask = function *(truncate = false) {
     const filter = {
       deadline: {
         $gt: new Date()
diff --git a/lib/hiring-blocks/addon/pods/components/recommended-jobs/component.js b/lib/hiring-blocks/addon/pods/components/recommended-jobs/component.js
@@ -8,8 +8,7 @@ export default class RecommendedJobsComponent extends Component {
 
   @service store
 
-  @restartableTask
-  *fetchJobs () {
+  @restartableTask fetchJobs = function* ()  {
     return this.store.query('job', {
       page: {
         limit: 2
diff --git a/lib/hiring-blocks/addon/pods/listing/job/controller.js b/lib/hiring-blocks/addon/pods/listing/job/controller.js
@@ -18,8 +18,7 @@ export default class ListingJobController extends Controller {
     return this.get('job.myApplication')
   }
 
-  @dropTask
-  *applyForJob (extra) {
+  @dropTask applyForJob = function *(extra) {
     yield this.store.createRecord('application', {
       job: this.job,
       resumeLink: this.resumeLink,
diff --git a/package.json b/package.json
@@ -46,6 +46,7 @@
     "ember-concurrency": "^0.10.0",
     "ember-concurrency-decorators": "^1.0.0-beta.2",
     "ember-data": "~3.10.0",
+    "ember-decorators": "^6.0.0",
     "ember-engines": "^0.5.26",
     "ember-export-application-global": "^2.0.0",
     "ember-form-for": "^2.0.1",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,7 @@ export default class CarouselCards extends Component {`
`55`	`55`	`this.get('getCarouselCardsTask').perform()`
`56`	`56`	`}`
`57`	`57`
`58`		`- @restartableTask`
`59`		`- *getCarouselCardsTask () {`
	`58`	`+ @restartableTask getCarouselCardsTask = function *() {`
`60`	`59`	`const cards = yield this.get('store').query('carousel_card', {`
`61`	`60`	`sort: 'order'`
`62`	`61`	`})`
Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,7 @@ export default class EditorClass extends Component {`
`133`	`133`	`this.sendAction('toggleModal', modalContentType);`
`134`	`134`	`}`
`135`	`135`
`136`		`- @restartableTask`
`137`		`- *setCollabModeTask (value) {`
	`136`	`+ @restartableTask setCollabModeTask = function *(value) {`
`138`	`137`	`if (value) {`
`139`	`138`	`yield this.firepad.connect()`
`140`	`139`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,7 @@ export default class extends Component{`
`12`	`12`	`this.pollingTask.perform()`
`13`	`13`	`}`
`14`	`14`
`15`		`- @restartableTask`
`16`		`- *pollingTask() {`
	`15`	`+ @restartableTask pollingTask = function *() {`
`17`	`16`	`while (this.maxTries--) {`
`18`	`17`	`yield timeout(this.gap)`
`19`	`18`	`const result = yield this.submission.reload()`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,7 @@ export default class DiscourseTopicsView extends Component {`
`23`	`23`	return `${env.discussBaseUrl}/c/${categoryId}/${subCategoryId}`
`24`	`24`	`}`
`25`	`25`
`26`		`- @restartableTask`
`27`		`- *fetchTopicTasks () {`
	`26`	`+ @restartableTask fetchTopicTasks = function* () {`
`28`	`27`	`const courseId = this.get('course.id')`
`29`	`28`	return yield this.get('api').request(`/courses/${courseId}/doubts`, {
`30`	`29`	`data: {`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,7 @@ export default class DoubtViewAttemptComponent extends Component{`
`29`	`29`	`return false`
`30`	`30`	`}`
`31`	`31`
`32`		`- @restartableTask`
`33`		`- *commentTask () {`
	`32`	`+ @restartableTask commentTask = function* () {`
`34`	`33`	`if (this.get('commentBody.length') < 20) {`
`35`	`34`	`return this.set('err', 'Comment length must be atleast 20 characters.')`
`36`	`35`	`}`