@afeefa/vue-app 0.0.63 → 0.0.64

package/.afeefa/package/release/version.txt

@@ -1 +1 @@
-0.0.63
+0.0.64

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afeefa/vue-app",
-  "version": "0.0.63",
+  "version": "0.0.64",
   "description": "",
   "author": "Afeefa Kollektiv <kollektiv@afeefa.de>",
   "license": "MIT",

package/src/components/AModal.vue

@@ -7,6 +7,8 @@
     v-bind="$attrs"
     :contentClass="modalId"
     transition="v-fade-transition"
+    :persistent="true"
+    :no-click-animation="true"
     @click:outside="cancel"
     @keydown.esc="cancel"
   >
@@ -41,7 +43,7 @@ import { getZIndex } from 'vuetify/lib/util/helpers'
 import { ComponentWidthMixin } from './mixins/ComponentWidthMixin'
 
 @Component({
-  props: ['show', 'title', 'triggerClass', 'anchorPosition']
+  props: ['show', 'title', 'beforeClose', 'triggerClass', 'anchorPosition']
 })
 export default class ADialog extends Mixins(UsesPositionServiceMixin, ComponentWidthMixin) {
   modalId = randomCssClass(10)
@@ -83,7 +85,15 @@ export default class ADialog extends Mixins(UsesPositionServiceMixin, ComponentW
    * and emit a visibility event
    */
   @Watch('show')
-  showChanged () {
+  async showChanged () {
+    // check if a modal is allowed to be closed
+    if (this.modal && !this.show && this.beforeClose) {
+      const result = await this.beforeClose()
+      if (!result) {
+        return
+      }
+    }
+
     this.modal = this.show
   }
 
@@ -121,7 +131,15 @@ export default class ADialog extends Mixins(UsesPositionServiceMixin, ComponentW
     this.urp_registerPositionWatcher(this.position)
   }
 
-  cancel () {
+  async cancel () {
+    // check if a modal is allowed to be closed
+    if (this.modal && this.beforeClose) {
+      const result = await this.beforeClose()
+      if (!result) {
+        return
+      }
+    }
+
     this.modal = false
   }
 

package/src/components/ATableRow.vue

@@ -62,6 +62,10 @@ export default class ATableRow extends Vue {
     }
   }
 
+  &.selectable {
+    cursor: pointer;
+  }
+
   &:hover, &.selected {
     background: #F4F4F4;
   }

package/src/components/flying-context/FlyingContextEvent.js

@@ -0,0 +1,5 @@
+import { BaseEvent } from '@a-vue/plugins/event-bus/BaseEvent'
+
+export class FlyingContextEvent extends BaseEvent {
+  static HIDE_ALL = 'FlyingContextEvent:hide-all'
+}

package/src/components/form/EditForm.vue

@@ -4,9 +4,10 @@
     autocomplete="off"
   >
     <slot
+      name="form"
       :changed="changed"
       :valid="valid"
-      :model="modelToEdit"
+      :modelToEdit="modelToEdit"
     />
   </v-form>
 </template>
@@ -35,8 +36,8 @@ export default class EditForm extends Vue {
   reset () {
     if (this.createModelToEdit) {
       this.modelToEdit = this.createModelToEdit(this.model)
-    } else {
-      this.modelToEdit = this.model
+    } else if (this.model) {
+      this.modelToEdit = this.model.cloneForEdit()
     }
     this.lastJson = this.json
   }

package/src/components/form/EditModal.vue

@@ -1,6 +1,7 @@
 <template>
   <a-modal
     :title="title"
+    :beforeClose="beforeClose"
     :show.sync="show_"
     v-bind="$attrs"
   >
@@ -10,16 +11,18 @@
 
     <edit-form
       v-if="show_"
+      ref="form"
       :model="model"
+      :createModelToEdit="createModelToEdit"
     >
-      <template #fields>
+      <template #form="{modelToEdit, changed, valid}">
         <slot
-          name="fields"
-          :model="model"
+          name="form"
+          :modelToEdit="modelToEdit"
+          :changed="changed"
+          :valid="valid"
         />
-      </template>
 
-      <template #default="{changed, valid}">
         <a-row
           class="mt-8 mb-1 pb-1 gap-4"
           right
@@ -31,25 +34,14 @@
             Schließen
           </v-btn>
 
-          <a-row gap="2">
-            <v-btn
-              small
-              :disabled="!changed || !valid"
-              color="green white--text"
-              @click="save"
-            >
-              Speichern
-            </v-btn>
-
-            <v-icon
-              v-if="changed"
-              small
-              text
-              @click="reset"
-            >
-              {{ undoIcon }}
-            </v-icon>
-          </a-row>
+          <edit-form-buttons
+            :changed="changed"
+            :valid="valid"
+            small
+            :has="{reset: !!modelToEdit.id}"
+            @save="$emit('save', modelToEdit, ignoreChangesOnClose)"
+            @reset="$refs.form.reset()"
+          />
         </a-row>
       </template>
     </edit-form>
@@ -59,21 +51,26 @@
 
 <script>
 import { Component, Vue, Watch } from '@a-vue'
-import { mdiRotateLeft} from '@mdi/js'
+import { DialogEvent } from '@a-vue/events'
 
 @Component({
-  props: ['model', 'title', 'show']
+  props: ['model', 'createModelToEdit', 'title', 'show']
 })
 export default class EditModal extends Vue {
   show_ = false
+  ignoreChangesOnClose_ = false
 
-  undoIcon = mdiRotateLeft
+  created () {
+    if (this.show) { // open on create with v-show
+      this.open()
+    }
+  }
 
   /**
    * visiblility changes from outside
    * this will trigger the show_ watcher,
    * forward the change to the modal and
-   * later emit a open/close event
+   * later emit an open/close event
    */
   @Watch('show')
   showChanged () {
@@ -90,7 +87,6 @@ export default class EditModal extends Vue {
   @Watch('show_')
   show_Changed () {
     if (this.show_) {
-      this.reset()
       this.$emit('open')
     } else {
       this.$emit('close')
@@ -101,16 +97,35 @@ export default class EditModal extends Vue {
     this.show_ = true
   }
 
-  close () {
-    this.show_ = false
+  async beforeClose () {
+    // run only if show_ is true to prevent double checks with a-modal
+    if (this.show_ && this.$refs.form.changed && !this.ignoreChangesOnClose_) {
+      const result = await this.$events.dispatch(new DialogEvent(DialogEvent.SHOW, {
+        title: 'Änderungen verwerfen?',
+        message: 'Im Formular sind nicht gespeicherte Änderungen. Sollen diese verworfen werden?',
+        yesButton: 'Verwerfen'
+      }))
+      if (result !== DialogEvent.RESULT_YES) {
+        return false
+      }
+    }
+    return true
   }
 
-  reset () {
-    this.$emit('reset')
+  async close () {
+    const result = await this.beforeClose()
+    if (!result) {
+      return
+    }
+
+    this.show_ = false
   }
 
-  save () {
-    this.$emit('save')
+  /**
+   * hook to allow to leave a just created (saved) model
+   */
+  ignoreChangesOnClose () {
+    this.ignoreChangesOnClose_ = true
   }
 }
 </script>

package/src/events.js

@@ -2,3 +2,4 @@ export { LoadingEvent } from './components/loading-indicator/LoadingEvent'
 export { SaveEvent } from './components/save-indicator/SaveEvent'
 export { AlertEvent } from './components/alert/AlertEvent'
 export { DialogEvent } from './components/dialog/DialogEvent'
+export { FlyingContextEvent } from './components/flying-context/FlyingContextEvent'

package/src-admin/bootstrap.js

@@ -1,5 +1,6 @@
 import './config/event-bus'
 import './config/components'
+import './directives'
 
 import { translationPlugin } from '@a-admin/plugins/translation/TranslationPlugin'
 import { apiResourcesPlugin } from '@a-vue/plugins/api-resources/ApiResourcesPlugin'

package/src-admin/components/App.vue

@@ -91,6 +91,8 @@
       </v-list>
     </v-navigation-drawer>
 
+    <flying-context-container />
+
     <v-app-bar
       app
       flat
@@ -142,12 +144,14 @@ import { appConfig } from '@a-admin/config/AppConfig'
 import { sleep } from '@a-vue/utils/timeout'
 import AppBarButtons from './app/AppBarButtons'
 import AppBarTitleContainer from './app/AppBarTitleContainer'
+import FlyingContextContainer from './FlyingContextContainer'
 import '../styles.scss'
 
 @Component({
   components: {
     AppBarButtons,
-    AppBarTitleContainer
+    AppBarTitleContainer,
+    FlyingContextContainer
   }
 })
 export default class App extends Vue {

package/src-admin/components/FlyingContext.vue

@@ -0,0 +1,77 @@
+<template>
+  <div class="flyingContext">
+    <div :class="contextId">
+      <slot v-if="isVisible" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { Component, Watch, Vue } from '@a-vue'
+import { FlyingContextEvent } from '@a-vue/events'
+import { randomCssClass } from '@a-vue/utils/random'
+
+@Component({
+  props: [{show: false}]
+})
+export default class FlyingContext extends Vue {
+  isVisible = false
+  contextId = randomCssClass(10)
+
+  created () {
+    this.$events.on(FlyingContextEvent.HIDE_ALL, this.onHide)
+  }
+
+  mounted () {
+    if (this.show) {
+      this.showChanged()
+    }
+  }
+
+  @Watch('show')
+  showChanged () {
+    if (this.isVisible === this.show) {
+      return
+    }
+
+    this.isVisible = this.show
+
+    if (this.isVisible) {
+      const container = this.getSidebarContainer()
+      container.appendChild(this.getContent())
+    } else {
+      this.$el.appendChild(this.getContent())
+    }
+  }
+
+  destroyed () {
+    const container = this.getSidebarContainer()
+    const el = this.getContent()
+    if (container.contains(el)) {
+      container.removeChild(el)
+    }
+
+    this.$events.off(FlyingContextEvent.HIDE_ALL, this.onHide)
+  }
+
+  onHide () {
+    if (this.isVisible) {
+      this.$el.appendChild(this.getContent())
+      this.isVisible = false
+      this.$emit('hide')
+    }
+  }
+
+  getContent () {
+    return document.querySelector('.' + this.contextId)
+  }
+
+  getSidebarContainer () {
+    return document.getElementById('flyingContextContainer__children')
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+</style>

package/src-admin/components/FlyingContextContainer.vue

@@ -0,0 +1,85 @@
+<template>
+  <div
+    id="flyingContextContainer"
+    :class="{visible}"
+  >
+    <a
+      href=""
+      @click.prevent="hide"
+    >close</a>
+
+    <br>
+    <br>
+
+    <div id="flyingContextContainer__children" />
+  </div>
+</template>
+
+<script>
+import { Component, Vue } from '@a-vue'
+import { FlyingContextEvent } from '@a-vue/events'
+
+@Component({
+  props: []
+})
+export default class FlyingContextContainer extends Vue {
+  visible = false
+
+  mounted () {
+    this.mutationWatcher = new MutationObserver(this.domChanged)
+    this.mutationWatcher.observe(this.getChildrenContainer(), { childList: true })
+
+    window.addEventListener('mousedown', this.onClickOutside)
+  }
+
+  domChanged () {
+    const container = this.getChildrenContainer()
+    this.visible = !!container.children.length
+  }
+
+  hide () {
+    if (this.visible) {
+      this.$events.dispatch(new FlyingContextEvent(FlyingContextEvent.HIDE_ALL))
+    }
+  }
+
+  getChildrenContainer () {
+    return this.$el.querySelector('#flyingContextContainer__children')
+  }
+
+  onClickOutside (e) {
+    // check if trigger is clicked
+    let parent = e.target
+    while (parent) {
+      if (parent.classList.contains('flyingContextTrigger')) {
+        return
+      }
+      parent = parent.parentElement
+    }
+
+    // check if flying context ist clicked
+    if (!this.$el.contains(e.target)) {
+      this.hide()
+    }
+  }
+}
+</script>
+
+
+<style lang="scss" scoped>
+#flyingContextContainer {
+  position: fixed;
+  z-index: 200;
+  right: 0;
+  width: 60vw;
+  height: 80vh;
+  top: 10vh;
+  background: rgba($color: white, $alpha: .6);
+  border: 1px solid black;
+  transition: right .2s;
+
+  &:not(.visible) {
+    right: -80vw;
+  }
+}
+</style>

package/src-admin/components/form/EditFormButtons.vue

@@ -2,7 +2,7 @@
   <a-row gap="2">
     <v-btn
       :small="small"
-      :disabled="!changed || !valid"
+      :disabled="($has.reset && !changed) || !valid"
       color="green white--text"
       @click="$emit('save')"
     >
@@ -10,7 +10,7 @@
     </v-btn>
 
     <v-icon
-      v-if="changed"
+      v-if="$has.reset && changed"
       :small="small"
       text
       title="Formular zurücksetzen"
@@ -33,6 +33,8 @@ import { mdiRotateLeft} from '@mdi/js'
   ]
 })
 export default class EditFormButtons extends Vue {
+  $hasOptions = ['reset']
+
   undoIcon = mdiRotateLeft
 }
 </script>

package/src-admin/components/index.js

@@ -7,6 +7,7 @@ import DetailContent from './detail/DetailContent'
 import DetailMeta from './detail/DetailMeta'
 import DetailProperty from './detail/DetailProperty'
 import DetailTitle from './detail/DetailTitle'
+import FlyingContext from './FlyingContext.vue'
 import EditFormButtons from './form/EditFormButtons'
 import RemoveButton from './form/RemoveButton'
 import ListCard from './list/ListCard'
@@ -17,10 +18,7 @@ import ListTitle from './list/ListTitle'
 import ListView from './list/ListView'
 import ModelCount from './model/ModelCount'
 import ModelIcon from './model/ModelIcon'
-import CreatePage from './pages/CreatePage'
-import DetailPage from './pages/DetailPage'
 import EditPage from './pages/EditPage'
-import ListPage from './pages/ListPage'
 import Start from './Start.vue'
 
 Vue.component('ListCard', ListCard)
@@ -29,9 +27,6 @@ Vue.component('ListContent', ListContent)
 Vue.component('ListMeta', ListMeta)
 Vue.component('ListTitle', ListTitle)
 Vue.component('ListView', ListView)
-Vue.component('ListPage', ListPage)
-
-Vue.component('CreatePage', CreatePage)
 
 Vue.component('EditPage', EditPage)
 Vue.component('EditFormButtons', EditFormButtons)
@@ -43,7 +38,6 @@ Vue.component('ModelIcon', ModelIcon)
 Vue.component('DetailContent', DetailContent)
 Vue.component('DetailMeta', DetailMeta)
 Vue.component('DetailTitle', DetailTitle)
-Vue.component('DetailPage', DetailPage)
 Vue.component('DetailProperty', DetailProperty)
 Vue.component('DetailColumn', DetailColumn)
 
@@ -51,3 +45,4 @@ Vue.component('AppBarButton', AppBarButton)
 Vue.component('AppBarTitle', AppBarTitle)
 
 Vue.component('Start', Start)
+Vue.component('FlyingContext', FlyingContext)

package/src-admin/components/list/ListView.vue

@@ -28,7 +28,11 @@
           <a-table-row
             v-for="model in models_"
             :key="model.id"
-            :class="getModelClass(model)"
+            v-flying-context-trigger="hasFlyingContext"
+            :class="{selectable: hasFlyingContext}"
+            v-bind="getRowAttributes(model)"
+            v-on="getRowListeners(model)"
+            @click="$emit('flyingContext', model)"
           >
             <v-icon
               v-if="$has.icon"
@@ -50,7 +54,6 @@
         <div
           v-for="model in models_"
           :key="model.id"
-          :class="getModelClass(model)"
         >
           <slot
             name="model"
@@ -76,7 +79,7 @@ import { ListViewMixin } from '@a-vue/components/list/ListViewMixin'
 import { LoadingEvent } from '@a-vue/events'
 
 @Component({
-  props: ['modelClass']
+  props: ['rowAttributes', 'rowListeners']
 })
 export default class ListView extends Mixins(ListViewMixin) {
   $hasOptions = ['icon']
@@ -93,8 +96,19 @@ export default class ListView extends Mixins(ListViewMixin) {
     this.$emit('update:isLoading', this.isLoading)
   }
 
-  getModelClass (model) {
-    return this.modelClass && this.modelClass(model)
+  getRowAttributes (model) {
+    if (typeof this.rowAttributes === 'function') {
+      return this.rowAttributes(model)
+    }
+    return this.rowAttributes
+  }
+
+  getRowListeners (model) {
+    return (this.rowListeners && this.rowListeners(model)) || {}
+  }
+
+  get hasFlyingContext () {
+    return !!this.$listeners.flyingContext
   }
 
   setFilter (name, value) {

package/src-admin/components/pages/EditPage.vue

@@ -4,9 +4,10 @@
     :model="model"
     :createModelToEdit="createModelToEdit"
   >
-    <template #default="{model, changed, valid}">
+    <template #form="{modelToEdit, changed, valid}">
       <slot
-        :model="model"
+        name="form"
+        :modelToEdit="modelToEdit"
         :changed="changed"
         :valid="valid"
       />
@@ -14,7 +15,8 @@
       <edit-form-buttons
         :changed="changed"
         :valid="valid"
-        @save="$emit('save', model, ignoreChangesOnRouteChange)"
+        :has="{reset: !!modelToEdit.id}"
+        @save="$emit('save', modelToEdit, ignoreChangesOnRouteChange)"
         @reset="$refs.form.reset()"
       />
     </template>
@@ -53,6 +55,9 @@ export default class EditPage extends Vue {
     this.unregisterRouterHook()
   }
 
+  /**
+   * hook to allow to leave a just created (saved) model
+   */
   ignoreChangesOnRouteChange () {
     this.ignoreChangesOnRouteChange_ = true
   }

package/src-admin/components/routes/DataRouteMixin.js

@@ -7,6 +7,7 @@ Component.registerHooks([
 
 let onLoadCallback = () => {}
 let routerHookCalled = false
+let lastResult = null // cache last result because of hmr reload
 
 function onLoad (callback) {
   onLoadCallback = callback
@@ -52,24 +53,32 @@ export class DataRouteMixin extends Vue {
 
   /**
    * triggered both, if route name or route params change
-   */
-  @Watch('$route.params')
-  async routeParamsChanged () {
-    if (routerHookCalled) {
-      return
-    }
+   @Watch('$route.params')
+   async routeParamsChanged () {
+     if (routerHookCalled) {
+       return
+     }
 
-    if (!this.drm_isLoaded) {
-      const result = await load(this.$route)
+     if (!this.drm_isLoaded) {
+       const result = await load(this.$route)
 
-      if (result !== false) {
-        this.drm_onLoad(result)
-        this.drm_isLoaded = true
-      }
-    }
-  }
+       if (result !== false) {
+         this.drm_onLoad(result)
+         this.drm_isLoaded = true
+       }
+     }
+   }
+   */
 
   drm_onLoad (result) {
     onLoadCallback(this, result)
+    lastResult = result
+  }
+
+  created () {
+    // hmr reload creates vm but not triggers route enter
+    if (!routerHookCalled) {
+      onLoadCallback(this, lastResult)
+    }
   }
 }

package/src-admin/config/routing.js

@@ -1,7 +1,3 @@
-import CreateRoute from '@a-admin/components/routes/CreateRoute'
-import DetailRoute from '@a-admin/components/routes/DetailRoute'
-import EditRoute from '@a-admin/components/routes/EditRoute'
-import ListRoute from '@a-admin/components/routes/ListRoute'
 import { routeConfigPlugin } from '@a-vue/plugins/route-config/RouteConfigPlugin'
 
 export default routeConfigPlugin
@@ -9,13 +5,6 @@ export default routeConfigPlugin
     linkActiveClass: 'active'
   })
 
-  .defaultComponents({
-    list: ListRoute,
-    new: CreateRoute,
-    detail: DetailRoute,
-    edit: EditRoute
-  })
-
   .defaultBreadcrumbTitles({
     edit: 'Bearbeiten',
     new: 'Neu'