conflict_resolution stringlengths 27 16k |
|---|
<<<<<<<
import validateInnerBlocks from "../../functions/validators/innerBlocksValid";
import { RenderEditProps } from "../../core/blocks/BlockDefinition";
=======
import { RecommendedBlock, RequiredBlock } from "./dto";
import { getInvalidInnerBlocks } from "../../functions/validators";
import { InvalidBlockReason }... |
<<<<<<<
import { getInnerBlocks, getInnerblocksByName, insertBlockToInnerBlock } from "../../functions/innerBlocksHelper";
import { removeBlock, getBlockType } from "../../functions/blocks";
=======
import { BlockInstance, TemplateArray } from "@wordpress/blocks";
import { InvalidBlockReason } from "./enums";
>>>>>>... |
<<<<<<<
import { BlockInstance, TemplateArray } from "@wordpress/blocks";
import { BlockValidationResult, RequiredBlock } from "../../core/validation";
import BlockInstruction from "../../core/blocks/BlockInstruction";
import validateInnerBlocks from "../../functions/validators/innerBlocksValid";
=======
import { Blo... |
<<<<<<<
export * from './icon';
export * from './tab';
export * from './tab-list';
=======
export * from './overlay-root';
export * from './overlay-trigger';
export * from './popover';
>>>>>>>
export * from './icon';
export * from './tab';
export * from './tab-list';
export * from './overlay-root';
export * from './... |
<<<<<<<
import { ContentScriptsBackground } from 'src/content-scripts/background'
import { InPageUIBackground } from 'src/in-page-ui/background'
=======
import { AnalyticsBackground } from 'src/analytics/background'
import { Analytics } from 'src/analytics/types'
>>>>>>>
import { ContentScriptsBackground } from 'src... |
<<<<<<<
readable: RemoteReaderInterface
=======
contentSharing: ContentSharingInterface
>>>>>>>
readable: RemoteReaderInterface
contentSharing: ContentSharingInterface
<<<<<<<
readable: runInBackground<RemoteReaderInterface>(),
=======
contentSharing: runInBackground<ContentSharingInterfac... |
<<<<<<<
import { RemoteReaderInterface } from 'src/reader/types'
=======
import { RemoteCopyPasterInterface } from 'src/overview/copy-paster/background/types'
import { FeaturesBetaInterface } from 'src/features/background/feature-beta'
>>>>>>>
import { RemoteReaderInterface } from 'src/reader/types'
import { RemoteC... |
<<<<<<<
import { ReaderBackground } from 'src/reader/background'
=======
import { ServerStorage } from 'src/storage/types'
import ContentSharingBackground from 'src/content-sharing/background'
>>>>>>>
import { ReaderBackground } from 'src/reader/background'
import { ServerStorage } from 'src/storage/types'
import Co... |
<<<<<<<
private isTabPageIndexed(params: { tabId: number; fullPageUrl: string }) {
=======
indexPage = async (props: PageCreationProps) => {
const foundTabId = await this.options.tabManagement.findTabIdByFullUrl(
props.fullUrl,
)
if (foundTabId) {
props.tabId = ... |
<<<<<<<
import { ReaderBackground } from 'src/reader/background'
=======
import CopyPasterBackground from 'src/overview/copy-paster/background'
>>>>>>>
import CopyPasterBackground from 'src/overview/copy-paster/background'
import { ReaderBackground } from 'src/reader/background'
<<<<<<<
readable: ReaderBackgrou... |
<<<<<<<
async function getComponents(compilerCtx: d.CompilerCtx, buildCtx: d.BuildCtx): Promise<d.JsonDocsComponent[]> {
const components = await Promise.all(buildCtx.moduleFiles.map(async moduleFile => {
const filePath = moduleFile.sourceFilePath;
const dirPath = normalizePath(sys.path.dirname(filePath));
... |
<<<<<<<
export interface ComponentCompilerMeta {
=======
export interface ComponentCompilerMeta extends ComponentCompilerFeatures {
assetsDirs?: CompilerAssetDir[];
>>>>>>>
export interface ComponentCompilerMeta {
assetsDirs?: CompilerAssetDir[]; |
<<<<<<<
import * as path from 'path';
import { AbstractTextComponent, App, FileSystemAdapter, PluginSettingTab, Setting } from "obsidian";
import CitationPlugin from "./main";
=======
import {
AbstractTextComponent,
App,
FileSystemAdapter,
PluginSettingTab,
Setting,
} from 'obsidian';
import CitationPlugin ... |
<<<<<<<
import { Gender } from "../../../shared/enums/gender.enum";
import { HeartRateImpulseMode } from "../enums/heart-rate-impulse-mode.enum";
import { FitnessUserSettingsModel } from "../models/fitness-user-settings.model";
=======
import { AppError } from "../../../shared/models/app-error.model";
>>>>>>>
import... |
<<<<<<<
import { YearProgressComponent } from "../../year-progress/year-progress.component";
=======
import { DonateComponent } from "../../donate/donate.component";
import { ReleasesNotesComponent } from "../../releases-notes/releases-notes.component";
import { ReleasesNotesResolverService } from "../../releases-not... |
<<<<<<<
new NumberColumn(Category.COMMON, "extendedStats.runningPerformanceIndex", null, "Run Performance Index", Print.number, 2),
=======
new NumberColumn(Category.COMMON, "calories", null, "Calories", Print.number).setDefault(true),
>>>>>>>
new NumberColumn(Category.COMMON, "extendedStats.runningPerforma... |
<<<<<<<
public get userSettings(): IUserSettings {
=======
/**
* Check for goals element and enable GoalsModifier.
*
* This checks the document for a #progress-goals-v2 element. If
* found then the GoalsModifier is enabled and bound to the element.
* However, note that the modifier on... |
<<<<<<<
export interface DateTextFieldProps extends TextFieldProps {
minDate?: DateType;
minDateMessage?: string;
disablePast?: boolean;
disableFuture?: boolean;
maxDate?: DateType;
maxDateMessage?: string;
value: any;
=======
export interface DateTextFieldProps extends Omit<TextFieldProps... |
<<<<<<<
set(key: string, value: any): Promise<any> {
return this._db.setItem(key, value);
=======
set(key: string, value: any) {
return this._dbPromise.then(db => db.setItem(key, value));
>>>>>>>
set(key: string, value: any): Promise<any> {
return this._dbPromise.then(db => db.setItem(key, value));... |
<<<<<<<
import { from } from 'rxjs';
import { Address, TransportApi } from '@scalecube/api';
=======
import { Address, TransportApi, DiscoveryApi, MicroserviceApi } from '@scalecube/api';
import { createDiscovery } from '@scalecube/scalecube-discovery';
>>>>>>>
import { Address, TransportApi, DiscoveryApi, Microserv... |
<<<<<<<
import webComponent from './web-component';
import route, { ROUTER_EVENT, ROUTER_404_EVENT } from './router';
export { ROUTER_EVENT, ROUTER_404_EVENT } from './router';
=======
import { Route, route, ROUTER_EVENT, ROUTER_404_EVENT } from './router';
>>>>>>>
import webComponent from './web-component';
import ... |
<<<<<<<
webComponent(name: string, componentClass, options?): void;
=======
route?: Route;
>>>>>>>
route?: Route;
webComponent(name: string, componentClass, options?): void; |
<<<<<<<
import route from './router';
import webComponent from './web-component';
=======
import route, { ROUTER_EVENT, ROUTER_404_EVENT } from './router';
export { ROUTER_EVENT, ROUTER_404_EVENT } from './router';
>>>>>>>
import webComponent from './web-component';
import route, { ROUTER_EVENT, ROUTER_404_EVENT } ... |
<<<<<<<
captureException(res, ctx, withScope, reportError)
=======
captureException(sentryInstance, res, ctx, withScope)
>>>>>>>
captureException(sentryInstance, res, ctx, withScope, reportError)
<<<<<<<
} catch (err) {
captureException(err, ctx, withScope, reportError)
=======
... |
<<<<<<<
count<Entity>(entityClass: ObjectType<Entity>|string, optionsOrConditions?: FindManyOptions<Entity>|DeepPartial<Entity>): Promise<number> {
=======
async count<Entity>(entityClass: ObjectType<Entity>|string, optionsOrConditions?: FindManyOptions<Entity>|Partial<Entity>): Promise<number> {
>>>>>>>
... |
<<<<<<<
import {UniqueMetadata} from "./UniqueMetadata";
=======
import {PostgresConnectionOptions} from "../driver/postgres/PostgresConnectionOptions";
import {SqlServerConnectionOptions} from "../driver/sqlserver/SqlServerConnectionOptions";
import {CannotCreateEntityIdMapError} from "../error/CannotCreateEntityIdM... |
<<<<<<<
// not needed by tsc since we require typescript external module,
// but the editor/IDE doesn't give completions without it
/// <reference path="typings/typescript/typescript.d.ts" />
=======
/// <reference path="typings/typescript/typescript.d.ts" />
>>>>>>>
// not needed by tsc since we require typescri... |
<<<<<<<
class Translator {
result: string = '';
lastCommentIdx: number = -1;
=======
export function translateProgram(program: ts.Program): string {
var result: string = "";
program.getSourceFiles()
.filter((sourceFile: ts.SourceFile) => sourceFile.fileName.indexOf(".d.ts") < 0)
.forEach(emitDart)... |
<<<<<<<
const response = await virtualAlexa.utter("play now") as any;
=======
let requestToCheck: any;
assert(virtualAlexa.filter((request) => {
requestToCheck = request;
}));
const response = await virtualAlexa.utter("play now");
>>>>>>>
let requestT... |
<<<<<<<
await this.executeQuery(connection, `CREATE EXTENSION IF NOT EXISTS "uuid-ossp"`);
=======
try {
await this.executeQuery(connection, `CREATE extension IF NOT EXISTS "uuid-ossp"`);
} catch (_) {
... |
<<<<<<<
import WindowFocusStory, {
code as windowFocusCode
} from '../src/stories/useWindowFocus.story'
import SWRStory, { code as SWRCode } from '../src/stories/useSWR.story'
=======
import LocalStorageStory, {
code as localStorageCode
} from '../src/stories/useLocalStorage.story'
>>>>>>>
import LocalStorageSto... |
<<<<<<<
export type DiscussionsOptions = {
draftRef?: null | firebase.database.Reference;
initialHistoryKey: number;
discussionAnchors: DiscussionAnchor[];
};
=======
export type MediaUploadInstance = {
id: string;
start: (callbacks: {
onFinish: (src: string) => unknown;
onProgress: (progress: number) => un... |
<<<<<<<
=======
const getBranchesForPub = async (pubId: string) => {
const pubBranches = await Branch.findAll({ where: { pubId: pubId } });
const draftBranch = pubBranches.find((branch) => branch.title === 'draft');
const publicBranch = pubBranches.find((branch) => branch.title === 'public');
return { draftBranch... |
<<<<<<<
export type PubDocInfo = {
initialDoc: DocJson;
initialDocKey: number;
mostRecentRemoteKey?: number;
=======
export type PubPageData = DefinitelyHas<Pub, 'attributions' | 'collectionPubs' | 'discussions'> & {
discussions: DefinitelyHas<Discussion, 'thread'>[];
viewHash: Maybe<string>;
editHash: Maybe<st... |
<<<<<<<
import * as _ from 'underscore';
/*
=======
/**
* Creates a wrappable Promise rejection function.
*
* Creates a function that returns a Promise.reject with a new WrappedError
* that has the provided message and wraps the original error that
* caused the promise to reject.
*/
export
function reject(mess... |
<<<<<<<
let elt: HTMLElement;
const textValue = 'this-is-a-test\n';
=======
const textValue = 'this-is-a-test\n'
>>>>>>>
const textValue = 'this-is-a-test\n';
<<<<<<<
elt = await newWidget(modelState);
expect(elt.textContent).to.equal(textValue);
});
=======
... |
<<<<<<<
handle_message(content: any) {
if (content.do === 'focus') {
this.content.focus();
} else if (content.do === 'blur') {
this.content.blur();
}
}
=======
handle_message(content: any): void {
if (content.do == 'focus') {
this.content... |
<<<<<<<
DOMWidgetView, unpack_models, ViewList, JupyterPhosphorPanelWidget, Dict
=======
DOMWidgetView, unpack_models, ViewList, JupyterLuminoPanelWidget
>>>>>>>
DOMWidgetView, unpack_models, ViewList, JupyterLuminoPanelWidget, Dict
<<<<<<<
_createElement(tagName: string): HTMLElement {
this... |
<<<<<<<
register_target(target_name: string, f: (comm: Comm, object: KernelMessage.IMessage) => void): void {
let handle = this.jsServicesKernel.registerCommTarget(target_name,
=======
register_target(target_name: string, f: (comm: Comm, data: {}) => void): void {
... |
<<<<<<<
update(): void {
// Disable listbox if needed
this.listbox.disabled = this.model.get('disabled');
=======
update() {
>>>>>>>
update(): void { |
<<<<<<<
function isEqual(a: unknown, b: unknown) {
=======
function isEqual(a: any, b: any): boolean {
>>>>>>>
function isEqual(a: unknown, b: unknown): boolean {
<<<<<<<
return function promiseRejection(error: Error) {
=======
return function promiseRejection(error: any): never {
>>>>>>>
return func... |
<<<<<<<
initialize(parameters: WidgetView.InitializeParameters) {
=======
initialize(parameters: any): void {
>>>>>>>
initialize(parameters: WidgetView.InitializeParameters): void {
<<<<<<<
handle_message(content: any) {
if (content.do === 'focus') {
=======
handle_message(content: any... |
<<<<<<<
DOMWidgetView, unpack_models, ViewList, JupyterPhosphorPanelWidget,
reject, WidgetModel, WidgetView
=======
DOMWidgetView, unpack_models, ViewList, JupyterLuminoPanelWidget, WidgetModel
>>>>>>>
DOMWidgetView, unpack_models, ViewList, JupyterLuminoPanelWidget,
reject, WidgetModel, WidgetVi... |
<<<<<<<
initialize(attributes: Backbone.ObjectHash, options: {model_id: string, comm?: any, widget_manager: any}) {
=======
initialize(attributes: any, options: {model_id: string; comm?: any; widget_manager: any}): void {
>>>>>>>
initialize(attributes: Backbone.ObjectHash, options: {model_id: string; com... |
<<<<<<<
var matchesSelector = ElementProto.matches ||
(ElementProto as any)['webkitMatchesSelector'] ||
(ElementProto as any)['mozMatchesSelector'] ||
(ElementProto as any)['msMatchesSelector'] ||
(ElementProto as any)['oMatchesSelector'] ||
function matches(selector) {
var matches = (this.d... |
<<<<<<<
let protocolVersion = ((msg.metadata || {})['version'] as string) || '';
=======
const protocolVersion = ((msg.metadata || {}).version as string) || '';
>>>>>>>
const protocolVersion = ((msg.metadata || {})['version'] as string) || '';
<<<<<<<
let data = msg.content.data as u... |
<<<<<<<
}
listbox: HTMLSelectElement;
=======
};
>>>>>>>
} |
<<<<<<<
ManagerBase
} from './manager-base';
import {
Kernel, KernelMessage
} from '@jupyterlab/services';
import {
Widget
} from '@phosphor/widgets';
=======
Widget, Panel
} from '@lumino/widgets';
>>>>>>>
Widget, Panel
} from '@lumino/widgets';
<<<<<<<
import {
JSONObject, JSONValue
} fr... |
<<<<<<<
dispose() {
this._view = null!;
=======
dispose(): void {
this._view = null;
>>>>>>>
dispose(): void {
this._view = null!; |
<<<<<<<
};
/** TODO: Upgrading to TSC 2.4, maybe we don't need this?
* - RC 20 June 2016 */
type JSXChild = JSX.Element | string | undefined;
export type JSXChildren = JSXChild[] | JSXChild;
=======
};
/** HACK: Server side caching (or webpack) is not doing something right.
* This is a work around until th... |
<<<<<<<
import {SqliteDriver} from "../driver/sqlite/SqliteDriver";
import {MysqlDriver} from "../driver/mysql/MysqlDriver";
import {RandomGenerator} from "../util/RandomGenerator";
import {InsertResult} from "./result/InsertResult";
import {ReturningStatementNotSupportedError} from "../error/ReturningStatementNotSuppo... |
<<<<<<<
protected recreateTableLocked = false;
protected async recreateTableLock() {
while (this.recreateTableLocked) {
await new Promise<void>((resolve) => setTimeout(resolve, 10));
}
this.recreateTableLocked = true;
}
protected async recreateTableRelease() {
... |
<<<<<<<
const mediator = require("desktop/lib/mediator.coffee")
// TODO: Needs removed to prevent importing backbone
=======
>>>>>>>
// TODO: Needs removed to prevent importing backbone |
<<<<<<<
const _callback = (typeof params === 'function' && !callback) ? params : callback;
if (!_callback) {
return new Promise((resolve, reject) => {
this.classify(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
... |
<<<<<<<
import { BaseService } from '../lib/base_service';
import { getDefaultHeaders } from '../lib/common';
import { getMissingParams } from '../lib/helper';
=======
import { BaseService, getMissingParams} from 'ibm-cloud-sdk-core';
import { RequestResponse } from 'request';
import { getSdkHeaders } from '../lib/co... |
<<<<<<<
const _callback = (typeof params === 'function' && !callback) ? params : callback;
if (!_callback) {
return new Promise((resolve, reject) => {
this.listModels(params, (err, bod, res) => {
err ? reject(err) : _params.return_response ? resolve(res) : resolve(bod);
});
... |
<<<<<<<
=======
export import CompareComplyV1 = require('./compare-comply/v1');
export import ConversationV1 = require('./conversation/v1');
>>>>>>>
export import CompareComplyV1 = require('./compare-comply/v1');
<<<<<<<
=======
export import DialogV1 = require('./dialog/v1');
>>>>>>> |
<<<<<<<
const loadCompilerFunction = function (compilerModule: string | undefined){
if (compilerModule) {
const compilerMod = require(compilerModule);
if(!compilerMod.create){ throw new Error("No create function defined for "+ compilerModule);}
const compilerObject = com... |
<<<<<<<
import {Broadcaster} from "../subscriber/Broadcaster";
=======
import {SqlInMemory} from "../driver/SqlInMemory";
import {TableUnique} from "../schema-builder/table/TableUnique";
>>>>>>>
import {SqlInMemory} from "../driver/SqlInMemory";
import {TableUnique} from "../schema-builder/table/TableUnique";
import... |
<<<<<<<
onIntent(): Observable<string> { return; };
=======
onNewIntent(): Observable<string> {
return;
}
>>>>>>>
onIntent(): Observable<string> {
return;
} |
<<<<<<<
export class PostProcessRenderContext {
private readonly _camera: Camera = null!;
private readonly _postProcessingCamera: Camera = paper.GameObject.globalGameObject.getOrAddComponent(Camera); // TODO 后期渲染专用相机
private readonly _drawCall: DrawCall = DrawCall.create();
private r... |
<<<<<<<
import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
=======
>>>>>>>
import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
<<<<<<<
import { Observable } from 'rxjs';
=======
import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Observable ... |
<<<<<<<
import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Observable } from 'rxjs';
=======
import { Cordova, CordovaFunctionOverride, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Observable } from 'rxjs/Observable';
>>>>>>>
import { Cordova, CordovaFunctionOverride... |
<<<<<<<
import {ColumnOptions} from "../decorator/options/ColumnOptions";
import {ForeignKeyMetadata} from "../metadata/ForeignKeyMetadata";
import {LazyRelationsWrapper} from "../lazy-loading/LazyRelationsWrapper";
import {UniqueMetadata} from "../metadata/UniqueMetadata";
=======
>>>>>>>
import {UniqueMetadata} fr... |
<<<<<<<
import {GoogleMaps} from './plugins/googlemaps';
=======
import {GoogleAnalytics} from './plugins/googleanalytics';
>>>>>>>
import {GoogleMaps} from './plugins/googlemaps';
import {GoogleAnalytics} from './plugins/googleanalytics';
<<<<<<<
GoogleMaps,
=======
GoogleAnalytics,
>>>>>>>
GoogleMaps,
... |
<<<<<<<
} else if (columnMetadata.type === "timestamp" || columnMetadata.type === "datetime" || columnMetadata.type === Date) {
return DateUtils.mixedDateToDate(value);
=======
} else if (columnMetadata.type === "timestamp" || columnMetadata.type === "datetime" || columnMetadata.type === D... |
<<<<<<<
import { ColorPickerService } from 'ngx-color-picker';
=======
import { EstimateEmailModule } from './auth/estimate-email/estimate-email.module';
>>>>>>>
import { ColorPickerService } from 'ngx-color-picker';
import { EstimateEmailModule } from './auth/estimate-email/estimate-email.module'; |
<<<<<<<
import {OracleDriver} from "../driver/oracle/OracleDriver";
=======
import {OrderByCondition} from "../find-options/OrderByCondition";
import {LimitOnUpdateNotSupportedError} from "../error/LimitOnUpdateNotSupportedError";
>>>>>>>
import {OrderByCondition} from "../find-options/OrderByCondition";
import {Lim... |
<<<<<<<
import { EmployeeStatisticsService } from '../../../@core/services/employee-statistics.serivce';
import { Store } from '../../../@core/services/store.service';
import { takeUntil } from 'rxjs/operators';
=======
import { monthNames } from '../../../@core/utils/date';
>>>>>>>
import { EmployeeStatisticsServic... |
<<<<<<<
import { KeyResultUpdate } from '../keyresult-update/keyresult-update.entity';
=======
import { CandidateCriterionsRating } from '../candidate-criterions-rating/candidate-criterion-rating.entity';
>>>>>>>
import { KeyResultUpdate } from '../keyresult-update/keyresult-update.entity';
import { CandidateCriteri... |
<<<<<<<
import { RequestApprovalTeamModule } from './request-approval-team/request-approval-team.module';
=======
import { KeyResultUpdateModule } from './keyresult-update/keyresult-update.module';
import { CandidateCriterionsRatingModule } from './candidate-criterions-rating/candidate-criterion-rating.module';
impor... |
<<<<<<<
const integrationTypes = await this.tryExecute(
'Default Integration Types',
createDefaultIntegrationTypes(this.connection)
);
await this.tryExecute(
'Default Integrations',
createDefaultIntegrations(this.connection, this.tenant, integrationTypes)
);
=======
>>>>>>>
const integrationT... |
<<<<<<<
import { NgxElectronModule } from 'ngx-electron';
=======
import { NgxPermissionsModule } from 'ngx-permissions';
>>>>>>>
import { NgxElectronModule } from 'ngx-electron';
import { NgxPermissionsModule } from 'ngx-permissions';
<<<<<<<
SharedModule.forRoot(),
NgxElectronModule
=======
SharedModule.f... |
<<<<<<<
import { TranslateModule } from '../../@shared/translate/translate.module';
=======
import { TranslatableService } from '../../@core/services/translatable.service';
>>>>>>>
import { TranslateModule } from '../../@shared/translate/translate.module';
import { TranslatableService } from '../../@core/services/tr... |
<<<<<<<
@Input() isGridEdit: boolean;
=======
@Input()
contactType: string;
>>>>>>>
@Input() isGridEdit: boolean;
@Input()
contactType: string; |
<<<<<<<
import { Integration } from '../integration/integration.entity';
import { IntegrationType } from '../integration/integration-type.entity';
=======
import { CandidateInterview } from '../candidate-interview/candidate-interview.entity';
import { EmployeeAppointment } from '../employee-appointment';
import { App... |
<<<<<<<
import { HelpCenterArticleModule } from './help-center-article/help-center-article.module';
=======
import { GoalTimeFrameModule } from './goal-time-frame/goal-time-frame.module';
>>>>>>>
import { HelpCenterArticleModule } from './help-center-article/help-center-article.module';
import { GoalTimeFrameModule ... |
<<<<<<<
import { CandidateFeedbacksModule } from './candidate-feedbacks/candidate-feedbacks.module';
=======
import { ProductVariantSettingsModule } from './product-settings/product-settings.module';
>>>>>>>
import { CandidateFeedbacksModule } from './candidate-feedbacks/candidate-feedbacks.module';
import { Product... |
<<<<<<<
s;
=======
selectedPolicyId: string;
>>>>>>>
<<<<<<<
smartTableSettings = {
actions: false,
editable: true,
noDataMessage: 'No Data',
columns: {
name: {
title: 'Name',
type: 'string',
filter: true
},
requiresApproval: {
title: 'Requires Approval',
type: 'custom',
... |
<<<<<<<
source: {
title: this.getTranslation('SM_TABLE.SOURCE'),
type: 'custom',
class: 'text-center',
width: '200px',
renderComponent: CandidateSourceComponent,
filter: false
},
=======
>>>>>>>
source: {
title: this.getTranslation('SM_TABLE.SOURCE'),
type: 'custo... |
<<<<<<<
import { TenantBase } from '../core/entities/tenant-base';
import { Organization } from '../organization/organization.entity';
=======
import { Task } from '../tasks/task.entity';
>>>>>>>
import { TenantBase } from '../core/entities/tenant-base';
import { Organization } from '../organization/organization.ent... |
<<<<<<<
import { Employee } from '../../employee';
import {
TimeLogType,
TimerStatus,
IManualTimeInput,
IGetTimeLogInput
} from '@gauzy/models';
=======
import { Employee } from '../../employee/employee.entity';
import { TimeLogType, TimerStatus, IManualTimeInput } from '@gauzy/models';
>>>>>>>
import { Employee... |
<<<<<<<
import {
createCandidateSkills,
createRandomCandidateSkills
} from '../../candidate-skill/candidate-skill.seed';
import {
createCandidateExperiences,
createRandomCandidateExperience
} from '../../candidate-experience/candidate-experience.seed';
import {
createCandidateEducations,
createRandomCandidateEduc... |
<<<<<<<
import { ProductTypeTranslation } from '../product-type/product-type-translation.entity';
=======
import { HelpCenter } from '../help-center/help-center.entity';
>>>>>>>
import { ProductTypeTranslation } from '../product-type/product-type-translation.entity';
import { HelpCenter } from '../help-center/help-c... |
<<<<<<<
logger: this.options.logger
}, (err: any, client: any) => {
=======
logger: this.options.logger,
authMechanism: this.options.authMechanism
}, (err: any, dbConnection: any) => {
>>>>>>>
logger: this.options.logger,
... |
<<<<<<<
import { Organization, OrganizationCreateInput } from '@gauzy/models';
import { first } from 'rxjs/operators';
=======
import { Organization, OrganizationSelectInput } from '@gauzy/models';
import { Observable } from 'rxjs';
>>>>>>>
import { Organization, OrganizationSelectInput } from '@gauzy/models';
impor... |
<<<<<<<
import { EmployeeProposalTemplate } from '../employee-proposal-template/employee-proposal-template.entity';
=======
import { ReportOrganization } from '../reports/report-organization.entity';
>>>>>>>
import { EmployeeProposalTemplate } from '../employee-proposal-template/employee-proposal-template.entity';
i... |
<<<<<<<
clock.tickInterval = options.tickRate ? 1.0 / options.tickRate : 0;
console.info("tick rate:", options.tickRate ? options.tickRate : "auto");
clock.frameInterval = options.frameRate ? 1.0 / options.frameRate : 0;
console.info("frame rate:", options.frameRate ? opt... |
<<<<<<<
import { ExpenseCategoriesModule } from './expense-categories/expense-categories.module';
=======
import { TimesheetModule } from './timesheet/timesheet.module';
import { ExpenseCategoriesModule } from './expense-categories/expense-categories.module';
>>>>>>>
import { TimesheetModule } from './timesheet/time... |
<<<<<<<
import {abbreviate} from "../../util/StringUtils";
=======
import {EntityMetadata} from "../../metadata/EntityMetadata";
>>>>>>>
import {EntityMetadata} from "../../metadata/EntityMetadata";
import {abbreviate} from "../../util/StringUtils";
<<<<<<<
const value = rawResults[0][this.buildColumnAl... |
<<<<<<<
constructor(readonly translateService: TranslateService) {
super(translateService);
}
=======
constructor(translateService: TranslateService) {
super(translateService);
}
>>>>>>>
constructor(readonly translateService: TranslateService) {
super(translateService);
}
<<<<<<<
=======
getCategoryN... |
<<<<<<<
import { ExpenseCategory } from '../expense-categories';
=======
import { EquipmentSharing } from '../equipment-sharing';
>>>>>>>
import { ExpenseCategory } from '../expense-categories';
import { EquipmentSharing } from '../equipment-sharing'; |
<<<<<<<
import { DownloadAllModule } from './download-all';
import { EmployeeLevelModule } from './organization_employeeLevel/organization-employee-level.module';
=======
import { ExportAllModule } from './export_import';
>>>>>>>
import { DownloadAllModule } from './download-all';
import { EmployeeLevelModule } from... |
<<<<<<<
export * from './lib/candidate-feedback.model';
=======
export * from './lib/candidate-source.model';
>>>>>>>
export * from './lib/candidate-feedback.model';
export * from './lib/candidate-source.model'; |
<<<<<<<
export * from './lib/http-status.enum';
=======
export * from './lib/product.model';
export * from './lib/seed.model';
>>>>>>>
export * from './lib/http-status.enum';
export * from './lib/product.model';
export * from './lib/seed.model'; |
<<<<<<<
import { CandidateInterviewModule } from './candidate-interview/candidate-interview.module';
=======
import { AppointmentEmployeesModule } from './appointment-employees/appointment-employees.module';
>>>>>>>
import { CandidateInterviewModule } from './candidate-interview/candidate-interview.module';
import {... |
<<<<<<<
import { IntegrationEntitySetting } from '../integration-entity-setting/integration-entity-setting.entity';
import { IntegrationEntitySettingTiedEntity } from '../integration-entity-setting-tied-entity/integration-entity-setting-tied-entitiy.entity';
=======
import { CandidateCv } from '../candidate-cv/candid... |
<<<<<<<
public zdist: float = -1.0;
=======
public zdist: number = -1;
/**
* TODO
*/
public count?: number = 0;
>>>>>>>
public zdist: float = -1.0;
/**
* TODO
*/
public count?: number = 0; |
<<<<<<<
hasInvoiceEditPermission: boolean;
enableSaveButton = true;
=======
subtotal = 0;
total = 0;
>>>>>>>
hasInvoiceEditPermission: boolean;
enableSaveButton = true;
subtotal = 0;
total = 0; |
<<<<<<<
convertAcceptedEstimates?: boolean;
=======
daysUntilDue?: number;
>>>>>>>
convertAcceptedEstimates?: boolean;
daysUntilDue?: number;
<<<<<<<
convertAcceptedEstimates?: boolean;
=======
daysUntilDue?: number;
>>>>>>>
convertAcceptedEstimates?: boolean;
daysUntilDue?: number; |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.