Commit 566ee145 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'remove-old-isobject' into 'master'

Replace old isObject for underscore methods

Closes #30317

See merge request !11124
parents 1daa133c 269c0fe0
<script> <script>
import Timeago from 'timeago.js'; import Timeago from 'timeago.js';
import _ from 'underscore';
import '../../lib/utils/text_utility'; import '../../lib/utils/text_utility';
import ActionsComponent from './environment_actions.vue'; import ActionsComponent from './environment_actions.vue';
import ExternalUrlComponent from './environment_external_url.vue'; import ExternalUrlComponent from './environment_external_url.vue';
...@@ -59,7 +60,7 @@ export default { ...@@ -59,7 +60,7 @@ export default {
hasLastDeploymentKey() { hasLastDeploymentKey() {
if (this.model && if (this.model &&
this.model.last_deployment && this.model.last_deployment &&
!this.$options.isObjectEmpty(this.model.last_deployment)) { !_.isEmpty(this.model.last_deployment)) {
return true; return true;
} }
return false; return false;
...@@ -310,8 +311,8 @@ export default { ...@@ -310,8 +311,8 @@ export default {
*/ */
deploymentHasUser() { deploymentHasUser() {
return this.model && return this.model &&
!this.$options.isObjectEmpty(this.model.last_deployment) && !_.isEmpty(this.model.last_deployment) &&
!this.$options.isObjectEmpty(this.model.last_deployment.user); !_.isEmpty(this.model.last_deployment.user);
}, },
/** /**
...@@ -322,8 +323,8 @@ export default { ...@@ -322,8 +323,8 @@ export default {
*/ */
deploymentUser() { deploymentUser() {
if (this.model && if (this.model &&
!this.$options.isObjectEmpty(this.model.last_deployment) && !_.isEmpty(this.model.last_deployment) &&
!this.$options.isObjectEmpty(this.model.last_deployment.user)) { !_.isEmpty(this.model.last_deployment.user)) {
return this.model.last_deployment.user; return this.model.last_deployment.user;
} }
return {}; return {};
...@@ -338,8 +339,8 @@ export default { ...@@ -338,8 +339,8 @@ export default {
*/ */
shouldRenderBuildName() { shouldRenderBuildName() {
return !this.model.isFolder && return !this.model.isFolder &&
!this.$options.isObjectEmpty(this.model.last_deployment) && !_.isEmpty(this.model.last_deployment) &&
!this.$options.isObjectEmpty(this.model.last_deployment.deployable); !_.isEmpty(this.model.last_deployment.deployable);
}, },
/** /**
...@@ -380,7 +381,7 @@ export default { ...@@ -380,7 +381,7 @@ export default {
*/ */
shouldRenderDeploymentID() { shouldRenderDeploymentID() {
return !this.model.isFolder && return !this.model.isFolder &&
!this.$options.isObjectEmpty(this.model.last_deployment) && !_.isEmpty(this.model.last_deployment) &&
this.model.last_deployment.iid !== undefined; this.model.last_deployment.iid !== undefined;
}, },
...@@ -410,21 +411,6 @@ export default { ...@@ -410,21 +411,6 @@ export default {
}, },
}, },
/**
* Helper to verify if certain given object are empty.
* Should be replaced by lodash _.isEmpty - https://lodash.com/docs/4.17.2#isEmpty
* @param {Object} object
* @returns {Bollean}
*/
isObjectEmpty(object) {
for (const key in object) { // eslint-disable-line
if (hasOwnProperty.call(object, key)) {
return false;
}
}
return true;
},
methods: { methods: {
onClickFolder() { onClickFolder() {
eventHub.$emit('toggleFolder', this.model, this.folderUrl); eventHub.$emit('toggleFolder', this.model, this.folderUrl);
......
/* eslint-disable func-names, space-before-function-paren, no-var, one-var, one-var-declaration-per-line, prefer-rest-params, max-len, vars-on-top, wrap-iife, no-unused-vars, quotes, no-shadow, no-cond-assign, prefer-arrow-callback, no-return-assign, no-else-return, camelcase, comma-dangle, no-lonely-if, guard-for-in, no-restricted-syntax, consistent-return, prefer-template, no-param-reassign, no-loop-func, no-mixed-operators */ /* eslint-disable func-names, space-before-function-paren, no-var, one-var, one-var-declaration-per-line, prefer-rest-params, max-len, vars-on-top, wrap-iife, no-unused-vars, quotes, no-shadow, no-cond-assign, prefer-arrow-callback, no-return-assign, no-else-return, camelcase, comma-dangle, no-lonely-if, guard-for-in, no-restricted-syntax, consistent-return, prefer-template, no-param-reassign, no-loop-func, no-mixed-operators */
/* global fuzzaldrinPlus */ /* global fuzzaldrinPlus */
import { isObject } from './lib/utils/type_utility';
var GitLabDropdown, GitLabDropdownFilter, GitLabDropdownRemote; var GitLabDropdown, GitLabDropdownFilter, GitLabDropdownRemote;
...@@ -93,7 +94,7 @@ GitLabDropdownFilter = (function() { ...@@ -93,7 +94,7 @@ GitLabDropdownFilter = (function() {
// { prop: 'def' } // { prop: 'def' }
// ] // ]
// } // }
if (gl.utils.isObject(data)) { if (isObject(data)) {
results = {}; results = {};
for (key in data) { for (key in data) {
group = data[key]; group = data[key];
...@@ -396,7 +397,7 @@ GitLabDropdown = (function() { ...@@ -396,7 +397,7 @@ GitLabDropdown = (function() {
html = [this.noResults()]; html = [this.noResults()];
} else { } else {
// Handle array groups // Handle array groups
if (gl.utils.isObject(data)) { if (isObject(data)) {
html = []; html = [];
for (name in data) { for (name in data) {
groupData = data[name]; groupData = data[name];
......
/* eslint-disable func-names, space-before-function-paren, wrap-iife, no-var, no-param-reassign, no-cond-assign, no-return-assign, max-len */ // eslint-disable-next-line import/prefer-default-export
(function() { export const isObject = obj => obj && obj.constructor === Object;
(function(w) {
var base;
if (w.gl == null) {
w.gl = {};
}
if ((base = w.gl).utils == null) {
base.utils = {};
}
return w.gl.utils.isObject = function(obj) {
return (obj != null) && (obj.constructor === Object);
};
})(window);
}).call(window);
...@@ -59,7 +59,6 @@ import './lib/utils/datetime_utility'; ...@@ -59,7 +59,6 @@ import './lib/utils/datetime_utility';
import './lib/utils/notify'; import './lib/utils/notify';
import './lib/utils/pretty_time'; import './lib/utils/pretty_time';
import './lib/utils/text_utility'; import './lib/utils/text_utility';
import './lib/utils/type_utility';
import './lib/utils/url_utility'; import './lib/utils/url_utility';
// u2f // u2f
......
---
title: Remove unused code and uses underscore
merge_request:
author:
require('~/gl_dropdown'); require('~/gl_dropdown');
require('~/lib/utils/type_utility');
require('~/blob/create_branch_dropdown'); require('~/blob/create_branch_dropdown');
require('~/blob/target_branch_dropdown'); require('~/blob/target_branch_dropdown');
......
require('~/gl_dropdown'); require('~/gl_dropdown');
require('~/lib/utils/type_utility');
require('~/blob/create_branch_dropdown'); require('~/blob/create_branch_dropdown');
require('~/blob/target_branch_dropdown'); require('~/blob/target_branch_dropdown');
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
require('~/gl_dropdown'); require('~/gl_dropdown');
require('~/lib/utils/common_utils'); require('~/lib/utils/common_utils');
require('~/lib/utils/type_utility');
require('~/lib/utils/url_utility'); require('~/lib/utils/url_utility');
(() => { (() => {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/* global IssuableContext */ /* global IssuableContext */
/* global LabelsSelect */ /* global LabelsSelect */
require('~/lib/utils/type_utility');
require('~/gl_dropdown'); require('~/gl_dropdown');
require('select2'); require('select2');
require('vendor/jquery.nicescroll'); require('vendor/jquery.nicescroll');
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
/* global Project */ /* global Project */
require('select2/select2.js'); require('select2/select2.js');
require('~/lib/utils/type_utility');
require('~/gl_dropdown'); require('~/gl_dropdown');
require('~/api'); require('~/api');
require('~/project_select'); require('~/project_select');
......
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
require('~/gl_dropdown'); require('~/gl_dropdown');
require('~/search_autocomplete'); require('~/search_autocomplete');
require('~/lib/utils/common_utils'); require('~/lib/utils/common_utils');
require('~/lib/utils/type_utility');
require('vendor/fuzzaldrin-plus'); require('vendor/fuzzaldrin-plus');
(function() { (function() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment