conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
if (cache.concept) {
setPreviewsForVertex(cache, this.workspaceId);
} else console.error('Unable to attach concept to vertex', cache.properties._conceptType);
=======
if (cache.concept) {
setPreviewsForVertex(cache);
} else consol... |
<<<<<<<
import logger from 'logger'
=======
import { Observable } from 'rxjs'
>>>>>>>
import logger from 'logger'
import { Observable } from 'rxjs' |
<<<<<<<
const AdvancedOptions = ({ onChange, account, transaction, status }: Props) => {
invariant(transaction.family === 'ethereum', 'AdvancedOptions: ethereum family expected')
const onGasLimitChange = useCallback(
(str: string) => {
const bridge = getAccountBridge(account)
let userGasLimit = Big... |
<<<<<<<
const logCmds = !__DEV__ || process.env.DEBUG_COMMANDS
const logDb = !__DEV__ || process.env.DEBUG_DB
const logClicks = !__DEV__ || process.env.DEBUG_CLICK_ELEMENT
=======
>>>>>>>
const logCmds = !__DEV__ || process.env.DEBUG_COMMANDS
const logDb = !__DEV__ || process.env.DEBUG_DB
<<<<<<<
// tracks the us... |
<<<<<<<
<Price
withEquality
withActivityColor="wallet"
from={from}
to={to}
color="graphite"
fontSize={3}
placeholder={<NoData />}
/>
=======
<Ellipsis>
<Price
withEquality
... |
<<<<<<<
libcoreScanAccounts,
libcoreSignAndBroadcast,
=======
listenDevices,
uninstallApp,
installOsuFirmware,
installFinalFirmware,
installMcu,
>>>>>>>
libcoreScanAccounts,
libcoreSignAndBroadcast,
listenDevices,
uninstallApp,
installOsuFirmware,
installFinalFirmware,
installMcu, |
<<<<<<<
if (isStandard) {
if (balanceZerosCount === 0) {
// first zero account will emit one account as opportunity to create a new account..
const currentBlock = await lazyCurrentBlock()
const accountId = `${currency.id}_${address}`
const account: Accou... |
<<<<<<<
accounts: flattenAccounts(accountsSelector(state), {
enforceHideEmptySubAccounts: true,
}).filter(a => getAccountCurrency(a) === findCurrencyByTicker(props.match.params.assetTicker)),
=======
accounts: flattenSortAccountsEnforceHideEmptyTokenSelector(state).filter(
a =>
(a.type === 'Accoun... |
<<<<<<<
import { getCurrencyColor } from 'helpers/getCurrencyColor'
import { findCurrencyByTicker } from '@ledgerhq/live-common/lib/currencies'
=======
import { getCurrencyColor } from '@ledgerhq/live-common/lib/currencies'
>>>>>>>
import { getCurrencyColor } from 'helpers/getCurrencyColor' |
<<<<<<<
error: ?Error,
appsList: LedgerScriptParams[],
appsLoaded: boolean,
=======
error: ?Error,
appsList: LedgerScriptParams[] | Array<*>,
>>>>>>>
error: ?Error,
appsList: LedgerScriptParams[],
appsLoaded: boolean,
<<<<<<<
this.setState({ status: 'error', error: err, mode: 'home' })
======... |
<<<<<<<
accountDistribution: accounts.map(a => ({
account: a,
currency: getAccountCurrency(a),
distribution: a.balance.div(total).toFixed(2),
amount: a.balance,
countervalue: calculateCountervalueSelector(state)(getAccountCurrency(a), a.balance),
})),
=======
accountDistribut... |
<<<<<<<
<<<<<<< HEAD
/**
* @constructor
*/
window.fsLightboxObject = function () {
=======
"use strict";
=======
>>>>>>>
<<<<<<<
function fsLightboxObject() {
>>>>>>> animations
=======
window.fsLightboxObject = function () {
>>>>>>>
window.fsLightboxObject = function () {
<<<<<<<
<<<<<<< HEAD
rem... |
<<<<<<<
client.v[vId] = {
directory: msg.data
=======
if (!isPathSane(msg.data, true)) return log.log(log.socket(remoteIP, remotePort), " Invalid update request: " + msg.data);
clients[cookie] = {
directory: ms... |
<<<<<<<
if (enter && el.attr("data-type") === "folder") {
=======
var dropZone = el.parents(".view").find(".dropzone");
if (enter && el.parents(".data-row").attr("data-type") === "folder") {
>>>>>>>
var dropZone = el.parents(".view").fin... |
<<<<<<<
hasServer = null,
ready = false,
=======
>>>>>>>
<<<<<<<
filepath = URI.match(/\?([\$~_])\/([\s\S]+)$/);
if (filepath[1] === "$") {
shortLink = true;
filepath = addFilePath(db.shortlinks[filepath[2]]);
} else if (filepath[1] === "~" || filepath[1] === "_") {
... |
<<<<<<<
view.find("#content").replaceClass(navRegex, (nav === "forward") ? "back" : "forward");
view.find("#newcontent").setTransitionClass(navRegex, "center");
=======
view.find("#content").attr("class", (droppy.animDirection === "forward") ? "back" : "forward");
... |
<<<<<<<
// auto height visualizer
if(new Date().getSeconds() % 1 == 0){ // refreshing every 1 sec
// jquery iframe auto height plugin does not work in this place
// jQuery('#visualizationContainer > iframe').iframeAutoHeight();
$('#visualizationContainer > iframe').each(function(idx, el){
... |
<<<<<<<
console.error(error);
res.json({ code: 500, message: "An error has occurred in the authorization process", error: error.message });
=======
res.status(500).json({ message: "An error has occurred in the authorization process", error });
>>>>>>>
res.status(500).json(... |
<<<<<<<
triggerReady,
initElements
=======
triggerLifecycle,
triggerCreated,
triggerDetached
>>>>>>>
triggerCreated,
initElements
<<<<<<<
import version from './version';
=======
// The observer listening to document changes.
var documentObserver;
/**
* Initialises a set of elements.
*
* @param... |
<<<<<<<
const propData = getNamespacedPropData(elem, name);
const attributeName = opts.attribute;
=======
const propData = data(elem, `api/property/${name}`);
const attributeName = opts.attribute === true ? dashCase(name) : opts.attribute;
>>>>>>>
const propData = getNamespacedPropData(elem, name... |
<<<<<<<
import dashCase from './util/dash-case';
import debounce from './util/debounce';
=======
import dashCase from './utils/dash-case';
import debounce from './utils/debounce';
import defaults from './defaults';
>>>>>>>
import dashCase from './util/dash-case';
import debounce from './util/debounce';
import defaul... |
<<<<<<<
import {createNativePropertyDescriptor} from '../lifecycle/props-init';
=======
import initProps from '../lifecycle/props-init';
import { isFunction } from '../util/isType';
>>>>>>>
import { createNativePropertyDescriptor } from '../lifecycle/props-init';
import { isFunction } from '../util/isType';
<<<<<<<... |
<<<<<<<
function syncPropsToAttrs (elem) {
const props = elem.constructor.props;
Object.keys(props).forEach((propName) => {
const prop = props[propName];
syncPropToAttr(elem, prop, propName, true);
});
}
// Ensures that definitions passed as part of the constructor are functions
// that return property d... |
<<<<<<<
=======
// Custom Elements v1
function Component (...args) {
const elem = typeof Reflect === 'object'
? Reflect.construct(HTMLElement, args, this.constructor)
: HTMLElement.call(this, args[0]);
callConstructor(elem);
>>>>>>>
<<<<<<<
Object.defineProperties(Component, {
// Skate
id: prop({ va... |
<<<<<<<
import './unit/api/render';
=======
import './unit/api/state';
import './unit/attributes';
>>>>>>>
import './unit/api/state'; |
<<<<<<<
args.forEach(function (arg) {
const isInDom = elementContains(document, arg);
walkTree(arg, function (descendant) {
const component = findElementInRegistry(descendant);
if (component) {
component[created](descendant);
if (isInDom) {
component[attached](descendant)... |
<<<<<<<
if (cache.concept) {
setPreviewsForVertex(cache, this.workspaceId);
} else console.error('Unable to attach concept to vertex', cache.properties._conceptType);
=======
if (cache.concept) {
setPreviewsForVertex(cache);
} else consol... |
<<<<<<<
const { definedAttribute, events, created, observedAttributes, props } = Ctor;
=======
const { definedAttribute, created, observedAttributes, props, ready, renderedAttribute } = Ctor;
const renderer = Ctor[$renderer];
>>>>>>>
const { definedAttribute, created, observedAttributes, props } = Ct... |
<<<<<<<
function isEmpty (value) {
return value == null;
}
function normaliseProp (prop) {
if (typeof prop === 'object') {
prop = assignSafe({}, prop);
} else {
prop = { type: prop };
}
return prop;
}
function normaliseAttr (prop, name) {
var attr = prop.attr;
return attr === true ? dashCase(nam... |
<<<<<<<
=======
>>>>>>>
<<<<<<<
// _bytecode,
=======
// _bytecode,
>>>>>>>
// _bytecode,
<<<<<<<
"V1", [], [], name, symbol,
{
=======
"V1",
... |
<<<<<<<
// !json templates.index
// !code vendor/mustache.js/mustache.js
=======
//!code vendor/date/date.js
>>>>>>>
// !json templates.index
// !code vendor/mustache.js/mustache.js
//!code vendor/date/date.js
<<<<<<<
return [doc, templates.index.head + "http://localhost:5984/io/_design/io/_show/... |
<<<<<<<
["setDocs","setChrome","setElectron"],
=======
"serviceWorker",
["setDocs","setChrome"],
>>>>>>>
"serviceWorker",
["setDocs","setChrome","setElectron"], |
<<<<<<<
.classed('cr-' + uv.util.formatClassName(self.categories[idx]), true)
.style('fill', 'none')
=======
.classed('cr_' + uv.util.formatClassName(self.categories[idx]), true)
.style('fill', self.config.label.showlabel ? uv.util.getColorBand(self.config, idx) : 'none')
>>>>>>>
.classed('cr-' + uv.util.f... |
<<<<<<<
state = self.frame.select('g.cge_' + uv.util.formatClassName(category)).style('display'),
=======
state = self.frame.select('g.cge-' + category.replace(' ','_', 'gim')).style('display'),
>>>>>>>
state = self.frame.select('g.cge-' + uv.util.formatClassName(category)).style('display'),
<<<<<<<
self.... |
<<<<<<<
graph.frame.selectAll('.cge_' + uv.util.formatClassName(category)).select('path.area_'+ uv.util.formatClassName(category))
=======
graph.frame.selectAll('.cge-' + category).select('path.' + uv.constants.classes.area + category)
>>>>>>>
graph.frame.selectAll('.cge-' + uv.util.formatClassName(category))... |
<<<<<<<
'data/withServiceHandlers',
=======
'data/withPendingChanges',
>>>>>>>
'data/withServiceHandlers',
'data/withPendingChanges',
<<<<<<<
withVertexCache, withAjaxFilters, withServiceHandlers, withAsyncQueue,
=======
withVertexCache, withAjaxFilters, withPendingChanges, withAsyncQueue,... |
<<<<<<<
.classed('cr-' + uv.util.formatClassName(self.categories[idx]), true)
.style('fill', 'none')
=======
.classed('cr_' + uv.util.formatClassName(self.categories[idx]), true)
.style('fill', self.config.label.showlabel ? uv.util.getColorBand(self.config, idx) : 'none')
>>>>>>>
.classed('cr-' + uv.util.f... |
<<<<<<<
category = graph.categories[idx],
color = defColor || uv.util.getColorBand(graph.config, idx);
=======
category = graph.categories[idx],
barColor = uv.util.getColorBand(graph.config, idx),
textColor = color || uv.util.getColorBand(graph.config, idx);
>>>>>>>
category = graph.categories[idx],
ba... |
<<<<<<<
return USER_INPUT_QUESTIONS_LIST.findIndex( ( question ) => userInputSettings?.[ question ]?.values?.length === 0 );
=======
return {
isSavingSettings: select( CORE_USER ).isSavingUserInputSettings( userInputSettings ),
error: select( CORE_USER ).getErrorForAction( 'saveUserInputSettings', [] ),
... |
<<<<<<<
ErrorNotice,
ExistingGTMPropertyNotice,
ExistingGTMPropertyError,
=======
>>>>>>>
ExistingGTMPropertyNotice,
ExistingGTMPropertyError, |
<<<<<<<
widgetSlug="urlSearchWidget"
header={ () => (
=======
slug="urlSearchWidget"
Header={ () => (
>>>>>>>
widgetSlug="urlSearchWidget"
Header={ () => ( |
<<<<<<<
if ( selectedAccount && ! responseData.accounts.find( account => account.accountId === selectedAccount ) ) {
data.deleteCache( 'tagmanager::list-accounts' );
=======
if ( selectedAccount && ! responseData.accounts.find( ( account ) => account.accountId === selectedAccount ) ) {
data.deleteCache(... |
<<<<<<<
import { changeToPercent, getModulesData } from 'GoogleUtil';
=======
>>>>>>> |
<<<<<<<
SettingsViewComponent: SettingsView,
=======
settingsViewComponent: SettingsView,
icon: PageSpeedInsightsIcon,
>>>>>>>
SettingsViewComponent: SettingsView,
icon: PageSpeedInsightsIcon, |
<<<<<<<
import ReportError from '../../../../components/ReportError';
import { generateDateRangeArgs } from '../../util/report-date-range-args';
=======
>>>>>>>
import { generateDateRangeArgs } from '../../util/report-date-range-args'; |
<<<<<<<
import DashboardPopularPagesWidget from '../assets/js/modules/analytics/components/dashboard/DashboardPopularPagesWidget';
=======
import DashboardBounceRateWidget from '../assets/js/modules/analytics/components/dashboard/DashboardBounceRateWidget';
import DashboardGoalsWidget from '../assets/js/modules/analy... |
<<<<<<<
if ( ! loading && isZeroReport( data ) ) {
return getNoDataComponent( _x( 'Analytics', 'Service name', 'google-site-kit' ) );
=======
if ( ! data || ! data.length ) {
return <ReportZero moduleSlug="analytics" />;
>>>>>>>
if ( ! loading && isZeroReport( data ) ) {
return <ReportZero moduleSlug="analy... |
<<<<<<<
error.INITIAL_STATE,
notifications.INITIAL_STATE,
=======
userInfo.INITIAL_STATE,
error.INITIAL_STATE
>>>>>>>
userInfo.INITIAL_STATE,
notifications.INITIAL_STATE,
error.INITIAL_STATE
<<<<<<<
error.actions,
notifications.actions,
=======
userInfo.actions,
error.actions
>>>>>>>
userInfo.ac... |
<<<<<<<
import { useCallback } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
=======
import { __, _x } from '@wordpress/i18n';
>>>>>>>
import { useCallback } from '@wordpress/element';
import { __, _x } from '@wordpress/i18n'; |
<<<<<<<
diff.id = outputItem.id = vertexId;
if (outputItem.vertex) {
outputItem.title = F.vertex.title(outputItem.vertex);
} else if (diff.title) {
... |
<<<<<<<
* @param {string} moduleSlug Module slug.
* @param {string|null} url Current entity URL.
* @param {Function} cb Callback for additional setup.
=======
* @param {(string|Array)} moduleSlug Module slug or slugs to activate.
* @param {string|null} url Current entity URL.
* ... |
<<<<<<<
this._coalescedHandlers.push({ element, eventName, callback, _callback });
=======
this._getOrAllocateArray('_coalescedHandlers').push({ element, eventName, callback });
>>>>>>>
this._getOrAllocateArray('_coalescedHandlers').push({ element, eventName, callback, _callback });
<<<<<<<
_removeCo... |
<<<<<<<
=======
* External dependencies
*/
import SettingsApp from 'GoogleComponents/settings/settings-app';
import Notification from 'GoogleComponents/notifications/notification';
import 'GoogleComponents/notifications';
import { loadTranslations } from 'GoogleUtil';
import 'GoogleModules';
/**
>>>>>>>
* Extern... |
<<<<<<<
/**
* Checks reauthentication status for this user.
*
* Returns true if any required scopes are not satisfied or undefined
* if reauthentication info is not available/loaded.
*
* @since 1.9.0
*
* @param {Object} state Data store's state.
* @return {(boolean|undefined)} User reauthentication ... |
<<<<<<<
<PageHeader
title={ _x( 'Analytics', 'Service name', 'google-site-kit' ) }
icon
iconWidth="24"
iconHeight="26"
iconID="analytics"
status="connected"
statusText={ sprintf(
/* translators: %s: module name. */
__( '%s is connected', '... |
<<<<<<<
=======
* Internal dependencies
*/
import PostSearcher from '../../components/PostSearcher';
import GoogleSitekitSearchConsoleDashboardWidget from './components/dashboard/GoogleSitekitSearchConsoleDashboardWidget';
import GoogleSitekitSearchConsoleAdminbarWidget from './components/adminbar/GoogleSitekitSear... |
<<<<<<<
import DashboardDetailsApp from '../assets/js/components/dashboard-details/dashboard-details-app';
=======
import DashboardDetailsApp from '../assets/js/components/dashboard-details/DashboardDetailsApp';
import { enableFeature } from './utils/features';
>>>>>>>
import DashboardDetailsApp from '../assets/js/c... |
<<<<<<<
import { changeToPercent } from '../../../util';
=======
import { changeToPercent, getModulesData } from 'GoogleUtil';
>>>>>>>
import { changeToPercent, getModulesData } from '../../../util'; |
<<<<<<<
import { changeToPercent } from '../../../../util';
=======
import { calculateChange } from '../../../../util';
import applyEntityToReportPath from '../../util/applyEntityToReportPath';
>>>>>>>
import { calculateChange } from '../../../../util';
<<<<<<<
=======
const accountID = store.getAccountID();
... |
<<<<<<<
import { WithTestRegistry } from '../tests/js/utils';
import { generateGtmPropertyStory } from './utils/analytics';
function filterAnalyticsSettings() {
// set( global, 'googlesitekit.modules.analytics.setupComplete', true );
removeAllFilters( 'googlesitekit.ModuleSettingsDetails-analytics' );
addFilter(
... |
<<<<<<<
/**
* Internal dependencies
*/
import { getPreviousDate, getDateString, getPreviousWeekDate } from './utils';
export const INITIAL_STATE = {
=======
export const initialState = {
>>>>>>>
/**
* Internal dependencies
*/
import { getPreviousDate, getDateString, getPreviousWeekDate } from './utils';
export... |
<<<<<<<
import Notification from '../assets/js/components/notifications/notification';
import { provideModuleRegistrations, WithTestRegistry } from '../tests/js/utils';
=======
>>>>>>>
import { provideModuleRegistrations, WithTestRegistry } from '../tests/js/utils';
<<<<<<<
=======
import { provideModules, WithTe... |
<<<<<<<
import { sendAnalyticsTrackingEvent } from 'GoogleUtil';
=======
import {
getSiteKitAdminURL,
getReAuthURL,
sendAnalyticsTrackingEvent,
} from 'GoogleUtil';
import { each, find, filter } from 'lodash';
/**
* WordPress dependencies
*/
import { __, sprintf } from '@wordpress/i18n';
>>>>>>>
import { sendA... |
<<<<<<<
WinImageSVG,
=======
SmallImageSVG,
>>>>>>>
WinImageSVG,
SmallImageSVG, |
<<<<<<<
export { default as DashboardPopularPagesWidget } from './DashboardPopularPagesWidget';
=======
export { default as DashboardBounceRateWidget } from './DashboardBounceRateWidget';
export { default as DashboardGoalsWidget } from './DashboardGoalsWidget';
export { default as DashboardUniqueVisitorsWidget } from... |
<<<<<<<
'googlesitekit-modules': './assets/js/googlesitekit-modules.js',
'googlesitekit-modules-adsense': './assets/js/googlesitekit-modules-adsense.js',
=======
'googlesitekit-modules-analytics': './assets/js/googlesitekit-modules-analytics.js',
'googlesitekit-modules': './assets/js/googlesitekit-mod... |
<<<<<<<
=======
const { Component, Fragment } = wp.element;
const { __, _x, sprintf } = wp.i18n;
>>>>>>> |
<<<<<<<
=======
dashboardAllTrafficArgs,
dashboardAllTrafficData,
pageDashboardAllTrafficArgs,
pageDashboardAllTrafficData,
dashboardPopularPagesArgs,
dashboardPopularPagesData,
pageDashboardBounceRateWidgetArgs,
pageDashboardBounceRateWidgetData,
pageDashboardUniqueVisitorsSparkArgs,
pageDashboardUniqueVis... |
<<<<<<<
export { default as pageDashboardAllTrafficData } from './page-dashboard-all-traffic-widget-data.json';
export { default as pageDashboardPopularPagesArgs } from './dashboard-popular-pages-widget-args.json';
export { default as pageDashboardPopularPagesData } from './dashboard-popular-pages-widget-data.json';
=... |
<<<<<<<
=======
const accountID = store.getAccountID();
const profileID = store.getProfileID();
const internalWebPropertyID = store.getInternalWebPropertyID();
const {
compareStartDate,
compareEndDate,
startDate,
endDate,
} = select( CORE_USER ).getDateRangeDates( {
offsetDays: DATE_RANGE_OF... |
<<<<<<<
'googlesitekit-modules-tagmanager': './assets/js/googlesitekit-modules-tagmanager.js',
=======
'googlesitekit-modules-search-console': './assets/js/googlesitekit-modules-search-console.js',
>>>>>>>
'googlesitekit-modules-search-console': './assets/js/googlesitekit-modules-search-console.js',
... |
<<<<<<<
<Cell className={ wrapperClass } size={ 12 }>
<ModuleSettingsWarning slug="adsense" context="module-dashboard" />
</Cell>
<Cell className={ wrapperClass } size={ 12 }>
=======
<div className={ classnames(
'mdc-layout-grid__cell',
'mdc-layout-grid__cell--sp... |
<<<<<<<
import { getTimeInSeconds, numberFormat, untrailingslashit } from '../../../../util';
import withData from '../../../../components/higherorder/withData';
=======
import {
getTimeInSeconds,
numFmt,
untrailingslashit,
} from '../../../../util';
import withData from '../../../../components/higherorder/withdat... |
<<<<<<<
import { STORE_NAME } from './constants';
=======
import notifications from './notifications';
>>>>>>>
import { STORE_NAME } from './constants';
import notifications from './notifications';
<<<<<<<
=======
import { STORE_NAME } from './constants';
export { STORE_NAME };
>>>>>>>
export { STORE_NAME }; |
<<<<<<<
import { STORE_NAME as CORE_SITE } from '../../googlesitekit/datastore/site/constants';
import { STORE_NAME as CORE_USER, DISCONNECTED_REASON_CONNECTED_URL_MISMATCH } from '../../googlesitekit/datastore/user/constants';
import { useFeature } from '../../hooks/useFeature';
=======
import { CORE_SITE } from '..... |
<<<<<<<
this.props.lose_focus();
if (Map.tiff) {
=======
if (force || Map.tiff) {
>>>>>>>
this.props.lose_focus();
if (force || Map.tiff) { |
<<<<<<<
name: 'Tag Manager',
settingsEditComponent: SettingsEdit,
settingsViewComponent: SettingsView,
setupComponent: SetupMain,
=======
SettingsEditComponent: SettingsEdit,
SettingsViewComponent: SettingsView,
SetupComponent: SetupMain,
Icon: TagManagerIcon,
>>>>>>>
name: 'Tag Manager',
... |
<<<<<<<
import { getCurrentDateRange } from '../../../../util/date-range';
import { Cell, Grid, Row } from '../../../../material-components';
=======
import { getCurrentDateRangeDayCount } from '../../../../util/date-range';
>>>>>>>
import { Cell, Grid, Row } from '../../../../material-components';
import { getCurre... |
<<<<<<<
import AdSenseIcon from '../../../svg/adsense.svg';
=======
import { STORE_NAME } from './datastore/constants';
import { ERROR_CODE_ADBLOCKER_ACTIVE } from './constants';
>>>>>>>
import AdSenseIcon from '../../../svg/adsense.svg';
import { STORE_NAME } from './datastore/constants';
import { ERROR_CODE_ADBLOC... |
<<<<<<<
if (modal) {
modal.classList.toggle('active');
event.preventDefault(); // prevents rewriting url (apps can still use hash values in url)
}
=======
if (modal && modal.classList.contains('modal')) modal.classList.toggle('active');
>>>>>>>
if (modal) {
if (modal && modal.classL... |
<<<<<<<
if ( ! reportMobile || ! reportDesktop || ! dataSrc ) {
return (
<Layout className="googlesitekit-pagespeed-widget">
<div className="mdc-layout-grid">
<div className="mdc-layout-grid__inner">
<div className=" mdc-layout-grid__cell mdc-layout-grid__cell--span-12">
<ProgressBar />
... |
<<<<<<<
import Link from 'GoogleComponents/link';
import Button from 'GoogleComponents/button';
import data, { TYPE_MODULES } from 'GoogleComponents/data';
import SvgIcon from 'GoogleUtil/svg-icon';
import SetupModule from 'GoogleComponents/setup-module';
import Dialog from 'GoogleComponents/dialog';
import ModuleSetti... |
<<<<<<<
* External dependencies
*/
import { fillFilterWithComponent, getModulesData } from 'GoogleUtil';
import OptimizeSetup from 'GoogleModules/optimize/setup';
/**
=======
>>>>>>> |
<<<<<<<
=======
* External dependencies
*/
import { clearWebStorage, loadTranslations } from 'GoogleUtil';
import Notification from 'GoogleComponents/notifications/notification';
import 'GoogleComponents/notifications';
/**
>>>>>>>
* External dependencies
*/
import { clearWebStorage, loadTranslations } from 'Go... |
<<<<<<<
import { getModulesData } from '../../../util';
import Layout from '../../../components//layout/layout';
import DashboardModuleHeader from '../../../components//dashboard/dashboard-module-header';
import AnalyticsInactiveCTA from '../../../components//analytics-inactive-cta';
=======
import Layout from '../..... |
<<<<<<<
=======
import { fillFilterWithComponent } from '../assets/js/util';
import AnalyticsSetup from '../assets/js/modules/analytics/setup';
import SearchConsoleSettingStatus from '../assets/js/modules/search-console/settings/search-console-settings-status';
import AdSenseSettings from '../assets/js/modules/adsens... |
<<<<<<<
import { STORE_NAME as MODULES_ANALYTICS, FORM_ALL_TRAFFIC_WIDGET } from '../../../datastore/constants';
import { STORE_NAME as CORE_FORMS } from '../../../../../googlesitekit/datastore/forms/constants';
import { STORE_NAME as CORE_SITE } from '../../../../../googlesitekit/datastore/site/constants';
=======
i... |
<<<<<<<
import Widgets from 'googlesitekit-widgets';
import {
DIMENSION_NAME_ALL_TRAFFIC_WIDGET,
DIMENSION_VALUE_ALL_TRAFFIC_WIDGET,
DATE_RANGE_OFFSET,
MODULES_ANALYTICS,
} from '../../../datastore/constants';
=======
import { FORM_ALL_TRAFFIC_WIDGET, DATE_RANGE_OFFSET, MODULES_ANALYTICS } from '../../../datastor... |
<<<<<<<
// '@wordpress/api-fetch$': path.resolve( __dirname, 'wp-api-fetch-mock.js' ),
'googlesitekit-data': path.resolve( __dirname, '../assets/js/googlesitekit-data.js' ),
'googlesitekit-api': path.resolve( __dirname, '../assets/js/googlesitekit-api.js' ),
SiteKitCore: path.resolve( __dirname, '../assets/... |
<<<<<<<
registry.dispatch( STORE_NAME ).receiveExistingTag( null );
fetchMock.getOnce(
/^\/google-site-kit\/v1\/modules\/analytics\/data\/accounts-properties-profiles/,
{ body: fixtures.accountsPropertiesProfiles, status: 200 }
);
=======
registry.dispatch( STORE_NAME ).receiveGetExistingTag... |
<<<<<<<
name: 'Analytics',
settingsEditComponent: SettingsEdit,
settingsViewComponent: SettingsView,
setupComponent: SetupMain,
=======
SettingsEditComponent: SettingsEdit,
SettingsViewComponent: SettingsView,
SetupComponent: SetupMain,
Icon: AnalyticsIcon,
>>>>>>>
name: 'Analytics',
Se... |
<<<<<<<
export { default as DashboardZeroData } from './DashboardZeroData';
export { default as DashboardSummaryWidget } from './DashboardSummaryWidget';
=======
export { default as AdSenseDashboardMainSummary } from './AdSenseDashboardMainSummary';
export { default as AdSenseDashboardWidget } from './AdSenseDashboar... |
<<<<<<<
name: 'AdSense',
settingsEditComponent: SettingsEdit,
settingsViewComponent: SettingsView,
setupComponent: SetupMain,
=======
SettingsEditComponent: SettingsEdit,
SettingsViewComponent: SettingsView,
SetupComponent: SetupMain,
Icon: AdSenseIcon,
>>>>>>>
name: 'AdSense',
Settings... |
<<<<<<<
import { STORE_NAME as CORE_SITE } from '../googlesitekit/datastore/site/constants';
import { STORE_NAME as CORE_LOCATION } from '../googlesitekit/datastore/location/constants';
=======
import { CORE_SITE } from '../googlesitekit/datastore/site/constants';
>>>>>>>
import { CORE_SITE } from '../googlesitekit... |
<<<<<<<
argsToParams: ( objParam, aParam ) => {
return {
objParam,
aParam,
};
},
validateParams: ( { objParam, aParam } = {} ) => {
invariant( isPlainObject( objParam ), 'objParam is required.' );
invariant( aParam !== undefined, 'aParam is required.' );
},
=======
storeName: STORE_NAME,
>>>>>>>
... |
<<<<<<<
=======
'googlesitekit-modules-pagespeed-insights': 'assets/js/googlesitekit-modules-pagespeed-insights.js',
'googlesitekit-modules-search-console': './assets/js/googlesitekit-modules-search-console.js',
'googlesitekit-modules': './assets/js/googlesitekit-modules.js', // TODO: Add external followi... |
<<<<<<<
const { accountID, properties, hasResolvedProperties } = useSelect( ( select ) => {
const data = {
accountID: select( STORE_NAME ).getAccountID(),
properties: [],
hasResolvedProperties: false,
};
if ( data.accountID ) {
data.properties = select( STORE_NAME ).getProperties( data.accountID );
... |
<<<<<<<
import modulesTagManagerStore, { STORE_NAME as modulesTagManagerStoreName } from '../../assets/js/modules/tagmanager/datastore';
=======
import modulesSearchConsoleStore, { STORE_NAME as modulesSearchConsoleStoreName } from '../../assets/js/modules/search-console/datastore';
>>>>>>>
import modulesSearchConso... |
<<<<<<<
import './datastore';
import Modules from 'googlesitekit-modules';
=======
import Modules from 'googlesitekit-modules';
>>>>>>>
import Modules from 'googlesitekit-modules';
<<<<<<<
'googlesitekit.ModuleSettingsDetails-adsense',
'googlesitekit.AdSenseModuleSettings',
fillFilterWithComponent( SettingsMain ... |
<<<<<<<
=======
import error from './error';
import service from './service';
>>>>>>>
import service from './service';
<<<<<<<
=======
error,
service
>>>>>>>
service |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.