bterkuile/ember-cli-dunlop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ember 3.18 version update modifications

Browse Source
This commit is contained in:
Benjamin ter Kuile
2020-07-23 10:51:45 -05:00
parent 32d2854110
commit ecaa9d6d0a
15 changed files with 89 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addon/adapters/application.coffee
+7 -3
View File
@@ -8,6 +8,10 @@ export default DS.JSONAPIAdapter.extend DataAdapterMixin,
namespace: config.apiNamespace
host: config.apiHost
authorizer: 'authorizer:devise'
headers: Ember.computed 'session.data.authenticated.access_token', ->
headers = {}
headers['Authorization'] = "Bearer #{@session.data.authenticated.token}" if @session.isAuthenticated
headers
#pathForType: (type)->
# type.underscore().pluralize()
@@ -42,14 +46,14 @@ export default DS.JSONAPIAdapter.extend DataAdapterMixin,
switch status
when 401, 403
application_route = Ember.getOwner(@).lookup('route:application')
application_route.set 'router.globals.flash_message', "Unauthorized action"
application_route.set 'globals.flash_message', "Unauthorized action"
#@get('session')?.invalidate()
#application_route.set 'router.globals.current_user', null
#application_route.set 'globals.current_user', null
#application_route.transitionTo('login')
else
if typeof(payload?.error) is 'string'
application_route = Ember.getOwner(@).lookup('route:application')
application_route.set 'router.globals.flash_message', payload.error
application_route.set 'globals.flash_message', payload.error
@_super arguments...
#buildURL: (modelName, id, snapshot, requestType, query)->
addon/components/editable-attribute.coffee
+2 -1
View File
@@ -1,5 +1,6 @@
import Ember from 'ember'
import layout from '../templates/components/editable-attribute'
#NOTE: this is an aged component locked to model and name. Needs more to be used differently, and name does not reflect it's function (Benjamin: 2019-12-21)
export default Ember.Component.extend
layout: layout
@@ -22,7 +23,7 @@ export default Ember.Component.extend
model = @get('model')
@set 'validation_message', ''
if validate = @get('validate')
@set 'validation_message', 'Must be given' if validate is 'presence' and not @get('model.name')
@set 'validation_message', 'Must be given' if validate is 'presence' and not @get("model.#{@get 'attributeName'}")
unless @get 'validation_message'
@set 'isEditing', false
model.save()
addon/components/ui-calendar-moment.coffee
+1 -2
View File
@@ -1,5 +1,5 @@
import Ember from 'ember'
import UiCalendarComponent from 'ember-semantic-ui-calendar/components/ui-calendar'
import UiCalendarComponent from 'fomantic-ui-ember/components/ui-calendar'
{ computed, inject, merge } = Ember
export default UiCalendarComponent.extend
momentValue: null
@@ -21,4 +21,3 @@ export default UiCalendarComponent.extend
momentDate = if date then moment(date) else null
momentDate._ambigTime = true if momentDate and @get('is_date')
@sendAction 'onChange', momentDate
addon/initializers/ember-cli-dunlop-overrides.coffee
+6 -5
View File
@@ -1,8 +1,9 @@
import ComponentOverrides from 'ember-cli-dunlop/overrides/component'
import ControllerOverrides from 'ember-cli-dunlop/overrides/controller'
import ObjectOverrides from 'ember-cli-dunlop/overrides/object'
import RouteOverrides from 'ember-cli-dunlop/overrides/route'
import DunlopTranslationFunctions from 'ember-cli-dunlop/dunlop-translations/global-functions'
import 'ember-cli-dunlop/overrides/component'
import 'ember-cli-dunlop/overrides/model'
import 'ember-cli-dunlop/overrides/controller'
import 'ember-cli-dunlop/overrides/object'
import 'ember-cli-dunlop/overrides/route'
import 'ember-cli-dunlop/dunlop-translations/global-functions'
#included: function(app) {
# this._super.included(app);
# app.import('ember-cli-dunlop/overrides/component');
addon/mixins/application-route.coffee
+16 -15
View File
@@ -4,8 +4,9 @@ import ApplicationRouteMixin from 'ember-simple-auth/mixins/application-route-mi
export default Ember.Mixin.create ApplicationRouteMixin,
current_user_loaded: (user) -> @get('initial_resources_resolve')(user)
router: Ember.inject.service()
beforeModel: (transition) ->
@set 'router.globals.initial_resources_fulfilled', false
@set 'globals.initial_resources_fulfilled', false
time_now = new Date()
console.log "Application beforeModel"
initial_resources_loaded = new Ember.RSVP.Promise((resolve, reject) =>
@@ -13,10 +14,10 @@ export default Ember.Mixin.create ApplicationRouteMixin,
@set 'initial_resources_reject', reject
).then((resources) =>
console.log "Initial resources loaded (#{Math.round((new Date() - time_now) / 100) / 10}s)" # rounded devide by 1000
@set 'router.globals.initial_resources_fulfilled', true
@set 'globals.initial_resources_fulfilled', true
).catch((reason) =>
console.log "No initial resource loading (#{Math.round((new Date() - time_now) / 100) / 10}s)" # rounded devide by 1000
@set('router.globals.flash_message', reason) if reason
@set('globals.flash_message', reason) if reason
).finally -> Ember.$('#initial-loader').remove()
@set 'initial_resources_loaded_promise', initial_resources_loaded
@@ -33,10 +34,10 @@ export default Ember.Mixin.create ApplicationRouteMixin,
@get('initial_resources_resolve')() # do not halt propagation
return
@get('store').queryRecord('user', me: true).then (user) =>
@set 'router.globals.current_user', user
@set 'globals.current_user', user
@current_user_loaded user # overloadable
, =>
@set 'router.globals.current_user', null
@set 'globals.current_user', null
@get('initial_resources_resolve')() # no initial resources without user, do not halt application propagation (login page)
@transitionTo('login')
@@ -48,7 +49,7 @@ export default Ember.Mixin.create ApplicationRouteMixin,
if status = error.status || error?.errors?[0].status
switch parseInt(status)
when 401, 403
@set 'router.globals.current_user', null
@set 'globals.current_user', null
@transitionTo 'login'
return
#when 404
@@ -63,7 +64,7 @@ export default Ember.Mixin.create ApplicationRouteMixin,
into: 'application'
outlet: 'error-handling'
controller: controller
#@set "router.globals.flash_message", "Oops! Something went wrong!<br>#{error.message}".htmlSafe()
#@set "globals.flash_message", "Oops! Something went wrong!<br>#{error.message}".htmlSafe()
clear_error: ->
#@disconnectOutlet # https://github.com/emberjs/ember-inspector/issues/625
@@ -73,7 +74,7 @@ export default Ember.Mixin.create ApplicationRouteMixin,
outlet: 'error-handling'
into: 'application'
controller: 'application'
@set 'router.globals.modal_active', false
@set 'globals.modal_active', false
clear_error_and_go_home: ->
@send 'clear_error'
@@ -82,8 +83,8 @@ export default Ember.Mixin.create ApplicationRouteMixin,
didTransition: ->
@_super arguments...
Ember.run.next =>
return unless path = @get('controller.currentPath')
@set 'router.globals.current_route', Ember.Object.create
return unless path = @get('router.currentRouteName')
@set 'globals.current_route', Ember.Object.create
path: path # a.b.c
node: path.replace(/.*\./, '') # c
primary: '.' in path
@@ -159,17 +160,17 @@ export default Ember.Mixin.create ApplicationRouteMixin,
unless partialPath
message = "Cannot find template for modal '#{modalName}'"
console.log message
@set "router.globals.flash_message", message
@set "globals.flash_message", message
return
controller.set 'partialName', partialPath
@incrementProperty 'router.globals.modals_counter'
@incrementProperty 'globals.modals_counter'
controller.privateWillOpenModal() # setup expected attributes to be used in willOpenModal
controller.willOpenModal() # can be implemented to setup stuff before rendering and hooks
@render 'modals/layout',
into: 'application'
outlet: 'modal'
controller: controller
@set 'router.globals.modal_active', true
@set 'globals.modal_active', true
false # return false since this result will in most cases the the last statement of an action. So prevent bubbling
closeModal: ->
@@ -180,10 +181,10 @@ export default Ember.Mixin.create ApplicationRouteMixin,
outlet: 'modal'
into: 'application'
controller: 'application'
@set 'router.globals.modal_active', false
@set 'globals.modal_active', false
signOut: ->
@set 'router.globals.current_user', null
@set 'globals.current_user', null
@get('session').invalidate() if @get('session.isAuthenticated')
@transitionTo 'login'
try
addon/mixins/modal-base.coffee
+2 -2
View File
@@ -37,7 +37,7 @@ export default Ember.Component.extend
return partialNameTranslation.htmlSafe() if partialNameTranslation = tspan(partial_title_path, translation_params)
# @toString() => <frontend@component:workflow-action-definition/modals/edit-workflow-action-definition::ember873>
underscored = component_name.underscore().replace(/\//g, '.')
underscored = @get('component_name').underscore().replace(/\//g, '.')
return convention_translation.htmlSafe() if convention_translation = tspan("#{underscored}.title", translation_params)
# Return a kind of humanized version of the title
@@ -123,7 +123,7 @@ export default Ember.Component.extend
# transition to top level route if current is nested inside a model.show route
if modelName = my_scope.get('model.constructor.modelName')
flat_model_name = modelName.replace(/^\w+\//, '').replace('/', '.') # panda/projec => project
if my_scope.get('router.globals.current_route.path')?.match("^#{flat_model_name}.show")
if my_scope.get('globals.current_route.path')?.match("^#{flat_model_name}.show")
my_scope.get('router').transitionTo flat_model_name
if @get('model.isNew')
addon/overrides/model.coffee
+9
View File
@@ -0,0 +1,9 @@
import DS from 'ember-data'
export default DS.Model.reopen
toJSON: (options = {}) ->
#serializer = @_internalModel.store.serializerFor('-default')
serializer = Ember.getOwner(@).lookup('serializer:to-json')
options.includeId = true if options.includeId isnt false
#throw "The toJSON of models (global-functionality/ember-data-overrides) changed serializer type, expected DS.JSONSerializer" unless serializer.constructor.toString() is "DS.JSONSerializer"
snapshot = @_internalModel.createSnapshot()
serializer.serialize(snapshot, options)
addon/templates/components/editable-attribute.emblem
+2 -2
View File
@@ -8,12 +8,12 @@
if can_make_editable
/= push-action type='edit' action='editRecord'
if isEditing
= input value=model.name enter='saveRecord'
= input value=model.name enter=(action 'saveRecord')
else
span= model.name
if isEditing
.ui.action.input
= input value=model.name enter='saveRecord'
= input value=model.name enter=(action 'saveRecord')
= push-action type='rollback' action='rollbackRecord'
= push-action type='destroy' action='destroyRecord'
= push-action type='save' action='saveRecord'