Merge pull request #26 from socialblue/develop

Develop
socialblue · Mar 4, 2020 · e326676 · e326676
2 parents f680782 + 216164f
commit e326676
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 26 deletions.
diff --git a/public/app.js b/public/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,4 +1,4 @@
 {
- "/app.js": "/app.js?id=f6f83b8a5747597b9511",
+ "/app.js": "/app.js?id=76e4de08a7f359299cba",
  "/app.css": "/app.css?id=a45caf0b385ad40f02c2"
 }
diff --git a/resources/assets/js/components/query-block.vue b/resources/assets/js/components/query-block.vue
@@ -26,7 +26,10 @@
 
  methods: {
  showExplainDialog() {
- window.EventBus.$emit('show-explain-dialog', [this.time, this.timeKey])
+ window.EventBus.$emit('show-explain-dialog', {
+ time: this.time,
+ timeKey: this.timeKey,
+ })
  },
 
  showExecuteDialog() {
@@ -35,6 +38,13 @@
  timeKey: this.timeKey,
  sql: this.sql
  })
+ },
+
+ clipboardSuccess() {
+ this.showNotification = true;
+ setTimeout(() => {
+ this.showNotification = false;
+ }, 3000);
  }
  },
 
@@ -105,7 +115,7 @@
  </nav>
  </transition>
 
- <a class="card-footer-item" title="copy sql" v-clipboard="format(sql)" v-clipboard:success="() => {showNotification = true}">
+ <a class="card-footer-item" title="copy sql" v-clipboard="format(sql)" v-clipboard:success="clipboardSuccess">
  <span class="material-icons button is-small">
  file_copy
  </span>

diff --git a/resources/assets/js/components/query-explain.vue b/resources/assets/js/components/query-explain.vue
@@ -25,16 +25,6 @@
  ExplainPart
  },
 
- props: {
- time: {
- type: Number
- },
-
- timeKey: {
- type: Number
- }
- },
-
  data() {
  return {
  explainParts: [],
@@ -62,12 +52,15 @@
  mounted() {
 
  window.EventBus.$on(`show-explain-dialog`, (data)=> {
- if (data[0] === this.time && data[1] === this.timeKey) {
- this.loadExplainParts();
- this.$nextTick().then(() => {
- this.active = true;
- });
- }
+
+ this.time = data.time;
+ this.timeKey = data.timeKey;
+
+ this.loadExplainParts();
+ this.$nextTick().then(() => {
+ this.active = true;
+ });
+
  });
  }
  }

diff --git a/resources/assets/js/view/index.vue b/resources/assets/js/view/index.vue
@@ -13,6 +13,7 @@
  </p>
  </nav>
  <query-execute></query-execute>
+ <query-explain></query-explain>
 
  <nav class="panel" v-for="(queries, time) in cachedKeys">
  <p class="panel-heading">
@@ -35,8 +36,6 @@
  :execution-time="query.time"
  >
  </query-block>
-
- <query-explain :time-key="key" :time="+time"></query-explain>
  </div>
  </div>
  </nav>

diff --git a/src/DataListener/QueryListener.php b/src/DataListener/QueryListener.php
@@ -33,20 +33,26 @@ public static function listen(QueryExecuted $query) {
  static function ($trace) {
  return isset($trace['file']) &&
  strpos($trace['file'], 'vendor/laravel/framework/src') === false &&
- isset($trace['object']) &&
- property_exists($trace['object'], 'model');
+ isset($trace['object']);
+
  }
  );
 
  array_walk($possibleTraces, static function (&$trace) {
  if (method_exists($trace['object'], 'getModel')) {
- $trace['model'] = $trace['object']->getModel();
+ $a = $trace['object']->getModel();
+ if (is_string($a)) {
+ $trace['model'] = $a;
+ } else {
+ $trace['model'] = get_class($a);
+ }
  }
  unset($trace['object']);
+ unset($trace['args']);
  });
 
  $data[time()][] = [
- 'backtrace' => debug_backtrace(0, 25),
+ 'backtrace' => $possibleTraces,
  'sql' => QueryBuilderHelper::combineQueryAndBindings($query->sql, $query->bindings),
  'rawsql' => $query->sql,
  'bindings' => $query->bindings,