conflict_resolution
stringlengths
27
16k
<<<<<<< import { ProgressIndicatorDemoComponent } from './progress-indicator/progress-indicator-demo.component'; ======= import { ModalDemoComponent } from './modal/modal-demo.component'; >>>>>>> import { ProgressIndicatorDemoComponent } from './progress-indicator/progress-indicator-demo.component'; import { ModalDemoComponent } from './modal/modal-demo.component';
<<<<<<< import { NavbarModule } from 'app/lib/navbar/navbar.module'; import { PopoverModule } from 'app/lib/popover/popover.module'; import { NavbarDemoComponent } from 'app/lib/navbar/navbar-demo/navbar-demo.component'; import { PopoverDemoComponent } from 'app/lib/popover/popover-demo/popover-demo.component'; ======= import { SelectComponent } from 'app/lib/select/select.component'; import { SelectDemoComponent } from 'app/lib/select/select-demo/select-demo.component'; >>>>>>> import { NavbarModule } from 'app/lib/navbar/navbar.module'; import { PopoverModule } from 'app/lib/popover/popover.module'; import { NavbarDemoComponent } from 'app/lib/navbar/navbar-demo/navbar-demo.component'; import { PopoverDemoComponent } from 'app/lib/popover/popover-demo/popover-demo.component'; import { SelectComponent } from 'app/lib/select/select.component'; import { SelectDemoComponent } from 'app/lib/select/select-demo/select-demo.component'; <<<<<<< ButtonDemoComponent, NavbarDemoComponent, PopoverDemoComponent, ======= ButtonDemoComponent, SelectComponent, SelectDemoComponent >>>>>>> ButtonDemoComponent, NavbarDemoComponent, PopoverDemoComponent, SelectComponent, SelectDemoComponent
<<<<<<< import {PersonaModule} from './personas/persona.module'; ======= import {MarkdownContentComponent} from './markdown-content.component'; import {LogoDemoComponent} from './logo/logo-demo.component'; import {ProductsDemoComponent} from './products/products-demo.component'; import {UsageComponent} from './usage/usage.component'; import {UsageListComponent} from './usage/usage-list/usage-list.component'; >>>>>>> import {UsageComponent} from './usage/usage.component'; import {UsageListComponent} from './usage/usage-list/usage-list.component'; import {PersonaModule} from './personas/persona.module'; <<<<<<< imports: [SharedModule, ContentRoutesModule, PersonaModule], ======= imports: [SharedModule, ContentRoutesModule, FormsModule, ReactiveFormsModule, NgSelectModule], >>>>>>> imports: [SharedModule, ContentRoutesModule, PersonaModule], <<<<<<< ContentComponent ======= ContentComponent, MarkdownContentComponent, LogoDemoComponent, ProductsDemoComponent, UsageComponent, UsageListComponent, >>>>>>> ContentComponent, UsageComponent, UsageListComponent
<<<<<<< <hc-navbar brandIcon="./assets/TriFlame.svg" user="Christine K." [homeUri]="undefined" [fixedTop]="false"> <hc-navbar-link [active]="true" uri="undefined" linkText="Home"></hc-navbar-link> <hc-navbar-mobile-menu> <hc-list> <hc-list-item routerLink="/home" routerLinkActive="active-link"><span hcListLine>Home</span></hc-list-item> </hc-list> </hc-navbar-mobile-menu> </hc-navbar> ======= <hc-navbar brandIcon="./assets/TriFlame.svg" user="Christine K." [homeUri]="undefined" [fixedTop]="false"> <hc-navbar-link class="link" [active]="true" uri="undefined" linkText="Home"></hc-navbar-link> <hc-navbar-link class="link" [active]="true" uri="undefined" linkText="Admin"></hc-navbar-link> <hc-navbar-mobile-menu> <hc-list> <hc-list-item routerLink="/home" routerLinkActive="active-link"> <span hcListLine>Home</span> </hc-list-item> </hc-list> </hc-navbar-mobile-menu> </hc-navbar> >>>>>>> <hc-navbar brandIcon="./assets/TriFlame.svg" user="Christine K." [homeUri]="undefined" [fixedTop]="false"> <hc-navbar-link class="link" [active]="true" uri="undefined" linkText="Home"></hc-navbar-link> <hc-navbar-link class="link" [active]="true" uri="undefined" linkText="Admin"></hc-navbar-link> <hc-navbar-mobile-menu> <hc-list> <hc-list-item routerLink="/home" routerLinkActive="active-link"><span hcListLine>Home</span></hc-list-item> </hc-list> </hc-navbar-mobile-menu> </hc-navbar>
<<<<<<< export * from './navbar/navbar.module'; export * from './popover/popover.module'; export * from './app-switcher/app-switcher.module'; ======= export * from './icon/icon.module'; export * from './drawer/drawer.module'; >>>>>>> export * from './navbar/navbar.module'; export * from './popover/popover.module'; export * from './app-switcher/app-switcher.module'; export * from './icon/icon.module'; export * from './drawer/drawer.module'; export * from './pipes/pipes.module'; <<<<<<< export * from './navbar/navbar.component'; export * from './popover/popover.directive'; export * from './popover/popoverContent.component'; export * from './app-switcher/app-switcher.component'; export * from './icon'; export * from './drawer'; export * from './checkbox'; ======= export * from './icon/icon.component'; export * from './drawer/drawer.component'; >>>>>>> export * from './navbar/navbar.component'; export * from './popover/popover.directive'; export * from './popover/popoverContent.component'; export * from './app-switcher/app-switcher.component'; export * from './icon/icon.component'; export * from './drawer/drawer.component';
<<<<<<< ModalModule, ======= SharedModule, >>>>>>> ModalModule, SharedModule,
<<<<<<< import { TypographyDemoComponent } from './typography/typography-demo.component'; ======= import { BreadcrumbsModule } from '../../../lib/src/breadcrumbs/breadcrumbs.module'; import { BreadcrumbsDemoComponent } from './breadcrumbs/breadcrumbs-demo.component'; import { Breadcrumb1DemoComponent } from './breadcrumbs/breadcrumbs1-demo.component'; import { Breadcrumb2DemoComponent } from './breadcrumbs/breadcrumbs2-demo.component'; >>>>>>> import { TypographyDemoComponent } from './typography/typography-demo.component'; import { BreadcrumbsModule } from '../../../lib/src/breadcrumbs/breadcrumbs.module'; import { BreadcrumbsDemoComponent } from './breadcrumbs/breadcrumbs-demo.component'; import { Breadcrumb1DemoComponent } from './breadcrumbs/breadcrumbs1-demo.component'; import { Breadcrumb2DemoComponent } from './breadcrumbs/breadcrumbs2-demo.component'; <<<<<<< SubnavDemoComponent, TypographyDemoComponent ======= SubnavDemoComponent, BreadcrumbsDemoComponent, Breadcrumb1DemoComponent, Breadcrumb2DemoComponent >>>>>>> SubnavDemoComponent, TypographyDemoComponent, BreadcrumbsDemoComponent, Breadcrumb1DemoComponent, Breadcrumb2DemoComponent
<<<<<<< if (config.githubCheck !== undefined) { const {appId, installationId, repo, commit} = config.githubCheck; ======= if (opts['github-check'] !== '') { const {label, appId, installationId, repo, commit} = github.parseCheckFlag(opts['github-check']); >>>>>>> if (config.githubCheck !== undefined) { const {label, appId, installationId, repo, commit} = config.githubCheck;
<<<<<<< <translation type="unfinished">OK</translation> ======= <translation>OK</translation> >>>>>>> <translation>OK</translation> <<<<<<< <translation type="unfinished">abbrechen</translation> ======= <translation>Abbrechen</translation> >>>>>>> <translation>Abbrechen</translation> <<<<<<< <translation type="unfinished">Schließen</translation> ======= <translation>Schließen</translation> >>>>>>> <translation type="unfinished">Schließen</translation> <translation>Schließen</translation> <<<<<<< <translation type="unfinished">OK</translation> ======= <translation>OK</translation> >>>>>>> <translation>OK</translation> <<<<<<< <translation type="unfinished">OK</translation> ======= <translation>OK</translation> >>>>>>> <translation>OK</translation> <<<<<<< <translation type="unfinished">abbrechen</translation> ======= <translation>Abbrechen</translation> >>>>>>> <translation>Abbrechen</translation> <<<<<<< <translation type="unfinished">OK</translation> ======= <translation>OK</translation> >>>>>>> <translation>OK</translation> <<<<<<< <translation type="unfinished">abbrechen</translation> ======= <translation>Abbrechen</translation> >>>>>>> <translation>Abbrechen</translation> <<<<<<< <translation type="unfinished">Löschung bestätigen</translation> ======= <translation>Löschen bestätigen</translation> >>>>>>> <translation>Löschen bestätigen</translation> <<<<<<< <translation type="unfinished">abbrechen</translation> ======= <translation>Abbrechen</translation> >>>>>>> <translation>Abbrechen</translation> <<<<<<< <translation type="unfinished">Schließen</translation> ======= <translation>Schließen</translation> >>>>>>> <translation>Schließen</translation> <<<<<<< <translation type="unfinished">OK</translation> ======= <translation>OK</translation> >>>>>>> <translation>OK</translation> <<<<<<< <translation type="unfinished">abbrechen</translation> ======= <translation>Abbrechen</translation> >>>>>>> <translation>Abbrechen</translation> <<<<<<< <translation type="unfinished">OK</translation> ======= <translation>OK</translation> >>>>>>> <translation>OK</translation> <<<<<<< <translation type="unfinished">abbrechen</translation> ======= <translation>Abbrechen</translation> >>>>>>> <translation>Abbrechen</translation> <<<<<<< <translation type="unfinished">OK</translation> ======= <translation>OK</translation> >>>>>>> <translation>OK</translation> <<<<<<< <translation type="unfinished">abbrechen</translation> ======= <translation>Abbrechen</translation> >>>>>>> <translation>Abbrechen</translation> <<<<<<< <translation type="unfinished">Löschung bestätigen</translation> ======= <translation>Löschen bestätigen</translation> >>>>>>> <translation>Löschen bestätigen</translation> <<<<<<< <translation type="unfinished">OK</translation> ======= <translation>OK</translation> >>>>>>> <translation>OK</translation> <<<<<<< <translation type="unfinished">abbrechen</translation> ======= <translation>Abbrechen</translation> >>>>>>> <translation>Abbrechen</translation> <<<<<<< <translation type="unfinished">abbrechen</translation> ======= <translation>Abbrechen</translation> >>>>>>> <translation>Abbrechen</translation> <<<<<<< <translation type="unfinished">OK</translation> ======= <translation>OK</translation> >>>>>>> <translation>OK</translation> <<<<<<< <translation type="unfinished">abbrechen</translation> ======= <translation>Abbrechen</translation> >>>>>>> <translation>Abbrechen</translation> <<<<<<< <translation type="unfinished">OK</translation> ======= <translation>OK</translation> >>>>>>> <translation>OK</translation> <<<<<<< <translation type="unfinished">abbrechen</translation> ======= <translation>Abbrechen</translation> >>>>>>> <translation>Abbrechen</translation> <<<<<<< <translation type="unfinished">Löschen</translation> ======= <translation>Löschen</translation> >>>>>>> <translation>Löschen</translation> <<<<<<< <translation type="unfinished">OK</translation> ======= <translation>OK</translation> >>>>>>> <translation>OK</translation> <<<<<<< <translation type="unfinished">abbrechen</translation> ======= <translation>Abbrechen</translation> >>>>>>> <translation>Abbrechen</translation> <<<<<<< <translation type="unfinished">Hinzufügen</translation> ======= <translation>Hinzufügen</translation> >>>>>>> <translation>Hinzufügen</translation> <<<<<<< <translation type="unfinished">Löschen</translation> ======= <translation>Löschen</translation> >>>>>>> <translation>Löschen</translation> <<<<<<< <translation type="unfinished">abbrechen</translation> ======= <translation>Abbrechen</translation> >>>>>>> <translation>Abbrechen</translation> <<<<<<< <translation type="unfinished">OK</translation> ======= <translation>OK</translation> >>>>>>> <translation>OK</translation>
<<<<<<< export * from './Languages'; export * from './TermsOfService'; ======= export * from './TermsOfService'; export * from './TopUp'; >>>>>>> export * from './Languages'; export * from './TermsOfService'; export * from './TopUp';
<<<<<<< export const MIN_DEPOSIT_CLI_VERSION = process.env.REACT_APP_MIN_DEPOSIT_CLI_VERSION || '0.2.1'; // 0.2.1 was for Medalla ======= export const LIGHTHOUSE_INSTALLATION_URL = process.env.REACT_APP_LIGHTHOUSE_INSTALLATION_URL || 'https://lighthouse-book.sigmaprime.io/installation.html'; export const NIMBUS_INSTALLATION_URL = process.env.REACT_APP_NIMBUS_INSTALLATION_URL || 'https://status-im.github.io/nim-beacon-chain/intro.html'; export const PRYSM_INSTALLATION_URL = process.env.REACT_APP_PRYSM_INSTALLATION_URL || 'https://docs.prylabs.network/docs/testnet/medalla/'; export const TEKU_INSTALLATION_URL = process.env.REACT_APP_TEKU_INSTALLATION_URL || 'https://docs.teku.pegasys.tech/en/latest/HowTo/Get-Started/Build-From-Source/'; >>>>>>> export const MIN_DEPOSIT_CLI_VERSION = process.env.REACT_APP_MIN_DEPOSIT_CLI_VERSION || '0.2.1'; // 0.2.1 was for Medalla export const LIGHTHOUSE_INSTALLATION_URL = process.env.REACT_APP_LIGHTHOUSE_INSTALLATION_URL || 'https://lighthouse-book.sigmaprime.io/installation.html'; export const NIMBUS_INSTALLATION_URL = process.env.REACT_APP_NIMBUS_INSTALLATION_URL || 'https://status-im.github.io/nim-beacon-chain/intro.html'; export const PRYSM_INSTALLATION_URL = process.env.REACT_APP_PRYSM_INSTALLATION_URL || 'https://docs.prylabs.network/docs/testnet/medalla/'; export const TEKU_INSTALLATION_URL = process.env.REACT_APP_TEKU_INSTALLATION_URL || 'https://docs.teku.pegasys.tech/en/latest/HowTo/Get-Started/Build-From-Source/';
<<<<<<< import { Destroyable } from "../types/Destroyable"; import { TextMetrics } from "../types/TextMetrics"; ======= import { TextMetrix } from "../types/TextMetrix"; >>>>>>> import { TextMetrics } from "../types/TextMetrics";
<<<<<<< function typografTextWithNeighbors(node: string, prevWord?: string, nextWord?: string): string { const words: string[] = [] ======= export function typografTextWithNeighbors(node: string, prevWord?: string, nextWord?: string): string { let words: string[] = [] >>>>>>> export function typografTextWithNeighbors(node: string, prevWord?: string, nextWord?: string): string { const words: string[] = []
<<<<<<< import AppStateRepository from '~/repository/AppStateRepository' ======= import { AppStateRepository } from '~/repository/AppStateRepository' import { Instance } from 'mobx-state-tree' >>>>>>> import { AppStateRepository } from '~/repository/AppStateRepository' <<<<<<< import Quiz from '~/models/quiz' ======= import { Quiz } from '~/models/quiz' >>>>>>> import { Quiz } from '~/models/quiz'
<<<<<<< fontSizeSmall: `0.9rem`, adaptiveBreakpoint: '800px' ======= fontSizeRegular: `1rem`, fontSizeSmall: `0.9rem` >>>>>>> fontSizeRegular: `1rem`, fontSizeSmall: `0.9rem`, adaptiveBreakpoint: '800px'
<<<<<<< import { botDefaultSettings } from './settings'; import { BotType, ShardCommand } from './types'; ======= import { CaptchaService } from './services/Captcha'; import { CommandsService } from './services/Commands'; import { DBQueueService } from './services/DBQueue'; import { InvitesService } from './services/Invites'; import { MessagingService } from './services/Messaging'; import { ModerationService } from './services/Moderation'; import { MusicService } from './services/Music'; import { RabbitMqService } from './services/RabbitMq'; import { SchedulerService } from './services/Scheduler'; import { TrackingService } from './services/Tracking'; import { botDefaultSettings, defaultSettings, toDbValue } from './settings'; import { BotType, ChannelType, ShardCommand } from './types'; >>>>>>> import { botDefaultSettings, defaultSettings, toDbValue } from './settings'; import { BotType, ChannelType, ShardCommand } from './types'; <<<<<<< this.music = new MusicService(this); ======= this.tracking = new TrackingService(this); >>>>>>> this.music = new MusicService(this); this.tracking = new TrackingService(this);
<<<<<<< ActivityStatus, ActivityType, ======= AnnouncementVoice, >>>>>>> ActivityStatus, ActivityType, AnnouncementVoice, <<<<<<< } ======= musicVolume: number; announceNextSong: boolean; announcementVoice: AnnouncementVoice; fadeMusicOnTalk: boolean; fadeMusicStartDuration: number; fadeMusicEndDelay: number; }; >>>>>>> musicVolume: number; announceNextSong: boolean; announcementVoice: AnnouncementVoice; fadeMusicOnTalk: boolean; fadeMusicStartDuration: number; fadeMusicEndDelay: number; }
<<<<<<< import { TrackingService } from './services/Tracking'; ======= import { botDefaultSettings } from './settings'; >>>>>>> import { TrackingService } from './services/Tracking'; import { botDefaultSettings } from './settings';
<<<<<<< import { Constants, ServerHashParamKeys, InteractionType, libraryVersion, CacheKeys } from "./utils/Constants"; ======= import { Constants, InteractionType, libraryVersion } from "./utils/Constants"; >>>>>>> import { Constants, ServerHashParamKeys, InteractionType, libraryVersion, CacheKeys } from "./utils/Constants"; <<<<<<< * Used to send the user to the redirect_uri after authentication is complete. The user's bearer token is attached to the URI fragment as an id_token/access_token field. * This function also closes the popup window after redirection. * * @param urlNavigate * @param title * @param interval * @param instance * @param resolve * @param reject * @ignore */ private openWindow(urlNavigate: string, title: string, interval: number, instance: this, resolve?: Function, reject?: Function): Window { // Generate a popup window let popupWindow: Window; try { popupWindow = this.openPopup(urlNavigate, title, Constants.popUpWidth, Constants.popUpHeight); } catch (e) { instance.loginInProgress = false; instance.acquireTokenInProgress = false; this.logger.info(ClientAuthErrorMessage.popUpWindowError.code + ":" + ClientAuthErrorMessage.popUpWindowError.desc); this.cacheStorage.setItem(CacheKeys.ERROR, ClientAuthErrorMessage.popUpWindowError.code); this.cacheStorage.setItem(CacheKeys.ERROR_DESC, ClientAuthErrorMessage.popUpWindowError.desc); if (reject) { reject(ClientAuthError.createPopupWindowError()); } return null; } // Push popup window handle onto stack for tracking window.openedWindows.push(popupWindow); const pollTimer = window.setInterval(() => { // If popup closed or login in progress, cancel login if (popupWindow && popupWindow.closed && (instance.loginInProgress || instance.acquireTokenInProgress)) { if (reject) { reject(ClientAuthError.createUserCancelledError()); } window.clearInterval(pollTimer); if (this.config.framework.isAngular) { this.broadcast("msal:popUpClosed", ClientAuthErrorMessage.userCancelledError.code + Constants.resourceDelimiter + ClientAuthErrorMessage.userCancelledError.desc); return; } instance.loginInProgress = false; instance.acquireTokenInProgress = false; } try { const popUpWindowLocation = popupWindow.location; // If the popup hash changes, close the popup window if (popUpWindowLocation.href.indexOf(this.getRedirectUri()) !== -1) { window.clearInterval(pollTimer); instance.loginInProgress = false; instance.acquireTokenInProgress = false; this.logger.info("Closing popup window"); // TODO: Check how this can be extracted for any framework specific code? if (this.config.framework.isAngular) { this.broadcast("msal:popUpHashChanged", popUpWindowLocation.hash); for (let i = 0; i < window.openedWindows.length; i++) { window.openedWindows[i].close(); } } } } catch (e) { /* * Cross Domain url check error. * Will be thrown until AAD redirects the user back to the app"s root page with the token. * No need to log or throw this error as it will create unnecessary traffic. */ } }, interval); return popupWindow; } /** * @hidden * ======= >>>>>>> <<<<<<< this.cacheStorage.setItem(CacheKeys.RENEW_STATUS + expectedState, Constants.tokenRenewStatusInProgress); this.loadFrame(urlNavigate, frameName); ======= this.cacheStorage.setItem(Constants.renewStatus + expectedState, Constants.tokenRenewStatusInProgress); >>>>>>> this.cacheStorage.setItem(CacheKeys.RENEW_STATUS + expectedState, Constants.tokenRenewStatusInProgress); <<<<<<< return this.urlContainsHash(hash); } private urlContainsHash(urlString: string): boolean { const parameters = this.deserializeHash(urlString); return ( parameters.hasOwnProperty(ServerHashParamKeys.ERROR_DESCRIPTION) || parameters.hasOwnProperty(ServerHashParamKeys.ERROR) || parameters.hasOwnProperty(ServerHashParamKeys.ACCESS_TOKEN) || parameters.hasOwnProperty(ServerHashParamKeys.ID_TOKEN) ); ======= return UrlUtils.urlContainsHash(hash); >>>>>>> return UrlUtils.urlContainsHash(hash); <<<<<<< if (self.config.auth.navigateToLoginRequestUrl) { self.cacheStorage.setItem(CacheKeys.URL_HASH, hash); if (window.parent === window && !isPopup) { window.location.href = self.cacheStorage.getItem(CacheKeys.LOGIN_REQUEST, self.inCookie); ======= if (this.config.auth.navigateToLoginRequestUrl) { this.cacheStorage.setItem(Constants.urlHash, locationHash); if (window.parent === window) { window.location.href = this.cacheStorage.getItem(Constants.loginRequest, this.inCookie); >>>>>>> if (this.config.auth.navigateToLoginRequestUrl) { this.cacheStorage.setItem(CacheKeys.URL_HASH, locationHash); if (window.parent === window) { window.location.href = this.cacheStorage.getItem(CacheKeys.LOGIN_REQUEST, this.inCookie); <<<<<<< self.cacheStorage.setItem(CacheKeys.URL_HASH, hash); ======= this.cacheStorage.setItem(Constants.urlHash, locationHash); >>>>>>> this.cacheStorage.setItem(CacheKeys.URL_HASH, locationHash); <<<<<<< this.cacheStorage.setItem(CacheKeys.ERROR, ""); this.cacheStorage.setItem(CacheKeys.ERROR_DESC, ""); ======= >>>>>>> <<<<<<< // retrieve the authority from cache and replace with tenantID const authorityKey = AuthCache.generateAuthorityKey(stateInfo.state); let authority: string = this.cacheStorage.getItem(authorityKey, this.inCookie); if (!StringUtils.isEmpty(authority)) { authority = UrlUtils.replaceTenantPath(authority, response.tenantId); } ======= // set authority const authority: string = this.populateAuthority(stateInfo.state, this.inCookie, this.cacheStorage, idTokenObj); >>>>>>> // set authority const authority: string = this.populateAuthority(stateInfo.state, this.inCookie, this.cacheStorage, idTokenObj); <<<<<<< authorityKey = AuthCache.generateAuthorityKey(stateInfo.state); let authority: string = this.cacheStorage.getItem(authorityKey, this.inCookie); if (!StringUtils.isEmpty(authority)) { authority = UrlUtils.replaceTenantPath(authority, idTokenObj.tenantId); } ======= // set authority const authority: string = this.populateAuthority(stateInfo.state, this.inCookie, this.cacheStorage, idTokenObj); >>>>>>> // set authority const authority: string = this.populateAuthority(stateInfo.state, this.inCookie, this.cacheStorage, idTokenObj); <<<<<<< this.cacheStorage.setItem(CacheKeys.LOGIN_REQUEST, loginStartPage, this.inCookie); this.cacheStorage.setItem(CacheKeys.LOGIN_ERROR, ""); this.cacheStorage.setItem(CacheKeys.STATE_LOGIN, serverAuthenticationRequest.state, this.inCookie); this.cacheStorage.setItem(CacheKeys.ERROR, ""); this.cacheStorage.setItem(CacheKeys.ERROR_DESC, ""); ======= this.cacheStorage.setItem(Constants.loginRequest, loginStartPage, this.inCookie); this.cacheStorage.setItem(Constants.stateLogin, serverAuthenticationRequest.state, this.inCookie); >>>>>>> this.cacheStorage.setItem(CacheKeys.LOGIN_REQUEST, loginStartPage, this.inCookie); this.cacheStorage.setItem(CacheKeys.STATE_LOGIN, serverAuthenticationRequest.state, this.inCookie);
<<<<<<< ======= import { Guild, Lang, Message } from '@yamdbf/core'; >>>>>>> <<<<<<< } from 'eris'; ======= } from 'discord.js'; import moment from 'moment'; import { createCaptcha, FileMode } from './functions/Captcha'; >>>>>>> } from 'eris'; import { createCaptcha, FileMode } from './functions/Captcha'; <<<<<<< ======= import { SettingsCache } from './storage/SettingsCache'; >>>>>>> <<<<<<< } export function idToBinary(num: string) { let bin = ''; let high = parseInt(num.slice(0, -10), 10) || 0; let low = parseInt(num.slice(-10), 10); while (low > 0 || high > 0) { // tslint:disable-next-line:no-bitwise bin = String(low & 1) + bin; low = Math.floor(low / 2); if (high > 0) { low += 5000000000 * (high % 2); high = Math.floor(high / 2); } } return bin; } export function getShardIdForGuild(guildId: any, shardCount: number) { const bin = idToBinary(guildId); const num = parseInt(bin.substring(0, bin.length - 22), 2); return (num % shardCount) + 1; ======= } export enum PromptResult { SUCCESS, FAILURE, TIMEOUT } const captchaOptions = { size: 6, fileMode: FileMode.BUFFER, height: 50, noiseColor: 'rgb(10,40,100)', color: 'rgb(50,40,50)', spacing: 2, nofLines: 4 }; export async function sendCaptchaToUserOnJoin( client: IMClient, member: GuildMember ) { const settings = await SettingsCache.get(member.guild.id); if (settings.captchaVerificationOnJoin !== 'true') { return; } createCaptcha(captchaOptions, (text, buffer) => { const embed = createEmbed(client); embed.setTitle('Captcha'); embed.setDescription( settings.captchaVerificationWelcomeMessage.replace( /\{serverName\}/g, member.guild.name ) ); embed.setImage('attachment://captcha.png'); embed.attachFiles([ { attachment: buffer, name: 'captcha.png' } ]); const startTime = moment(); let listenToMessage = async (target: GuildMember, message: Message) => { const timeLeft = settings.captchaVerificationTimeout * 1000 - moment().diff(startTime, 'millisecond'); const confirmation = (await message.channel.awaitMessages( a => a.author.id === target.id, { max: 1, time: timeLeft } )).first(); if (!confirmation) { return PromptResult.TIMEOUT; } if (confirmation.content.toLowerCase() === text.toLowerCase()) { return PromptResult.SUCCESS; } return PromptResult.FAILURE; }; member.send({ embed }).then(async (message: Message) => { while (true) { const result = await listenToMessage(member, message); if (result === PromptResult.SUCCESS) { member.send( settings.captchaVerificationSuccessMessage.replace( /\{serverName\}/g, member.guild.name ) ); return; } if (result === PromptResult.TIMEOUT) { await member.send( settings.captchaVerificationFailedMessage.replace( /\{serverName\}/g, member.guild.name ) ); member.kick(); return; } member.send(Lang.res(settings.lang, 'CAPTCHA_INVALID')); } }); }); } /** * @param { Promise } promise * @param { Object= } errorExt - Additional Information you can pass to the err object * @return { Promise } */ export function to<T, U = any>( promise: Promise<T>, errorExt?: object ): Promise<[U | null, T | undefined]> { return promise .then<[null, T]>((data: T) => [null, data]) .catch<[U, undefined]>(err => { if (errorExt) { Object.assign(err, errorExt); } return [err, undefined]; }); >>>>>>> } export function idToBinary(num: string) { let bin = ''; let high = parseInt(num.slice(0, -10), 10) || 0; let low = parseInt(num.slice(-10), 10); while (low > 0 || high > 0) { // tslint:disable-next-line:no-bitwise bin = String(low & 1) + bin; low = Math.floor(low / 2); if (high > 0) { low += 5000000000 * (high % 2); high = Math.floor(high / 2); } } return bin; } export function getShardIdForGuild(guildId: any, shardCount: number) { const bin = idToBinary(guildId); const num = parseInt(bin.substring(0, bin.length - 22), 2); return (num % shardCount) + 1;
<<<<<<< export const DEFAULT_AUTHORITY: string = "https://login.microsoftonline.com/common"; export const AAD_INSTANCE_DISCOVERY_ENDPOINT: string = `${DEFAULT_AUTHORITY}/discovery/instance?api-version=1.1&authorization_endpoint=${DEFAULT_AUTHORITY}/oauth2/v2.0/authorize`; export const WELL_KNOWN_SUFFIX: string = ".well-known/openid-configuration"; ======= export const DEFAULT_AUTHORITY: string = "https://login.microsoftonline.com/common/"; export const AAD_INSTANCE_DISCOVERY_ENDPOINT: string = `${DEFAULT_AUTHORITY}/discovery/instance?api-version=1.1&authorization_endpoint=`; >>>>>>> export const DEFAULT_AUTHORITY: string = "https://login.microsoftonline.com/common/"; export const AAD_INSTANCE_DISCOVERY_ENDPOINT: string = `${DEFAULT_AUTHORITY}/discovery/instance?api-version=1.1&authorization_endpoint=`; export const WELL_KNOWN_SUFFIX: string = ".well-known/openid-configuration";
<<<<<<< RankAssignmentStyle } from './models/GuildSetting'; import { InviteCodeSettingsKey } from './models/InviteCodeSetting'; import { MemberSettingsKey } from './models/MemberSetting'; ======= MemberSettingsKey, RankAssignmentStyle, SettingsKey } from './sequelize'; import { MusicPlatformType } from './types'; >>>>>>> RankAssignmentStyle } from './models/GuildSetting'; import { InviteCodeSettingsKey } from './models/InviteCodeSetting'; import { MemberSettingsKey } from './models/MemberSetting'; import { MusicPlatformType } from './types';
<<<<<<< import { AppController } from './app.controller'; import { AppService } from './app.service'; ======= import { AppController } from './controllers/app.controller'; import { AppService } from './services/app.service'; import { PrismaModule } from './prisma/prisma.module'; >>>>>>> import { AppController } from './controllers/app.controller'; import { AppService } from './services/app.service';
<<<<<<< async createUrl( request: AuthorizationUrlRequest ): Promise<string> { ======= async createAcquireTokenUrl(request: AuthorizationUrlRequest): Promise<string> { return this.createUrl(request, false); } /** * Helper function which creates URL. If isLoginCall is true, MSAL appends client id scope to retrieve id token from the service. * @param request * @param isLoginCall */ private async createUrl(request: AuthorizationUrlRequest, isLoginCall: boolean): Promise<string> { >>>>>>> async createUrl( request: AuthorizationUrlRequest ): Promise<string> { <<<<<<< private async createUrlRequestParamString( request: AuthorizationUrlRequest ): Promise<string> { ======= private async createUrlRequestParamString(request: AuthorizationUrlRequest, isLoginCall: boolean): Promise<string> { >>>>>>> private async createUrlRequestParamString(request: AuthorizationUrlRequest): Promise<string> { <<<<<<< const scopeSet = new ScopeSet(codeRequest.scopes || [], this.config.authOptions.clientId); ======= const scopeSet = new ScopeSet(codeRequest.scopes || [], this.config.authOptions.clientId, true); >>>>>>> const scopeSet = new ScopeSet(codeRequest.scopes || [], this.config.authOptions.clientId); <<<<<<< const cachedScopes = ScopeSet.fromString(cacheRecord.accessToken.target, this.config.authOptions.clientId); ======= const cachedScopes = ScopeSet.fromString(cachedAccessToken.target, this.config.authOptions.clientId, true); >>>>>>> const cachedScopes = ScopeSet.fromString(cachedAccessToken.target, this.config.authOptions.clientId); <<<<<<< accessToken: cacheRecord.accessToken.secret, fromCache: true, account: CacheHelper.toIAccount(cacheRecord.account), expiresOn: new Date(cacheRecord.accessToken.expiresOn), extExpiresOn: new Date(cacheRecord.accessToken.extendedExpiresOn), ======= accessToken: cachedAccessToken.secret, account: CacheHelper.toIAccount(cachedAccount), expiresOn: new Date(cachedAccessToken.expiresOn), extExpiresOn: new Date(cachedAccessToken.extendedExpiresOn), >>>>>>> accessToken: cachedAccessToken.secret, fromCache: true, account: CacheHelper.toIAccount(cachedAccount), expiresOn: new Date(cachedAccessToken.expiresOn), extExpiresOn: new Date(cachedAccessToken.extendedExpiresOn), <<<<<<< const serverParams = hashUrlString.getDeserializedHash<ServerAuthorizationCodeResponse>(); ======= const serverParams = hashUrlString.getDeserializedHash<ServerAuthorizationCodeResponse>(); >>>>>>> const serverParams = hashUrlString.getDeserializedHash<ServerAuthorizationCodeResponse>(); <<<<<<< const tokenResponse = responseHandler.generateAuthenticationResult(acquiredTokenResponse.body, authority, cachedNonce); ======= const tokenResponse = responseHandler.generateAuthenticationResult( acquiredTokenResponse.body, authority ); tokenResponse.state = userState; >>>>>>> const tokenResponse = responseHandler.generateAuthenticationResult(acquiredTokenResponse.body, authority, cachedNonce); tokenResponse.state = userState;
<<<<<<< export const SET_VECTOR_LAYER = '__layers__SET_VECTOR_LAYER'; export const SET_SELECTED_LAYERS = '__layers__SET_SELECTED_LAYERS'; export const SET_HOVERED_LAYER = '__layers__SET_HOVERED_LAYER'; export const SET_HIDDEN_LAYERS = '__layers__SET_HIDDEN_LAYERS'; export const SET_COLLAPSED_LAYERS = '__layers__SET_COLLAPSED_LAYERS'; ======= export enum LayerActionTypes { SetVectorLayer = '__layers__SET_VECTOR_LAYER', SetSelectedLayers = '__layers__SET_SELECTED_LAYERS', SetHiddenLayers = '__layers__SET_HIDDEN_LAYERS', SetCollapsedLayers = '__layers__SET_COLLAPSED_LAYERS', } >>>>>>> export enum LayerActionTypes { SetVectorLayer = '__layers__SET_VECTOR_LAYER', SetSelectedLayers = '__layers__SET_SELECTED_LAYERS', SetHoveredLayer = '__layers__SET_HOVERED_LAYER', SetHiddenLayers = '__layers__SET_HIDDEN_LAYERS', SetCollapsedLayers = '__layers__SET_COLLAPSED_LAYERS', } <<<<<<< export type Actions = | SetVectorLayer | SetSelectedLayers | SetHoveredLayer | SetHiddenLayers | SetCollapsedLayers; ======= export type LayerActions = | SetVectorLayer | SetHiddenLayers | SetCollapsedLayers | SetSelectedLayers; >>>>>>> export type LayerActions = | SetVectorLayer | SetSelectedLayers | SetHoveredLayer | SetHiddenLayers | SetCollapsedLayers;
<<<<<<< readonly selectedLayerIds: Set<string>; readonly hoveredLayerId: string; readonly collapsedLayerIds: Set<string>; readonly hiddenLayerIds: Set<string>; ======= readonly selectedLayerIds: ReadonlySet<string>; readonly collapsedLayerIds: ReadonlySet<string>; readonly hiddenLayerIds: ReadonlySet<string>; >>>>>>> readonly selectedLayerIds: ReadonlySet<string>; readonly hoveredLayerId: string; readonly collapsedLayerIds: ReadonlySet<string>; readonly hiddenLayerIds: ReadonlySet<string>;
<<<<<<< import { separate } from './Multiple'; ======= type ReadonlyTable<T> = ReadonlyArray<ReadonlyArray<T>>; >>>>>>> import { separate } from './Multiple'; type ReadonlyTable<T> = ReadonlyArray<ReadonlyArray<T>>;
<<<<<<< YowizPanel.viewType, 'Yeoman UI', ======= YeomanUIPanel.viewType, 'YeomanUI', >>>>>>> YeomanUIPanel.viewType, 'Yeoman UI', <<<<<<< ======= const webview = this.panel.webview; // Vary the webview's content based on where it is located in the editor. switch (this.panel.viewColumn) { case vscode.ViewColumn.Two: this._updateSpecificColumn(webview, 'Compiling'); return; case vscode.ViewColumn.Three: this._updateSpecificColumn(webview, 'Testing'); return; case vscode.ViewColumn.One: default: this._updateSpecificColumn(webview, 'YeomanUI'); return; } } private _updateSpecificColumn(webview: vscode.Webview, name: string) { this.panel.title = name; this.panel.webview.html = this._getHtmlForWebview(webview, name); } private _getHtmlForWebview(webview: vscode.Webview, name: string) { >>>>>>> <<<<<<< path.join(this.extensionPath, 'dist', 'media') ======= path.join(this.extensionPath, 'out/media/') >>>>>>> path.join(this.extensionPath, 'dist', 'media') <<<<<<< channel = vscode.window.createOutputChannel('Yeoman UI'); ======= channel = vscode.window.createOutputChannel('YeomanUI'); >>>>>>> channel = vscode.window.createOutputChannel('Yeoman UI');
<<<<<<< const generators: IPrompt = await this.getGenerators(); const response: any = await this.rpc.invoke("showPrompt", [generators.questions, generators.name]); await this.runGenerator(response.name); ======= if (this.rpc) { const generators: IPrompt = await this.getGenerators(); const response: any = await this.rpc.invoke("showPrompt", [generators.questions, "select_generator"]); await this.runGenerator(response.name); } >>>>>>> const generators: IPrompt = await this.getGenerators(); const response: any = await this.rpc.invoke("showPrompt", [generators.questions, "select_generator"]); await this.runGenerator(response.name);
<<<<<<< import * as services from './services'; ======= import { request } from './utils'; import * as ssl from './ssl'; >>>>>>> import { request } from './utils'; import * as services from './services'; <<<<<<< async function GetRemoteFile(link: string, encoding = 'utf8') { const options: request.CoreOptions = { encoding, }; const proxySettings = await getProxySettings(); if (proxySettings && proxySettings.https) { options.proxy = proxySettings.https.toString(); } return new Promise<string>((resolve, reject) => { request.get(link, options, (error, response, body) => { if (error) { reject(error); } else { resolve(body); } }); }); } ======= >>>>>>>
<<<<<<< if (${slot} && ${update_conditions}) { ${slot}.p(@get_slot_changes(${slot_definition}, ctx, changed, ${get_slot_changes}), @get_slot_context(${slot_definition}, ctx, ${get_slot_context})); ======= if (${slot} && ${slot}.p && ${update_conditions}) { ${slot}.p(@assign(@assign({}, ${get_slot_changes}(changed)), ctx.$$scope.changed), @get_slot_context(${slot_definition}, ctx, ${get_slot_context})); >>>>>>> if (${slot} && ${slot}.p && ${update_conditions}) { ${slot}.p(@get_slot_changes(${slot_definition}, ctx, changed, ${get_slot_changes}), @get_slot_context(${slot_definition}, ctx, ${get_slot_context}));
<<<<<<< updater = block.renderer.options.dev ? `@prop_dev(${element.var}, "${property_name}", ${should_cache ? last : value});` : `${element.var}.${property_name} = ${should_cache ? last : value};`; } else if (is_dataset) { block.builders.hydrate.add_line( `${element.var}.dataset.${camel_case_name} = ${init};` ); updater = block.renderer.options.dev ? `@dataset_dev(${element.var}, "${camel_case_name}", ${should_cache ? last : value});` : `${element.var}.dataset.${camel_case_name} = ${should_cache ? last : value};`; ======= updater = `${element.var}.${property_name} = ${should_cache ? last : value};`; >>>>>>> updater = block.renderer.options.dev ? `@prop_dev(${element.var}, "${property_name}", ${should_cache ? last : value});` : `${element.var}.${property_name} = ${should_cache ? last : value};`;
<<<<<<< method?: string; ts: number, ======= timestamp: number, >>>>>>> timestamp: number, method?: string; <<<<<<< if (urlContainsHash) { const stateInfo = this.getResponseState(urlHash); if (stateInfo.method === Constants.interactionTypeRedirect) { this.handleRedirectAuthenticationResponse(urlHash); } ======= if (urlContainsHash && !WindowUtils.isInIframe() && !WindowUtils.isInPopup()) { this.handleRedirectAuthenticationResponse(urlHash); >>>>>>> if (urlContainsHash) { const stateInfo = this.getResponseState(urlHash); if (stateInfo.method === Constants.interactionTypeRedirect) { this.handleRedirectAuthenticationResponse(urlHash); } <<<<<<< const request: AuthenticationParameters = RequestUtils.validateRequest(userRequest, true, this.clientId, Constants.interactionTypeRedirect); ======= const request: AuthenticationParameters = RequestUtils.validateRequest(userRequest, true, this.clientId); >>>>>>> const request: AuthenticationParameters = RequestUtils.validateRequest(userRequest, true, this.clientId, Constants.interactionTypeRedirect); <<<<<<< const request: AuthenticationParameters = RequestUtils.validateRequest(userRequest, false, this.clientId, Constants.interactionTypeRedirect); ======= const request: AuthenticationParameters = RequestUtils.validateRequest(userRequest, false, this.clientId); >>>>>>> const request: AuthenticationParameters = RequestUtils.validateRequest(userRequest, false, this.clientId, Constants.interactionTypeRedirect); <<<<<<< ts: parsedState.ts, method: parsedState.method, ======= timestamp: parsedState.ts, >>>>>>> timestamp: parsedState.ts, method: parsedState.method,
<<<<<<< const start = state === (ProposalStates.Boosted || state == ProposalStates.BoostedTimedOut) ? boostedTime : submittedTime; const duration = state === (ProposalStates.Boosted || state == ProposalStates.BoostedTimedOut) ? boostedVotePeriodLimit : preBoostedVotePeriodLimit; ======= const start = (state == ProposalStates.Boosted || state == ProposalStates.QuietEndingPeriod) ? boostedTime : submittedTime; const duration = (state == ProposalStates.Boosted || state == ProposalStates.QuietEndingPeriod) ? boostedVotePeriodLimit : preBoostedVotePeriodLimit; >>>>>>> const start = state === boostedTime ? boostedTime : submittedTime; const duration = state === boostedTime ? boostedVotePeriodLimit : preBoostedVotePeriodLimit; <<<<<<< proposal.state == ProposalStates.BoostedTimedOut || ======= ((proposal.state == ProposalStates.Boosted || proposal.state == ProposalStates.QuietEndingPeriod) && proposal.boostedTime + proposal.boostedVotePeriodLimit <= +moment() / 1000) || >>>>>>> proposal.state == ProposalStates.BoostedTimedOut || <<<<<<< (proposal.state == ProposalStates.BoostedTimedOut && proposal.winningVote == VoteOptions.Yes) ======= ((proposal.state == ProposalStates.Boosted || proposal.state == ProposalStates.QuietEndingPeriod) && proposal.boostedTime + proposal.boostedVotePeriodLimit <= +moment() / 1000 && proposal.winningVote == VoteOptions.Yes) >>>>>>> (proposal.state == ProposalStates.BoostedTimedOut && proposal.winningVote == VoteOptions.Yes) <<<<<<< (proposal.state == ProposalStates.BoostedTimedOut && proposal.winningVote == VoteOptions.No) || ======= ((proposal.state == ProposalStates.Boosted || proposal.state == ProposalStates.QuietEndingPeriod) && proposal.boostedTime + proposal.boostedVotePeriodLimit <= +moment() / 1000 && proposal.winningVote == VoteOptions.No) || >>>>>>> (proposal.state == ProposalStates.BoostedTimedOut && proposal.winningVote == VoteOptions.No) ||
<<<<<<< import { IProposalState, ProposalStates, closingTime } from "reducers/arcReducer"; import * as schemas from "../schemas"; import * as moment from 'moment'; ======= import { IProposalState, ProposalStates } from "reducers/arcReducer"; import * as schemas from "schemas"; >>>>>>> import { IProposalState, ProposalStates, closingTime } from "reducers/arcReducer"; import * as schemas from "schemas"; import * as moment from 'moment';
<<<<<<< } else if (url == null) { ======= } else if (segment.mediaURL === null) { >>>>>>> } else if (url === null) {
<<<<<<< export const DAT_TOKEN = 'dat'; export const DCT_TOKEN = 'dct'; export const SWAP = 'swap'; export const POOL = 'pool'; export const DELETE = 'delete'; export const CREATE_DCT = 'dat'; export const MINIMUM_DFI_REQUIRED_FOR_TOKEN_CREATION = 100; export const DCT_DISTRIBUTION = 'dct'; export const TOKEN_TRANSFERS = 'Transfers'; export const TOKEN_HOLDERS = 'Holders'; export const TOKEN_INFO = 'Info'; export const TOKEN_EXCHANGE = 'Exchange'; export const TOKEN_DEX = 'DEX'; export const TOKEN_READ_CONTRACT = 'Read Contract'; export const TOKEN_WRITE_CONTRACT = 'Write Contract'; export const TOKEN_ANALYSIS = 'Analysis'; export const TOKEN_COMMENTS = 'Comments'; ======= export const DAT_TOKEN = 'dat'; export const DCT_TOKEN = 'dct'; export const DELETE = 'delete'; export const CREATE_DCT = 'dat'; export const MINIMUM_DFI_REQUIRED_FOR_TOKEN_CREATION = 100; export const DCT_DISTRIBUTION = 'dct'; export const TOKEN_TRANSFERS = 'Transfers'; export const TOKEN_HOLDERS = 'Holders'; export const TOKEN_INFO = 'Info'; export const TOKEN_EXCHANGE = 'Exchange'; export const TOKEN_DEX = 'DEX'; export const TOKEN_READ_CONTRACT = 'Read Contract'; export const TOKEN_WRITE_CONTRACT = 'Write Contract'; export const TOKEN_ANALYSIS = 'Analysis'; export const TOKEN_COMMENTS = 'Comments'; >>>>>>> export const DAT_TOKEN = 'dat'; export const DCT_TOKEN = 'dct'; export const SWAP = 'swap'; export const POOL = 'pool'; export const DELETE = 'delete'; export const CREATE_DCT = 'dat'; export const MINIMUM_DFI_REQUIRED_FOR_TOKEN_CREATION = 100; export const DCT_DISTRIBUTION = 'dct'; export const TOKEN_TRANSFERS = 'Transfers'; export const TOKEN_HOLDERS = 'Holders'; export const TOKEN_INFO = 'Info'; export const TOKEN_EXCHANGE = 'Exchange'; export const TOKEN_DEX = 'DEX'; export const TOKEN_READ_CONTRACT = 'Read Contract'; export const TOKEN_WRITE_CONTRACT = 'Write Contract'; export const TOKEN_ANALYSIS = 'Analysis'; export const TOKEN_COMMENTS = 'Comments'; <<<<<<< export const ENTROPY_BITS = 256; export const RANDOM_WORD_ENTROPY_BITS = 128; export const DEFAULT_DFI_FOR_ACCOUNT_TO_ACCOUNT = 0.01; export const UNDEFINED_STRING = 'undefined'; ======= export const ENTROPY_BITS = 256; export const RANDOM_WORD_ENTROPY_BITS = 128; export const DEFAULT_DFI_FOR_ACCOUNT_TO_ACCOUNT = 0.01; export const UNDEFINED_STRING = 'undefined'; export const LIST_TOKEN_PAGE_SIZE = 500; export const LIST_ACCOUNTS_PAGE_SIZE = 500; >>>>>>> export const ENTROPY_BITS = 256; export const RANDOM_WORD_ENTROPY_BITS = 128; export const DEFAULT_DFI_FOR_ACCOUNT_TO_ACCOUNT = 0.01; export const UNDEFINED_STRING = 'undefined'; export const LIST_TOKEN_PAGE_SIZE = 500; export const LIST_ACCOUNTS_PAGE_SIZE = 500; <<<<<<< export const MAIN = 'main'; export const POOL_PAIR_PAGE_SIZE = 500; export const SHARE_POOL_PAGE_SIZE = 500; export const MASTERNODE_PARAMS_INCLUDE_FROM_START = true; export const MASTERNODE_PARAMS_MASTERNODE_LIMIT = 1000; export const STATS_API_BASE_URL = 'https://api.defichain.io/v1/stats'; ======= export const MAIN = 'main'; export const WALLET_UNLOCK_TIMEOUT = 600; export const IS_WALLET_LOCKED_MAIN = 'isWalletLockedMain'; export const IS_WALLET_LOCKED_TEST = 'isWalletLockedTest'; export const MASTERNODE_PARAMS_INCLUDE_FROM_START = true; export const MASTERNODE_PARAMS_MASTERNODE_LIMIT = 1000; export const STATS_API_BASE_URL = 'https://api.defichain.io/v1/stats'; >>>>>>> export const MAIN = 'main'; export const POOL_PAIR_PAGE_SIZE = 500; export const SHARE_POOL_PAGE_SIZE = 500; export const WALLET_UNLOCK_TIMEOUT = 600; export const IS_WALLET_LOCKED_MAIN = 'isWalletLockedMain'; export const IS_WALLET_LOCKED_TEST = 'isWalletLockedTest'; export const MASTERNODE_PARAMS_INCLUDE_FROM_START = true; export const MASTERNODE_PARAMS_MASTERNODE_LIMIT = 1000; export const STATS_API_BASE_URL = 'https://api.defichain.io/v1/stats';
<<<<<<< protected async buildOauthClientConfiguration(authority: string, serverTelemetryManager?: ServerTelemetryManager): Promise<ClientConfiguration> { ======= /** * Returns the logger instance */ getLogger(): Logger { return this.logger; } /** * Replaces the default logger set in configurations with new Logger with new configurations * @param logger Logger instance */ setLogger(logger: Logger): void { this.logger = logger; } protected async buildOauthClientConfiguration(authority?: string, serverTelemetryManager?: ServerTelemetryManager): Promise<ClientConfiguration> { >>>>>>> /** * Returns the logger instance */ getLogger(): Logger { return this.logger; } /** * Replaces the default logger set in configurations with new Logger with new configurations * @param logger Logger instance */ setLogger(logger: Logger): void { this.logger = logger; } protected async buildOauthClientConfiguration(authority: string, serverTelemetryManager?: ServerTelemetryManager): Promise<ClientConfiguration> {
<<<<<<< export const BLOCKCHAIN_START_SUCCESS = 'blockchain started successfully'; export const MAX_MONEY = 21000000; ======= export const BLOCKCHAIN_START_SUCCESS = 'blockchain started successfully'; export const GET_NEW_ADDRESS_TYPE = 'legacy'; >>>>>>> export const BLOCKCHAIN_START_SUCCESS = 'blockchain started successfully'; export const MAX_MONEY = 21000000; export const GET_NEW_ADDRESS_TYPE = 'legacy';
<<<<<<< }; export const getFormattedTime = () => { const today = new Date(); const y = today.getFullYear(); const m = today.getMonth() + 1; const d = today.getDate(); const h = today.getHours(); const mi = today.getMinutes(); const s = today.getSeconds(); return `${y}-${m}-${d}_${h}-${mi}-${s}`; ======= }; export const checkRPCErrorMessagePending = (message: string): string => { if (message) { const lpError = I18n.t(ADD_LP_ERROR); const amount = 'amount'; const isLess = 'is less than'; const testMessage = message.toLowerCase(); return testMessage.includes(amount) && testMessage.includes(isLess) ? lpError : message; } return message; >>>>>>> }; export const getFormattedTime = () => { const today = new Date(); const y = today.getFullYear(); const m = today.getMonth() + 1; const d = today.getDate(); const h = today.getHours(); const mi = today.getMinutes(); const s = today.getSeconds(); return `${y}-${m}-${d}_${h}-${mi}-${s}`; }; export const checkRPCErrorMessagePending = (message: string): string => { if (message) { const lpError = I18n.t(ADD_LP_ERROR); const amount = 'amount'; const isLess = 'is less than'; const testMessage = message.toLowerCase(); return testMessage.includes(amount) && testMessage.includes(isLess) ? lpError : message; } return message;
<<<<<<< import { BigNumber } from 'bignumber.js'; ======= import { PeerInfoModel } from 'src/constants/rpcModel'; >>>>>>> import { BigNumber } from 'bignumber.js'; import { PeerInfoModel } from 'src/constants/rpcModel';
<<<<<<< MASTERNODE_PARAMS_INCLUDE_FROM_START, MASTERNODE_PARAMS_MASTERNODE_LIMIT, ======= WALLET_UNLOCK_TIMEOUT, MASTERNODE_PARAMS_INCLUDE_FROM_START, MASTERNODE_PARAMS_MASTERNODE_LIMIT, >>>>>>> WALLET_UNLOCK_TIMEOUT, MASTERNODE_PARAMS_INCLUDE_FROM_START, MASTERNODE_PARAMS_MASTERNODE_LIMIT, <<<<<<< const { data } = await this.call('/', methodNames.LIST_MASTER_NODE, [ { including_start: MASTERNODE_PARAMS_INCLUDE_FROM_START, limit: MASTERNODE_PARAMS_MASTERNODE_LIMIT, }, ]); return data.result; }; createToken = async ( tokenCreatorInfo: ITokenCreatorInfo, tx: any = [] ): Promise<string> => { const { data } = await this.call('/', methodNames.CREATE_TOKEN, [ tokenCreatorInfo, ]); return data.result; }; mintToken = async ( tokenMintInfo: ITokenMintInfo, tx: any = [] ): Promise<string> => { const { hash, amount } = tokenMintInfo; const { data } = await this.call('/', methodNames.MINT_TOKEN, [ `${amount}@${hash}`, ]); return data.result; }; updateToken = async ( tokenUpdatorInfo: ITokenUpdatorInfo, tx: any = [] ): Promise<string> => { const { data } = await this.call('/', methodNames.UPDATE_TOKEN, [ tokenUpdatorInfo, ]); return data.result; }; destroyToken = async (tokenId: string, tx: any = []): Promise<string> => { const { data } = await this.call('/', methodNames.DESTROY_TOKEN, [tokenId]); return data.result; }; tokenInfo = async (key: string): Promise<string> => { const { data } = await this.call('/', methodNames.GET_TOKEN_NODE, [key]); return data.result; }; listTokens = async (): Promise<string> => { const { data } = await this.call('/', methodNames.LIST_TOKEN); return data.result; }; getTokenBalances = async (): Promise<string[]> => { const { data } = await this.call('/', methodNames.GET_TOKEN_BALANCES); ======= const { data } = await this.call('/', methodNames.LIST_MASTER_NODE, [ { including_start: MASTERNODE_PARAMS_INCLUDE_FROM_START, limit: MASTERNODE_PARAMS_MASTERNODE_LIMIT, }, ]); return data.result; }; createToken = async ( tokenCreatorInfo: ITokenCreatorInfo, tx: any = [] ): Promise<string> => { const { data } = await this.call('/', methodNames.CREATE_TOKEN, [ tokenCreatorInfo, ]); return data.result; }; mintToken = async ( tokenMintInfo: ITokenMintInfo, tx: any = [] ): Promise<string> => { const { hash, amount } = tokenMintInfo; const { data } = await this.call('/', methodNames.MINT_TOKEN, [ `${amount}@${hash}`, ]); return data.result; }; updateToken = async ( tokenUpdatorInfo: ITokenUpdatorInfo, tx: any = [] ): Promise<string> => { const { data } = await this.call('/', methodNames.UPDATE_TOKEN, [ tokenUpdatorInfo, ]); return data.result; }; destroyToken = async (tokenId: string, tx: any = []): Promise<string> => { const { data } = await this.call('/', methodNames.DESTROY_TOKEN, [tokenId]); return data.result; }; tokenInfo = async (key: string): Promise<string> => { const { data } = await this.call('/', methodNames.GET_TOKEN_NODE, [key]); return data.result; }; listTokens = async ( start: number, includingStart: boolean, limit: number ): Promise<string> => { const { data } = await this.call('/', methodNames.LIST_TOKEN, [ { start, including_start: includingStart, limit }, ]); >>>>>>> const { data } = await this.call('/', methodNames.LIST_MASTER_NODE, [ { including_start: MASTERNODE_PARAMS_INCLUDE_FROM_START, limit: MASTERNODE_PARAMS_MASTERNODE_LIMIT, }, ]); return data.result; }; createToken = async ( tokenCreatorInfo: ITokenCreatorInfo, tx: any = [] ): Promise<string> => { const { data } = await this.call('/', methodNames.CREATE_TOKEN, [ tokenCreatorInfo, ]); return data.result; }; mintToken = async ( tokenMintInfo: ITokenMintInfo, tx: any = [] ): Promise<string> => { const { hash, amount } = tokenMintInfo; const { data } = await this.call('/', methodNames.MINT_TOKEN, [ `${amount}@${hash}`, ]); return data.result; }; updateToken = async ( tokenUpdatorInfo: ITokenUpdatorInfo, tx: any = [] ): Promise<string> => { const { data } = await this.call('/', methodNames.UPDATE_TOKEN, [ tokenUpdatorInfo, ]); return data.result; }; destroyToken = async (tokenId: string, tx: any = []): Promise<string> => { const { data } = await this.call('/', methodNames.DESTROY_TOKEN, [tokenId]); return data.result; }; tokenInfo = async (key: string): Promise<string> => { const { data } = await this.call('/', methodNames.GET_TOKEN_NODE, [key]); return data.result; }; getTokenBalances = async (): Promise<string[]> => { const { data } = await this.call('/', methodNames.GET_TOKEN_BALANCES); return data.result; }; listTokens = async ( start: number, includingStart: boolean, limit: number ): Promise<string> => { const { data } = await this.call('/', methodNames.LIST_TOKEN, [ { start, including_start: includingStart, limit }, ]); <<<<<<< getAccount = async (ownerAddress: string) => { const { data } = await this.call('/', methodNames.GET_ACCOUNT, [ ownerAddress, ]); return data.result; }; listAccounts = async () => { const { data } = await this.call('/', methodNames.LIST_ACCOUNTS, [ {}, true, true, ]); return data.result; }; ======= getAccount = async (ownerAddress: string) => { const { data } = await this.call('/', methodNames.GET_ACCOUNT, [ ownerAddress, ]); return data.result; }; listAccounts = async ( includingStart: boolean, limit: number, start?: string ) => { const { data } = await this.call('/', methodNames.LIST_ACCOUNTS, [ { start, including_start: includingStart, limit, }, true, true, ]); return data.result; }; >>>>>>> getAccount = async (ownerAddress: string) => { const { data } = await this.call('/', methodNames.GET_ACCOUNT, [ ownerAddress, ]); return data.result; }; listAccounts = async ( includingStart: boolean, limit: number, start?: string ) => { const { data } = await this.call('/', methodNames.LIST_ACCOUNTS, [ { start, including_start: includingStart, limit, }, true, true, ]); return data.result; }; <<<<<<< // LP RPC call listPoolPairs = async ( start: number, including_start: boolean, limit: number ) => { const { data } = await this.call('/', methodNames.LIST_POOL_PAIRS, [ { start, including_start, limit }, ]); return data.result; }; listPoolShares = async ( start: number, including_start: boolean, limit: number ) => { const { data } = await this.call('/', methodNames.LIST_POOL_SHARES, [ { start, including_start, limit }, ]); return data.result; }; getPoolPair = async (poolID: string) => { const { data } = await this.call('/', methodNames.GET_POOL_PAIR, [poolID]); return data.result; }; addpooliquidity = async ( address1: string, amount1: string, address2: string, amount2: string, shareAddress: string ) => { const from = address1 === address2 ? { [address1]: [amount1, amount2] } : { [address1]: amount1, [address2]: amount2 }; const data = await this.call('/', methodNames.ADD_POOL_LIQUIDITY, [ from, shareAddress, ]); return data.result; }; ======= encryptWallet = async (passphrase: string) => { const { data } = await this.call('/', methodNames.ENCRYPT_WALLET, [ passphrase, ]); return data.result; }; walletPassphrase = async (passphrase: string) => { const { data } = await this.call('/', methodNames.WALLET_PASSPHRASE, [ passphrase, WALLET_UNLOCK_TIMEOUT, ]); return data.result; }; walletlock = async () => { const { data } = await this.call('/', methodNames.WALLET_LOCK, []); return data.result; }; >>>>>>> // LP RPC call listPoolPairs = async ( start: number, including_start: boolean, limit: number ) => { const { data } = await this.call('/', methodNames.LIST_POOL_PAIRS, [ { start, including_start, limit }, ]); return data.result; } encryptWallet = async (passphrase: string) => { const { data } = await this.call('/', methodNames.ENCRYPT_WALLET, [ passphrase, ]); return data.result; }; listPoolShares = async ( start: number, including_start: boolean, limit: number ) => { const { data } = await this.call('/', methodNames.LIST_POOL_SHARES, [ { start, including_start, limit }, ]); return data.result; } walletPassphrase = async (passphrase: string) => { const { data } = await this.call('/', methodNames.WALLET_PASSPHRASE, [ passphrase, WALLET_UNLOCK_TIMEOUT, ]); return data.result; }; getPoolPair = async (poolID: string) => { const { data } = await this.call('/', methodNames.GET_POOL_PAIR, [poolID]); return data.result; }; addpooliquidity = async ( address1: string, amount1: string, address2: string, amount2: string, shareAddress: string ) => { const from = address1 === address2 ? { [address1]: [amount1, amount2] } : { [address1]: amount1, [address2]: amount2 }; const data = await this.call('/', methodNames.ADD_POOL_LIQUIDITY, [ from, shareAddress, ]); return data.result; }; walletlock = async () => { const { data } = await this.call('/', methodNames.WALLET_LOCK, []); return data.result; };
<<<<<<< export const getTxnSize = async (): Promise<number> => { const rpcClient = new RpcClient(); const unspent = await rpcClient.listUnspent(MAX_MONEY); const inputs = unspent.length; const outputs = 2; return inputs * 180 + outputs * 34 + 10 + inputs; }; ======= export const toSha256 = (value): any => { return SHA256(value).toString(); }; >>>>>>> export const getTxnSize = async (): Promise<number> => { const rpcClient = new RpcClient(); const unspent = await rpcClient.listUnspent(MAX_MONEY); const inputs = unspent.length; const outputs = 2; return inputs * 180 + outputs * 34 + 10 + inputs; }; export const toSha256 = (value): any => { return SHA256(value).toString(); };
<<<<<<< export { AdminUserService } from './adminUser.service' export { AdminUserController } from './adminUser.controller' export { LocalStrategy } from './local.strategy' ======= export { AdminUserService } from './adminUser.service' export { default as DefaultAdminModule } from './defaultAdmin.module' >>>>>>> export { AdminUserService } from './adminUser.service' export { AdminUserController } from './adminUser.controller' export { LocalStrategy } from './local.strategy' export { default as DefaultAdminModule } from './defaultAdmin.module'
<<<<<<< const resp = await this.client.rest.post(CHANNEL_MESSAGES(this.id), { ======= if (this.client.user === undefined) { throw new Error('Client user has not initialized.') } const resp = await fetch(CHANNEL_MESSAGES(this.id), { headers: { Authorization: `Bot ${this.client.token}`, 'Content-Type': 'application/json' }, method: 'POST', body: JSON.stringify({ >>>>>>> const resp = await this.client.rest.post(CHANNEL_MESSAGES(this.id), { <<<<<<< return new Message(this.client, resp as any, this, this.client.user as User, new MessageMentions()) ======= return new Message( this.client, await resp.json(), this, this.client.user, new MessageMentions() ) >>>>>>> return new Message(this.client, resp as any, this, this.client.user, new MessageMentions())
<<<<<<< } export interface GuildWidgetPayload { id: string name: string instant_invite: string channels: Array<{ id: string; name: string; position: number }> members: MemberPayload[] presence_count: number ======= } export type GuildChannelPayloads = | GuildTextChannelPayload | GuildVoiceChannelPayload | GuildCategoryChannelPayload export type GuildChannels = GuildTextChannel | VoiceChannel | CategoryChannel export interface GuildCreatePayload { name: string region?: string icon?: string verification_level?: number default_message_notifications?: number explicit_content_filter?: number roles?: GuildCreateRolePayload[] channels?: GuildCreateChannelPayload[] afk_channel_id?: string afk_timeout?: number system_channel_id?: string } export interface GuildCreateRolePayload { id?: string name: string color?: number hoist?: boolean position?: number permissions?: string managed?: boolean mentionable?: boolean } export interface GuildCreateChannelPayload { id?: string name: string type: ChannelTypes parent_id?: string } export interface GuildCreateChannelOptions { id?: string name: string type: ChannelTypes parentID?: string } export interface GuildCreateOptions { name: string region?: string icon?: string verificationLevel?: Verification roles?: Array<Role | GuildCreateRolePayload> channels?: Array<GuildChannels | GuildCreateChannelOptions> afkChannelID?: string afkTimeout?: number systemChannelID?: string } export interface GuildPreviewPayload { id: string name: string icon: string | null splash: string | null discovery_splash: string | null emojis: EmojiPayload[] features: GuildFeatures[] approximate_member_count: number approximate_presence_count: number description: string | null } export interface GuildPreview { id: string name: string icon: string | null splash: string | null discoverySplash: string | null emojis: Emoji[] features: GuildFeatures[] approximateMemberCount: number approximatePresenceCount: number description: string | null } export interface GuildModifyPayload { name?: string region?: string | null verification_level?: Verification | null default_message_notifications?: MessageNotification | null explicit_content_filter?: ContentFilter | null afk_channel_id?: string | null afk_timeout?: number icon?: string | null owner_id?: string splash?: string | null banner?: string | null system_channel_id?: string | null rules_channel_id?: string | null public_updates_channel_id?: string | null preferred_locale?: string | null } export interface GuildModifyOptions { name?: string region?: string | null verificationLevel?: Verification | null defaultMessageNotifications?: MessageNotification | null explicitContentFilter?: ContentFilter | null afkChannelID?: string | null afkTimeout?: number icon?: string | null ownerID?: string splash?: string | null banner?: string | null systemChannelID?: string | null rulesChannelID?: string | null publicUpdatesChannelID?: string | null preferredLocale?: string | null } export interface GuildPruneCountPayload { pruned: number | null } export interface GuildGetPruneCountPayload { days?: number include_roles?: string } export interface GuildBeginPrunePayload { days?: number compute_prune_count?: boolean include_roles?: string[] >>>>>>> } export interface GuildWidgetPayload { id: string name: string instant_invite: string channels: Array<{ id: string; name: string; position: number }> members: MemberPayload[] presence_count: number export type GuildChannelPayloads = | GuildTextChannelPayload | GuildVoiceChannelPayload | GuildCategoryChannelPayload export type GuildChannels = GuildTextChannel | VoiceChannel | CategoryChannel export interface GuildCreatePayload { name: string region?: string icon?: string verification_level?: number default_message_notifications?: number explicit_content_filter?: number roles?: GuildCreateRolePayload[] channels?: GuildCreateChannelPayload[] afk_channel_id?: string afk_timeout?: number system_channel_id?: string } export interface GuildCreateRolePayload { id?: string name: string color?: number hoist?: boolean position?: number permissions?: string managed?: boolean mentionable?: boolean } export interface GuildCreateChannelPayload { id?: string name: string type: ChannelTypes parent_id?: string } export interface GuildCreateChannelOptions { id?: string name: string type: ChannelTypes parentID?: string } export interface GuildCreateOptions { name: string region?: string icon?: string verificationLevel?: Verification roles?: Array<Role | GuildCreateRolePayload> channels?: Array<GuildChannels | GuildCreateChannelOptions> afkChannelID?: string afkTimeout?: number systemChannelID?: string } export interface GuildPreviewPayload { id: string name: string icon: string | null splash: string | null discovery_splash: string | null emojis: EmojiPayload[] features: GuildFeatures[] approximate_member_count: number approximate_presence_count: number description: string | null } export interface GuildPreview { id: string name: string icon: string | null splash: string | null discoverySplash: string | null emojis: Emoji[] features: GuildFeatures[] approximateMemberCount: number approximatePresenceCount: number description: string | null } export interface GuildModifyPayload { name?: string region?: string | null verification_level?: Verification | null default_message_notifications?: MessageNotification | null explicit_content_filter?: ContentFilter | null afk_channel_id?: string | null afk_timeout?: number icon?: string | null owner_id?: string splash?: string | null banner?: string | null system_channel_id?: string | null rules_channel_id?: string | null public_updates_channel_id?: string | null preferred_locale?: string | null } export interface GuildModifyOptions { name?: string region?: string | null verificationLevel?: Verification | null defaultMessageNotifications?: MessageNotification | null explicitContentFilter?: ContentFilter | null afkChannelID?: string | null afkTimeout?: number icon?: string | null ownerID?: string splash?: string | null banner?: string | null systemChannelID?: string | null rulesChannelID?: string | null publicUpdatesChannelID?: string | null preferredLocale?: string | null } export interface GuildPruneCountPayload { pruned: number | null } export interface GuildGetPruneCountPayload { days?: number include_roles?: string } export interface GuildBeginPrunePayload { days?: number compute_prune_count?: boolean include_roles?: string[]
<<<<<<< import { Invite } from '../structures/invite.ts' import { INVITE } from '../types/endpoint.ts' ======= import { ClientEvents } from '../gateway/handlers/index.ts' >>>>>>> import { Invite } from '../structures/invite.ts' import { INVITE } from '../types/endpoint.ts' import { ClientEvents } from '../gateway/handlers/index.ts'
<<<<<<< import cache from '../models/cache.ts' import { Channel } from "./channel.ts" import { MessageMentions } from "./MessageMentions.ts" import { TextChannel } from "./textChannel.ts" import { DMChannel } from "./dmChannel.ts" import { Guild } from "./guild.ts" ======= import { Channel } from './channel.ts' import { MessageMentions } from './MessageMentions.ts' import { TextChannel } from './textChannel.ts' >>>>>>> import { Channel } from "./channel.ts" import { MessageMentions } from "./MessageMentions.ts" import { TextChannel } from "./textChannel.ts" import { DMChannel } from "./dmChannel.ts" import { Guild } from "./guild.ts" <<<<<<< constructor (client: Client, data: MessagePayload, channel: TextChannel, author: User, mentions: MessageMentions) { ======= constructor ( client: Client, data: MessagePayload, channel: Channel, author: User, mentions: MessageMentions ) { >>>>>>> constructor ( client: Client, data: MessagePayload, channel: TextChannel, author: User, mentions: MessageMentions ) { <<<<<<< edit (text?: string, option?: MessageOption): Promise<Message> { return (this.channel as TextChannel).edit(this.id, text, option) } reply(text: string, options?: MessageOption) { // TODO: Use inline replies once they're out if(this.channel instanceof DMChannel) return this.channel.send(text, options) return this.channel.send(`${this.author.mention}, ${text}`, options) ======= async edit (text?: string, option?: MessageOption): Promise<Message> { // Seriously eslint? // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion return (this.channel as TextChannel).editMessage(this.id, text, option) >>>>>>> edit (text?: string, option?: MessageOption): Promise<Message> { return this.channel.edit(this.id, text, option) } reply(text: string, options?: MessageOption) { // TODO: Use inline replies once they're out if(this.channel instanceof DMChannel) return this.channel.send(text, options) return this.channel.send(`${this.author.mention}, ${text}`, options)
<<<<<<< ======= /* * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */ import { IMsalContext } from "./MsalContext"; import { AuthenticationResult } from "@azure/msal-browser"; >>>>>>> /* * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. */
<<<<<<< import type { DefaultProvider, TextTrackLike, MetadataEvent } from 'types/generic.type'; ======= import type { GenericObject, TextTrackLike, MetadataEvent } from 'types/generic.type'; import type { ProviderWithMixins } from './default'; >>>>>>> import type { TextTrackLike, MetadataEvent } from 'types/generic.type'; import type { ProviderWithMixins } from './default'; <<<<<<< interface TracksMixin extends DefaultProvider { _itemTracks: PlaylistItemTrack[] | null; ======= export interface TracksMixin { _itemTracks: GenericObject[] | null; >>>>>>> export interface TracksMixin { _itemTracks: PlaylistItemTrack[] | null;
<<<<<<< import { Context, Env } from '../types'; ======= import { Context } from '../types'; import namedExports from 'named-exports-db'; >>>>>>> import { Context, Env } from '../types'; import namedExports from 'named-exports-db';
<<<<<<< if (this.updateQueue.length === 0) { this.updateTimer = setTimeout(() => this.applyUpdate()); ======= if (immediately) { this.updateQueue.push(update); this.applyUpdate(); } else { if (this.updateQueue.length === 0) { setTimeout(() => this.applyUpdate()); } this.updateQueue.push(update); >>>>>>> if (immediately) { this.updateQueue.push(update); this.applyUpdate(); } else { if (this.updateQueue.length === 0) { this.updateTimer = setTimeout(() => this.applyUpdate()); } this.updateQueue.push(update);
<<<<<<< .map((edge) => { const { source, target, shape, style } = edge; ======= .map(edge => { const { source, target, shape, style, type } = edge; >>>>>>> .map((edge) => { const { source, target, shape, style, type } = edge;
<<<<<<< import ConnectToArkane from "./arkane"; ======= import ConnectToAuthereum from "./authereum"; >>>>>>> import ConnectToArkane from "./arkane"; import ConnectToAuthereum from "./authereum"; <<<<<<< ConnectToSquarelink, ConnectToArkane ======= ConnectToSquarelink, ConnectToAuthereum >>>>>>> ConnectToSquarelink, ConnectToArkane, ConnectToAuthereum
<<<<<<< portis: { name: "@portis/web3", option: "portis", required: ["id"] }, walletconnect: { name: "@walletconnect/web3-provider", option: "walletconnect", required: ["infuraId"] }, arkane: { name: "@arkane-network/web3-arkane-provider", option: "arkane", required: ["clientId"] ======= torus: { name: "@toruslabs/torus-embed", option: "torus", required: [] >>>>>>> torus: { name: "@toruslabs/torus-embed", option: "torus", required: [] }, arkane: { name: "@arkane-network/web3-arkane-provider", option: "arkane", required: ["clientId"]
<<<<<<< // @ts-ignore import TorusLogo from "../assets/torus.png"; ======= // @ts-ignore import AuthereumLogo from "../assets/authereum.svg"; >>>>>>> // @ts-ignore import TorusLogo from "../assets/torus.png"; // @ts-ignore import AuthereumLogo from "../assets/authereum.svg"; <<<<<<< arkane: { name: "@arkane-network/web3-arkane-provider", option: "arkane", required: ["clientId"] ======= authereum: { name: "authereum", option: "authereum", required: [] }, walletconnect: { name: "@walletconnect/web3-provider", option: "walletconnect", required: ["infuraId"] >>>>>>> arkane: { name: "@arkane-network/web3-arkane-provider", option: "arkane", required: ["clientId"] }, authereum: { name: "authereum", option: "authereum", required: [] <<<<<<< }, { name: "Google", logo: TorusLogo, type: "web", check: "isTorus", styled: { noShadow: true } ======= }, { name: "Authereum", logo: AuthereumLogo, type: "web", check: "isAuthereum", styled: { noShadow: true } >>>>>>> }, { name: "Google", logo: TorusLogo, type: "web", check: "isTorus", styled: { noShadow: false } }, { name: "Authereum", logo: AuthereumLogo, type: "web", check: "isAuthereum", styled: { noShadow: true }
<<<<<<< // @ts-ignore import DcentWalletLogo from "../logos/dcentwallet.png"; ======= // @ts-ignore import MEWwallet from "../logos/mewwallet.png" >>>>>>> // @ts-ignore import MEWwallet from "../logos/mewwallet.png" // @ts-ignore import DcentWalletLogo from "../logos/dcentwallet.png"; <<<<<<< }; export const DCENT_PROVIDER: IProviderInfo = { id: "dcentwallet", name: "D'CENT", logo: DcentWalletLogo, type: "hardware", check: "isDcentWallet", package: { required: ["rpcUrl"] } ======= }; export const MEWCONNECT: IProviderInfo = { id: "mewconnect", name: "MEW wallet", logo: MEWwallet, type: "qrcode", check: "isMEWconnect", package: { required: [["infuraId", "rpc"]] } >>>>>>> }; export const MEWCONNECT: IProviderInfo = { id: "mewconnect", name: "MEW wallet", logo: MEWwallet, type: "qrcode", check: "isMEWconnect", package: { required: [["infuraId", "rpc"]] } }; export const DCENT_PROVIDER: IProviderInfo = { id: "dcentwallet", name: "D'CENT", logo: DcentWalletLogo, type: "hardware", check: "isDcentWallet", package: { required: ["rpcUrl"] }
<<<<<<< import * as Updater from "./updater/internal"; ======= import * as Tokens from "./tokens/internal"; >>>>>>> import * as Updater from "./updater/internal"; import * as Tokens from "./tokens/internal";
<<<<<<< import { QueryParamConfig, StringParam } from 'serialize-query-params'; import { getSSRSafeSearchString, usePreviousIfShallowEqual } from './helpers'; import { sharedMemoizedQueryParser } from './memoizedQueryParser'; import { useQueryParamContext } from './QueryParamProvider'; ======= import { parse as parseQueryString, parseUrl as parseQueryURL, stringify, EncodedQueryWithNulls, StringParam, QueryParamConfig, } from 'serialize-query-params'; import { LocationContext } from './LocationContext'; >>>>>>> import { QueryParamConfig, StringParam } from 'serialize-query-params'; import { getSSRSafeSearchString, usePreviousIfShallowEqual } from './helpers'; import { sharedMemoizedQueryParser } from './memoizedQueryParser'; import { LocationContext } from './LocationContext'; <<<<<<< const { history, location } = useQueryParamContext(); // create the setter, memoizing via useCallback const setValue = React.useCallback( (newValue: D, updateType?: UrlUpdateType) => { const newEncodedValue = paramConfig.encode(newValue); updateUrlQuery( { [name]: newEncodedValue }, refHistory.current.location || refLocation.current, // see #46 for why we use a ref here refHistory.current, updateType ); }, [paramConfig, name] ); // ref with current version history object (see #46) const refHistory = React.useRef(history); React.useEffect(() => { refHistory.current = history; }, [history]); // ref with current version location object (see #46) const refLocation = React.useRef(location); React.useEffect(() => { refLocation.current = location; }, [location]); ======= const [location, setLocation] = React.useContext(LocationContext); >>>>>>> // const { history, location } = useQueryParamContext(); console.warn('TODO, add back in useLocationContext for dev warning'); const [location, setLocation] = React.useContext(LocationContext); // create the setter, memoizing via useCallback const setValue = React.useCallback( (newValue: D, updateType?: UrlUpdateType) => { const newEncodedValue = paramConfig.encode(newValue); setLocation({ [name]: newEncodedValue }, updateType); }, [paramConfig, name, setLocation] ); <<<<<<< }, [encodedValue, paramConfig]); ======= }, [arraySafeEncodedValue, paramConfig]); // eslint-disable-line react-hooks/exhaustive-deps // create the setter, memoizing via useCallback const setValue = React.useCallback( (newValue: D, updateType?: UrlUpdateType) => { const newEncodedValue = paramConfig.encode(newValue); setLocation({ [name]: newEncodedValue }, updateType); }, [setLocation, paramConfig, name] ); >>>>>>> }, [encodedValue, paramConfig]);
<<<<<<< export function updateUrlQuery( queryReplacements: EncodedQuery, ======= export function getLocation( queryReplacements: EncodedQueryWithNulls, >>>>>>> export function getLocation( queryReplacements: EncodedQuery, <<<<<<< updateType: UrlUpdateType = 'pushIn' ======= location: Location, updateType: UrlUpdateType = 'replaceIn' >>>>>>> location: Location, updateType: UrlUpdateType = 'pushIn'
<<<<<<< } function padZero(i: any) { if (i < 10) { i = "0" + i; } return i; } export function secondsToString(seconds:number):string{ var time = new Date(null); time.setHours(0); time.setMinutes(0); time.setSeconds(seconds); return padZero(time.getHours()) + ":" + padZero(time.getMinutes()) + ":" + padZero(time.getSeconds()); ======= } export const last = function(array: any[]): any { return array[array.length - 1]; >>>>>>> } function padZero(i: any) { if (i < 10) { i = "0" + i; } return i; } export function secondsToString(seconds:number):string{ var time = new Date(null); time.setHours(0); time.setMinutes(0); time.setSeconds(seconds); return padZero(time.getHours()) + ":" + padZero(time.getMinutes()) + ":" + padZero(time.getSeconds()); } export const last = function(array: any[]): any { return array[array.length - 1];
<<<<<<< import { UrlString, StringUtils, Constants, TokenResponse, SPAClient } from "@azure/msal-common"; ======= import { UrlString, StringUtils, Constants, AuthorizationCodeModule } from "@azure/msal-common"; >>>>>>> import { UrlString, StringUtils, Constants, SPAClient } from "@azure/msal-common"; <<<<<<< * Function to handle response parameters from hash. * @param locationHash */ async handleCodeResponse(locationHash: string): Promise<TokenResponse> { // Check that location hash isn't empty. if (StringUtils.isEmpty(locationHash)) { throw BrowserAuthError.createEmptyHashError(locationHash); } // Handle code response. const codeResponse = this.authModule.handleFragmentResponse(locationHash); // Acquire token with retrieved code. return this.authModule.acquireToken(codeResponse); } /** * Monitors a window until it loads a url with a hash ======= * Monitors a window until it loads a url with a known hash, or hits a specified timeout. >>>>>>> * Monitors a window until it loads a url with a known hash, or hits a specified timeout.
<<<<<<< alg?: Sequence; puzzle?: KPuzzleDefinition; visualization?: VisualizationFormat; ======= alg?: Sequence; puzzle?: KPuzzleDefinition; player?: { experimental3D?: boolean } >>>>>>> alg?: Sequence; puzzle?: KPuzzleDefinition; visualization?: VisualizationFormat; <<<<<<< this.element.appendChild((new Player(this.anim, this.puzzleDef, config.visualization)).element); ======= this.element.appendChild((new Player(this.anim, this.puzzleDef, config.player)).element); } // Plays the full final move. experimentalSetAlg(alg: Sequence) { this.anim.skipToStart(); this.alg = alg; this.cursor.experimentalSetMoves(alg); this.anim.skipToEnd(); if (this.anim.cursor.currentTimestamp() > 0) { // TODO: This is a hack. this.cursor.backward(0.01, false); // TODO: Give this API to `Cursor`/`AnimModel`. this.cursor.backward(100000, true); // TODO: Give this API to `Cursor`/`AnimModel`. } this.anim.stepForward(); >>>>>>> this.element.appendChild((new Player(this.anim, this.puzzleDef, config.visualization)).element); } // Plays the full final move. experimentalSetAlg(alg: Sequence) { this.anim.skipToStart(); this.alg = alg; this.cursor.experimentalSetMoves(alg); this.anim.skipToEnd(); if (this.anim.cursor.currentTimestamp() > 0) { // TODO: This is a hack. this.cursor.backward(0.01, false); // TODO: Give this API to `Cursor`/`AnimModel`. this.cursor.backward(100000, true); // TODO: Give this API to `Cursor`/`AnimModel`. } this.anim.stepForward();
<<<<<<< .toPromise() .then(candidates => addCandidatesInOrder(candidates, (candidate, isProject) => this._addSolution(candidate, isProject, { project }))); ======= .flatMap(candidates => { return Observable.fromArray(candidates.map(x => x.path)) .flatMap(x => this._findRepositoryForPath(x), (path, repo) => ({ path, repo })) .toArray() .toPromise() .then(repos => { const newCandidates = _.difference(candidates.map(z => z.path), fromIterator(this._solutions.keys())).map(z => _.find(candidates, { path: z })) .map(({ path, isProject }) => { const found = _.find(repos, x => x.path === path); const repo = found && found.repo; return { path, isProject, repo }; }); return addCandidatesInOrder(newCandidates, (candidate, repo, isProject) => this._addSolution(candidate, repo, isProject, { project })); }); }); >>>>>>> .flatMap(candidates => { return Observable.fromArray(candidates.map(x => x.path)) .flatMap(x => this._findRepositoryForPath(x), (path, repo) => ({ path, repo })) .toArray() .toPromise() .then(repos => { const newCandidates = _.difference(candidates.map(z => z.path), fromIterator(this._solutions.keys())).map(z => _.find(candidates, { path: z })) .map(({ path, isProject }) => { const found = _.find(repos, x => x.path === path); const repo = found && found.repo; return { path, isProject, repo }; }); return addCandidatesInOrder(newCandidates, (candidate, repo, isProject) => this._addSolution(candidate, repo, isProject, { project })); }); }); <<<<<<< private _addSolution(candidate: string, isProject: boolean, {temporary = false, project}: { delay?: number; temporary?: boolean; project?: string; }): Observable<Solution> { ======= private _addSolution(candidate: string, repo: ASYNC_REPOSITORY, isProject: boolean, {temporary = false, project}: { delay?: number; temporary?: boolean; project?: string; }) { >>>>>>> private _addSolution(candidate: string, repo: ASYNC_REPOSITORY, isProject: boolean, {temporary = false, project}: { delay?: number; temporary?: boolean; project?: string; }) { <<<<<<< const newCandidates = _.difference(candidates.map(z => z.path), fromIterator(this._solutions.keys())).map(z => _.find(candidates, { path: z })); this._activeSearch.then(() => addCandidatesInOrder(newCandidates, (candidate, isProject) => this._addSolution(candidate, isProject, { temporary: !project })) .then(() => { if (!isFolderPerFile) { // Attempt to see if this file is part a solution const r = this._isPartOfAnyActiveSolution(location, (intersect, solution) => { subject.next(solution); subject.complete(); return; ======= this._activeSearch.then(() => Observable.fromArray(candidates.map(x => x.path)) .flatMap(x => this._findRepositoryForPath(x), (path, repo) => ({ path, repo })) .toArray() .toPromise()) .then(repos => { const newCandidates = _.difference(candidates.map(z => z.path), fromIterator(this._solutions.keys())).map(z => _.find(candidates, { path: z })) .map(({ path, isProject }) => { const found = _.find(repos, x => x.path === path); const repo = found && found.repo; return { path, isProject, repo }; >>>>>>> this._activeSearch.then(() => Observable.fromArray(candidates.map(x => x.path)) .flatMap(x => this._findRepositoryForPath(x), (path, repo) => ({ path, repo })) .toArray() .toPromise()) .then(repos => { const newCandidates = _.difference(candidates.map(z => z.path), fromIterator(this._solutions.keys())).map(z => _.find(candidates, { path: z })) .map(({ path, isProject }) => { const found = _.find(repos, x => x.path === path); const repo = found && found.repo; return { path, isProject, repo }; <<<<<<< const intersect = this._intersectPath(location) || this._intersectAtomProjectPath(location); if (intersect) { if (this._solutions.has(intersect)) { subject.next(this._solutions.get(intersect)); // The boolean means this solution is temporary. } } else { atom.notifications.addInfo(`Could not find a solution for "${location}"`); } subject.complete(); })); ======= const intersect = this._intersectPath(location) || this._intersectAtomProjectPath(location); if (intersect) { if (this._solutions.has(intersect)) { subject.onNext(this._solutions.get(intersect)); // The boolean means this solution is temporary. } } else { atom.notifications.addInfo(`Could not find a solution for "${location}"`); } subject.onCompleted(); }); }); >>>>>>> const intersect = this._intersectPath(location) || this._intersectAtomProjectPath(location); if (intersect) { if (this._solutions.has(intersect)) { subject.next(this._solutions.get(intersect)); // The boolean means this solution is temporary. } } else { atom.notifications.addInfo(`Could not find a solution for "${location}"`); } subject.complete(); }); }); <<<<<<< function addCandidatesInOrder(candidates: { path: string; isProject: boolean; }[], cb: (candidate: string, isProject: boolean) => Observable<Solution>) { const asyncSubject = new AsyncSubject<any>(); ======= function addCandidatesInOrder(candidates: { path: string; repo: ASYNC_REPOSITORY; isProject: boolean; }[], cb: (candidate: string, repo: ASYNC_REPOSITORY, isProject: boolean) => Rx.Observable<Solution>) { const asyncSubject = new AsyncSubject(); >>>>>>> function addCandidatesInOrder(candidates: { path: string; repo: ASYNC_REPOSITORY; isProject: boolean; }[], cb: (candidate: string, repo: ASYNC_REPOSITORY, isProject: boolean) => Observable<Solution>) { const asyncSubject = new AsyncSubject(); <<<<<<< const handleCandidate = (cand: { path: string; isProject: boolean; }) => { cb(cand.path, cand.isProject) .subscribe({ complete: () => { ======= const handleCandidate = (cand: { path: string; repo: ASYNC_REPOSITORY; isProject: boolean; }) => { cb(cand.path, cand.repo, cand.isProject) .subscribeOnCompleted(() => { >>>>>>> const handleCandidate = (cand: { path: string; repo: ASYNC_REPOSITORY; isProject: boolean; }) => { cb(cand.path, cand.repo, cand.isProject) .subscribe({ complete: () => {
<<<<<<< cd.add(Observable.zip( Omni.listener.signatureHelp, Omni.listener.signatureHelp.skip(1), (current, previous) => ({ current, previous })) .subscribe(ctx => { var {current, previous} = ctx; if (!current.response || !current.response.Signatures || current.response.Signatures.length === 0) { if (this._bubble) { this._bubble.dispose(); } } if (current.response && current.response.Signatures && previous.response && previous.response.Signatures) { if (this._bubble && !_.isEqual(current.response.Signatures, previous.response.Signatures)) { this._bubble.dispose(); } } })); ======= >>>>>>>
<<<<<<< Omni.getSolutionForProject(project).map(solution => ({ solution, project, filePath }))) .flatMap(({ solution, project, filePath }) => { ======= Omni.getClientForProject(project).map(client => ({ client, project, filePath }))) .where(x => !!x.client) .flatMap(({ client, project, filePath }) => { >>>>>>> Omni.getClientForProject(project).map(client => ({ client, project, filePath }))) .where(x => !!x.client) .flatMap(({ solution, project, filePath }) => {
<<<<<<< constructor() {} ngOnInit() {} onFilterTextChange($event) { this.onFilterChange.emit($event); } ======= constructor(private cdr: ChangeDetectorRef) {} >>>>>>> constructor() {} ngOnInit() {} onFilterTextChange($event) { this.onFilterChange.emit($event); } constructor(private cdr: ChangeDetectorRef) {}
<<<<<<< import { AccountInfo } from "../account/AccountInfo"; ======= import { IAccount } from "../account/IAccount"; import { BaseAuthRequest } from "./BaseAuthRequest"; >>>>>>> import { AccountInfo } from "../account/AccountInfo"; import { BaseAuthRequest } from "./BaseAuthRequest"; <<<<<<< export type SilentFlowRequest = { scopes: Array<string>; authority?: string; account: AccountInfo; ======= export type SilentFlowRequest = BaseAuthRequest & { account: IAccount; >>>>>>> export type SilentFlowRequest = BaseAuthRequest & { account: AccountInfo;
<<<<<<< private processWhereArrayQry() { this._isArrayQry = true; var where_query = this._query.Where, ======= private processWhereArrayQry = function () { var is_first_where = true, original_onsuccess = this._onSuccess, where_query = this._query.Where, >>>>>>> private processWhereArrayQry() { this._isArrayQry = true; var is_first_where = true, where_query = this._query.Where,
<<<<<<< import {Component} from 'angular2/core'; import {Control, Validators, FormBuilder} from 'angular2/common'; ======= import { Component } from '@angular/core'; import { FormGroup, FormControl, Validators } from '@angular/forms'; >>>>>>> import { Component } from '@angular/core'; import { FormControl, Validators, FormBuilder } from '@angular/forms'; <<<<<<< form; constructor(private formBuilder: FormBuilder) {} ======= form: FormGroup; >>>>>>> form: FormGroup; constructor(private formBuilder: FormBuilder) {} <<<<<<< this.form = this.formBuilder.group({ 'medium': new Control('Movies'), 'name': new Control('', Validators.compose([ ======= this.form = new FormGroup({ 'medium': new FormControl('Movies'), 'name': new FormControl('', Validators.compose([ >>>>>>> this.form = this.formBuilder.group({ 'medium': new FormControl('Movies'), 'name': new FormControl('', Validators.compose([
<<<<<<< semi: boolean; ======= useTabs: boolean; >>>>>>> semi: boolean; useTabs: boolean; <<<<<<< parser: parser, semi: config.semi ======= parser: parser, useTabs: config.useTabs, >>>>>>> parser: parser, semi: config.semi, useTabs: config.useTabs,
<<<<<<< import { Barcode, GeoCoordinates, Thing, typeIsThing } from '../schema/core-schema-org.js'; import { ARArtifact, ARImageTarget, ARTargetTypes } from '../schema/extension-ar-artifacts.js'; ======= import { ARArtifact, ARTargetTypes } from '../schema/ar-artifact.js'; import { GeoCoordinates } from '../schema/geo-coordinates.js'; import { JsonLd } from '../schema/json-ld.js'; >>>>>>> import { Barcode, GeoCoordinates, Thing, typeIsThing } from '../schema/core-schema-org.js'; import { ARArtifact, ARImageTarget, ARTargetTypes } from '../schema/extension-ar-artifacts.js'; <<<<<<< let targets: ARTargetTypes[]; ======= let targets: ARTargetTypes[] = []; >>>>>>> let targets: ARTargetTypes[]; <<<<<<< if (!typeIsThing(target)) { continue; } ======= // TODO: add support for URL-only targets. Fetch and get type from mime-type, or embedded schema. >>>>>>> if (!typeIsThing(target)) { continue; } <<<<<<< this.markerStore.addMarker(artifact, target as Barcode); break; case 'ARImageTarget': this.imageStore.addImage(artifact, target as ARImageTarget); ======= if (this.markerStore.addMarker(artifact, target)) { totalAdded++; } >>>>>>> this.markerStore.addMarker(artifact, target as Barcode); if (this.markerStore.addMarker(artifact, target)) { totalAdded++; } break; case 'ARImageTarget': this.imageStore.addImage(artifact, target as ARImageTarget);
<<<<<<< const url = new URL('/base/test-assets/test1.html', window.location.href); await meaningMaker.loadArtifactsFromUrl(url); ======= const url = new URL('/base/test-assets/test-barcode.html', window.location.href); const artifacts = await meaningMaker.loadArtifactsFromUrl(url); assert.lengthOf(artifacts, 1); >>>>>>> const url = new URL('/base/test-assets/test-barcode.html', window.location.href); const artifacts = await meaningMaker.loadArtifactsFromUrl(url); assert.lengthOf(artifacts, 1); <<<<<<< const url = new URL('/base/test-assets/test1.html', window.location.href); await meaningMaker.loadArtifactsFromUrl(url); ======= const location = { latitude: 1, longitude: 1 }; const url = new URL('/base/test-assets/test-barcode.html', window.location.href); const artifacts = await meaningMaker.loadArtifactsFromUrl(url); assert.lengthOf(artifacts, 1); >>>>>>> const url = new URL('/base/test-assets/test-barcode.html', window.location.href); const artifacts = await meaningMaker.loadArtifactsFromUrl(url); assert.lengthOf(artifacts, 1);
<<<<<<< import { AngularFireDatabase } from 'angularfire2/database'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { LocalStorageService } from './local-storage.service'; ======= import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { LocalStorageService } from './local-storage.service'; // temporary import * as jsonData from '../../../merged-dev.json'; >>>>>>> import { AngularFireDatabase } from 'angularfire2/database'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; import { LocalStorageService } from './local-storage.service'; // temporary import * as jsonData from '../../../merged-dev.json'; <<<<<<< constructor(private db: AngularFireDatabase, private localStorageService: LocalStorageService) { this.cached = localStorageService.getObject('courses') || {}; this.cacheTime = new Date(localStorageService.get('coursesCacheTime')); } ======= constructor(private localStorageService: LocalStorageService) { this.cached = localStorageService.getObject('courses') || {}; this.cacheTime = new Date(localStorageService.get('coursesCacheTime')); } >>>>>>> constructor(private db: AngularFireDatabase, private localStorageService: LocalStorageService) { this.cached = localStorageService.getObject('courses') || {}; this.cacheTime = new Date(localStorageService.get('coursesCacheTime')); } <<<<<<< return this.db.database.ref('/courses').once('value').then((snapshot) => { const courses = snapshot.val(); Object.keys(courses).forEach(courseId => { if (courses[courseId].reviews) { courses[courseId].numReviews = Object.keys(courses[courseId].reviews).length; } courses[courseId].id = courseId; if (courses[courseId].grades) { courses[courseId].totals = this.processGrades(courses[courseId].grades); courses[courseId].semesterGrades = Object.keys(courses[courseId].grades).map(semGrade => { const grade = courses[courseId].grades[semGrade]; grade.semester = semGrade; return grade; }); } else { courses[courseId].semesterGrades = []; courses[courseId].totals = {}; } }); this.cached = Object.assign(this.cached, courses); if (this.cacheTime === null) { this.cacheTime = new Date(); this.localStorageService.set('coursesCacheTime', this.cacheTime); ======= const courses = (<any>jsonData).courses; this.courseIds = Object.keys(courses); Object.keys(courses).forEach(courseId => { courses[courseId].numReviews = Object.keys(courses[courseId].reviews).length; courses[courseId].id = courseId; if (courses[courseId].grades) { courses[courseId].totals = this.processGrades(courses[courseId].grades); courses[courseId].semesterGrades = Object.keys(courses[courseId].grades).map(semGrade => { const grade = courses[courseId].grades[semGrade]; grade.semester = semGrade; return grade; }); } else { courses[courseId].semesterGrades = []; courses[courseId].totals = {}; >>>>>>> return this.db.database.ref('/courses').once('value').then((snapshot) => { const courses = snapshot.val(); Object.keys(courses).forEach(courseId => { if (courses[courseId].reviews) { courses[courseId].numReviews = Object.keys(courses[courseId].reviews).length; } courses[courseId].id = courseId; if (courses[courseId].grades) { courses[courseId].totals = this.processGrades(courses[courseId].grades); courses[courseId].semesterGrades = Object.keys(courses[courseId].grades).map(semGrade => { const grade = courses[courseId].grades[semGrade]; grade.semester = semGrade; return grade; }); } else { courses[courseId].semesterGrades = []; courses[courseId].totals = {}; } }); this.cached = Object.assign(this.cached, courses); if (this.cacheTime === null) { this.cacheTime = new Date(); this.localStorageService.set('coursesCacheTime', this.cacheTime); <<<<<<< ======= this.cached = Object.assign(this.cached, courses); if (this.cacheTime === null) { this.cacheTime = new Date(); this.localStorageService.set('coursesCacheTime', this.cacheTime); } this.broadcast(); return this.courses$.asObservable(); >>>>>>> <<<<<<< return this.db.database.ref('/courses/' + courseId).once('value').then((snapshot) => { const course: any = snapshot.val(); course.numReviews = Object.keys(course.reviews || {}).length; course.id = courseId; const temp = {}; temp[courseId] = course; this.cached = Object.assign(this.cached, temp); this.broadcast(); return this.course$.asObservable(); }); ======= const course = (<any>jsonData).courses[courseId]; course.numReviews = Object.keys(course.reviews).length; course.id = courseId; const temp = {}; temp[courseId] = course; this.cached = Object.assign(this.cached, temp); this.broadcast(); return this.course$.asObservable(); >>>>>>> return this.db.database.ref('/courses/' + courseId).once('value').then((snapshot) => { const course: any = snapshot.val(); course.numReviews = Object.keys(course.reviews || {}).length; course.id = courseId; const temp = {}; temp[courseId] = course; this.cached = Object.assign(this.cached, temp); this.broadcast(); return this.course$.asObservable(); });
<<<<<<< ======= import {FunctionServer} from "./function-server"; import {SourceNameGenerator} from "../external/source-name-generator"; import {SpokesClient} from "../external/spokes"; >>>>>>> import {FunctionServer} from "./function-server"; <<<<<<< ======= if (this.proxyType === ProxyType.GOOGLE_CLOUD_FUNCTION) { callbackCountDown++; this.functionServer = new FunctionServer(this.functionFile, this.functionName, this.httpPort); this.functionServer.start(callback); } this.createSpokesPipe(); >>>>>>> if (this.proxyType === ProxyType.GOOGLE_CLOUD_FUNCTION) { callbackCountDown++; this.functionServer = new FunctionServer(this.functionFile, this.functionName, this.httpPort); this.functionServer.start(callback); }
<<<<<<< ======= is_biddable sale { is_preview display_timely_at __id } is_acquireable is_offerable >>>>>>> <<<<<<< "text": "query SaveArtworkQuery(\n $artworkID: String!\n) {\n artwork(id: $artworkID) {\n ...GridItem_artwork\n __id\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n href\n ...Metadata_artwork\n ...Save_artwork\n ...Badge_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Badge_artwork on Artwork {\n is_biddable\n is_acquireable\n is_offerable\n href\n sale {\n is_preview\n __id\n }\n __id\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n display_timely_at\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", ======= "text": "query SaveArtworkQuery(\n $artworkID: String!\n) {\n artwork(id: $artworkID) {\n ...GridItem_artwork\n __id\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n is_biddable\n sale {\n is_preview\n display_timely_at\n __id\n }\n is_acquireable\n is_offerable\n href\n ...Metadata_artwork\n ...Save_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_closed\n __id\n }\n sale_artwork {\n counts {\n bidder_positions\n }\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", >>>>>>> "text": "query SaveArtworkQuery(\n $artworkID: String!\n) {\n artwork(id: $artworkID) {\n ...GridItem_artwork\n __id\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n href\n ...Metadata_artwork\n ...Save_artwork\n ...Badge_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Badge_artwork on Artwork {\n is_biddable\n is_acquireable\n is_offerable\n href\n sale {\n is_preview\n display_timely_at\n __id\n }\n __id\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_closed\n __id\n }\n sale_artwork {\n counts {\n bidder_positions\n }\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", <<<<<<< "name": "is_auction", ======= "name": "is_preview", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "display_timely_at", >>>>>>> "name": "is_auction", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_closed",
<<<<<<< v9 = { ======= v7 = { >>>>>>> v8 = { <<<<<<< v10 = { ======= v8 = { >>>>>>> v9 = { <<<<<<< v11 = { ======= v9 = { >>>>>>> v10 = { <<<<<<< v12 = { ======= v10 = { >>>>>>> v11 = { <<<<<<< v13 = { ======= v11 = { "kind": "ScalarField", "alias": null, "name": "name", "args": null, "storageKey": null }, v12 = { >>>>>>> v12 = { "kind": "ScalarField", "alias": null, "name": "name", "args": null, "storageKey": null }, v13 = { <<<<<<< "text": "query routes_RespondQuery(\n $orderID: ID!\n) {\n order: commerceOrder(id: $orderID) {\n __typename\n ...Respond_order\n __id: id\n }\n}\n\nfragment Respond_order on CommerceOrder {\n id\n mode\n state\n itemsTotal(precision: 2)\n itemsTotalCents\n totalListPrice(precision: 2)\n totalListPriceCents\n stateExpiresAt\n lineItems {\n edges {\n node {\n artwork {\n id\n __id\n }\n __id: id\n }\n }\n }\n ... on CommerceOfferOrder {\n lastOffer {\n createdAt\n id\n note\n __id: id\n }\n myLastOffer {\n createdAt\n __id: id\n }\n }\n ...TransactionDetailsSummaryItem_order\n ...ArtworkSummaryItem_order\n ...ShippingSummaryItem_order\n ...CreditCardSummaryItem_order\n ...OfferHistoryItem_order\n __id: id\n}\n\nfragment TransactionDetailsSummaryItem_order on CommerceOrder {\n __typename\n mode\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n itemsTotal(precision: 2)\n totalListPrice(precision: 2)\n buyerTotal(precision: 2)\n ... on CommerceOfferOrder {\n lastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id: id\n }\n myLastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id: id\n }\n }\n __id: id\n}\n\nfragment ArtworkSummaryItem_order on CommerceOrder {\n sellerDetails {\n __typename\n ... on Partner {\n name\n }\n ... on Node {\n __id\n }\n ... on User {\n __id\n }\n }\n lineItems {\n edges {\n node {\n artwork {\n artist_names\n title\n date\n shippingOrigin\n image {\n resized_ArtworkSummaryItem: resized(width: 55) {\n url\n }\n __id: id\n }\n __id\n }\n __id: id\n }\n }\n }\n __id: id\n}\n\nfragment ShippingSummaryItem_order on CommerceOrder {\n state\n requestedFulfillment {\n __typename\n ...ShippingAddress_ship\n }\n lineItems {\n edges {\n node {\n artwork {\n shippingOrigin\n __id\n }\n __id: id\n }\n }\n }\n __id: id\n}\n\nfragment CreditCardSummaryItem_order on CommerceOrder {\n creditCard {\n brand\n last_digits\n expiration_year\n expiration_month\n __id\n }\n __id: id\n}\n\nfragment OfferHistoryItem_order on CommerceOrder {\n ... on CommerceOfferOrder {\n offers {\n edges {\n node {\n id\n amount(precision: 2)\n createdAt(format: \"MMM D\")\n fromParticipant\n __id: id\n }\n }\n }\n lastOffer {\n id\n fromParticipant\n amount(precision: 2)\n shippingTotal(precision: 2)\n taxTotal(precision: 2)\n note\n __id: id\n }\n }\n totalListPrice(precision: 2)\n __id: id\n}\n\nfragment ShippingAddress_ship on CommerceShip {\n name\n addressLine1\n addressLine2\n city\n postalCode\n region\n country\n phoneNumber\n}\n", ======= "text": "query routes_RespondQuery(\n $orderID: String!\n) {\n order: ecommerceOrder(id: $orderID) {\n __typename\n ...Respond_order\n __id\n }\n}\n\nfragment Respond_order on Order {\n id\n mode\n state\n currencyCode\n itemsTotal(precision: 2)\n itemsTotalCents\n totalListPrice(precision: 2)\n totalListPriceCents\n stateExpiresAt\n lineItems {\n edges {\n node {\n artwork {\n id\n __id\n }\n __id\n }\n }\n }\n ... on OfferOrder {\n lastOffer {\n createdAt\n id\n note\n __id\n }\n myLastOffer {\n createdAt\n __id\n }\n }\n ...TransactionDetailsSummaryItem_order\n ...ArtworkSummaryItem_order\n ...ShippingSummaryItem_order\n ...CreditCardSummaryItem_order\n ...OfferHistoryItem_order\n __id\n}\n\nfragment TransactionDetailsSummaryItem_order on Order {\n __typename\n mode\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n itemsTotal(precision: 2)\n totalListPrice(precision: 2)\n buyerTotal(precision: 2)\n ... on OfferOrder {\n lastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id\n }\n myLastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id\n }\n }\n __id\n}\n\nfragment ArtworkSummaryItem_order on Order {\n seller {\n __typename\n ... on Partner {\n name\n }\n ... on Node {\n __id\n }\n ... on User {\n __id\n }\n }\n lineItems {\n edges {\n node {\n artwork {\n artist_names\n title\n date\n shippingOrigin\n image {\n resized_ArtworkSummaryItem: resized(width: 55) {\n url\n }\n __id: id\n }\n __id\n }\n __id\n }\n }\n }\n __id\n}\n\nfragment ShippingSummaryItem_order on Order {\n state\n requestedFulfillment {\n __typename\n ...ShippingAddress_ship\n }\n lineItems {\n edges {\n node {\n artwork {\n shippingOrigin\n __id\n }\n __id\n }\n }\n }\n __id\n}\n\nfragment CreditCardSummaryItem_order on Order {\n creditCard {\n brand\n last_digits\n expiration_year\n expiration_month\n __id\n }\n __id\n}\n\nfragment OfferHistoryItem_order on Order {\n ... on OfferOrder {\n offers {\n edges {\n node {\n id\n amount(precision: 2)\n createdAt(format: \"MMM D\")\n fromParticipant\n __id\n }\n }\n }\n lastOffer {\n id\n fromParticipant\n amount(precision: 2)\n shippingTotal(precision: 2)\n taxTotal(precision: 2)\n note\n __id\n }\n }\n totalListPrice(precision: 2)\n __id\n}\n\nfragment ShippingAddress_ship on Ship {\n name\n addressLine1\n addressLine2\n city\n postalCode\n region\n country\n phoneNumber\n}\n", >>>>>>> "text": "query routes_RespondQuery(\n $orderID: ID!\n) {\n order: commerceOrder(id: $orderID) {\n __typename\n ...Respond_order\n __id: id\n }\n}\n\nfragment Respond_order on CommerceOrder {\n id\n mode\n state\n currencyCode\n itemsTotal(precision: 2)\n itemsTotalCents\n totalListPrice(precision: 2)\n totalListPriceCents\n stateExpiresAt\n lineItems {\n edges {\n node {\n artwork {\n id\n __id\n }\n __id: id\n }\n }\n }\n ... on CommerceOfferOrder {\n lastOffer {\n createdAt\n id\n note\n __id: id\n }\n myLastOffer {\n createdAt\n __id: id\n }\n }\n ...TransactionDetailsSummaryItem_order\n ...ArtworkSummaryItem_order\n ...ShippingSummaryItem_order\n ...CreditCardSummaryItem_order\n ...OfferHistoryItem_order\n __id: id\n}\n\nfragment TransactionDetailsSummaryItem_order on CommerceOrder {\n __typename\n mode\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n itemsTotal(precision: 2)\n totalListPrice(precision: 2)\n buyerTotal(precision: 2)\n ... on CommerceOfferOrder {\n lastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id: id\n }\n myLastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id: id\n }\n }\n __id: id\n}\n\nfragment ArtworkSummaryItem_order on CommerceOrder {\n sellerDetails {\n __typename\n ... on Partner {\n name\n }\n ... on Node {\n __id\n }\n ... on User {\n __id\n }\n }\n lineItems {\n edges {\n node {\n artwork {\n artist_names\n title\n date\n shippingOrigin\n image {\n resized_ArtworkSummaryItem: resized(width: 55) {\n url\n }\n __id: id\n }\n __id\n }\n __id: id\n }\n }\n }\n __id: id\n}\n\nfragment ShippingSummaryItem_order on CommerceOrder {\n state\n requestedFulfillment {\n __typename\n ...ShippingAddress_ship\n }\n lineItems {\n edges {\n node {\n artwork {\n shippingOrigin\n __id\n }\n __id: id\n }\n }\n }\n __id: id\n}\n\nfragment CreditCardSummaryItem_order on CommerceOrder {\n creditCard {\n brand\n last_digits\n expiration_year\n expiration_month\n __id\n }\n __id: id\n}\n\nfragment OfferHistoryItem_order on CommerceOrder {\n ... on CommerceOfferOrder {\n offers {\n edges {\n node {\n id\n amount(precision: 2)\n createdAt(format: \"MMM D\")\n fromParticipant\n __id: id\n }\n }\n }\n lastOffer {\n id\n fromParticipant\n amount(precision: 2)\n shippingTotal(precision: 2)\n taxTotal(precision: 2)\n note\n __id: id\n }\n }\n totalListPrice(precision: 2)\n __id: id\n}\n\nfragment ShippingAddress_ship on CommerceShip {\n name\n addressLine1\n addressLine2\n city\n postalCode\n region\n country\n phoneNumber\n}\n", <<<<<<< v4, v6, ======= v3, v2, >>>>>>> v3, v4, <<<<<<< v7, ======= v11, >>>>>>> v12, <<<<<<< "kind": "ScalarField", "alias": null, "name": "mode", "args": null, "storageKey": null }, v8, v9, v10, v11, v12, v2, { "kind": "LinkedField", "alias": null, "name": "sellerDetails", "storageKey": null, "args": null, "concreteType": null, "plural": false, "selections": [ v3, v6, { "kind": "InlineFragment", "type": "Partner", "selections": [ v7 ] } ] }, { "kind": "LinkedField", "alias": null, "name": "creditCard", "storageKey": null, "args": null, "concreteType": "CreditCard", "plural": false, "selections": [ { "kind": "ScalarField", "alias": null, "name": "brand", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "last_digits", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "expiration_year", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "expiration_month", "args": null, "storageKey": null }, v6 ] }, { ======= >>>>>>> <<<<<<< v8, ======= v6, v12, >>>>>>> v7, <<<<<<< v4, v15, ======= v3, v14, >>>>>>> v3, v15,
<<<<<<< ======= v0, v1, >>>>>>> <<<<<<< (node as any).hash = 'f7bcb894a599e7defcff2d49e817acbb'; ======= (node as any).hash = '9e525e6757a5dead1392f313bc16d3b4'; >>>>>>> (node as any).hash = 'b8029530d6a6538ad36dfad5ee1c6542';
<<<<<<< ======= // #region Window Navigation /** * @hidden * Used to redirect the browser to the STS authorization endpoint * @param {string} urlNavigate - URL of the authorization endpoint */ static navigateWindow(urlNavigate: string): void { window.location.assign(urlNavigate); } // #endregion >>>>>>> // #region Window Navigation /** * Used to redirect the browser to the STS authorization endpoint * @param {string} urlNavigate - URL of the authorization endpoint */ static navigateWindow(urlNavigate: string): void { window.location.assign(urlNavigate); } // #endregion
<<<<<<< "text": "query PricingContextTestQuery(\n $enablePricingContext: Boolean!\n) {\n artwork(id: \"unused\") {\n ...PricingContext_artwork\n __id\n }\n}\n\nfragment PricingContext_artwork on Artwork {\n priceCents {\n min\n }\n artists {\n id\n __id\n }\n widthCm\n heightCm\n category\n pricingContext @include(if: $enablePricingContext) {\n filterDescription\n bins {\n maxPrice\n maxPriceCents\n minPrice\n minPriceCents\n numArtworks\n }\n }\n __id\n}\n", ======= "text": "query PricingContextTestQuery(\n $enablePricingContext: Boolean!\n) {\n artwork(id: \"unused\") {\n ...PricingContext_artwork\n __id\n }\n}\n\nfragment PricingContext_artwork on Artwork {\n priceCents {\n min\n max\n }\n pricingContext @include(if: $enablePricingContext) {\n filterDescription\n bins {\n maxPrice\n maxPriceCents\n minPrice\n minPriceCents\n numArtworks\n }\n }\n __id\n}\n", >>>>>>> "text": "query PricingContextTestQuery(\n $enablePricingContext: Boolean!\n) {\n artwork(id: \"unused\") {\n ...PricingContext_artwork\n __id\n }\n}\n\nfragment PricingContext_artwork on Artwork {\n priceCents {\n min\n max\n }\n artists {\n id\n __id\n }\n widthCm\n heightCm\n category\n pricingContext @include(if: $enablePricingContext) {\n filterDescription\n bins {\n maxPrice\n maxPriceCents\n minPrice\n minPriceCents\n numArtworks\n }\n }\n __id\n}\n",
<<<<<<< v8 = { ======= v6 = { >>>>>>> v7 = { <<<<<<< v9 = { ======= v7 = { >>>>>>> v8 = { <<<<<<< v10 = { ======= v8 = { >>>>>>> v9 = { <<<<<<< v11 = { ======= v9 = { >>>>>>> v10 = { <<<<<<< v12 = { ======= v10 = { "kind": "ScalarField", "alias": null, "name": "name", "args": null, "storageKey": null }, v11 = { >>>>>>> v11 = { "kind": "ScalarField", "alias": null, "name": "name", "args": null, "storageKey": null }, v12 = { <<<<<<< "text": "query RespondTestQuery {\n order: commerceOrder(id: \"unused\") {\n __typename\n ...Respond_order\n __id: id\n }\n}\n\nfragment Respond_order on CommerceOrder {\n id\n mode\n state\n itemsTotal(precision: 2)\n itemsTotalCents\n totalListPrice(precision: 2)\n totalListPriceCents\n stateExpiresAt\n lineItems {\n edges {\n node {\n artwork {\n id\n __id\n }\n __id: id\n }\n }\n }\n ... on CommerceOfferOrder {\n lastOffer {\n createdAt\n id\n note\n __id: id\n }\n myLastOffer {\n createdAt\n __id: id\n }\n }\n ...TransactionDetailsSummaryItem_order\n ...ArtworkSummaryItem_order\n ...ShippingSummaryItem_order\n ...CreditCardSummaryItem_order\n ...OfferHistoryItem_order\n __id: id\n}\n\nfragment TransactionDetailsSummaryItem_order on CommerceOrder {\n __typename\n mode\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n itemsTotal(precision: 2)\n totalListPrice(precision: 2)\n buyerTotal(precision: 2)\n ... on CommerceOfferOrder {\n lastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id: id\n }\n myLastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id: id\n }\n }\n __id: id\n}\n\nfragment ArtworkSummaryItem_order on CommerceOrder {\n sellerDetails {\n __typename\n ... on Partner {\n name\n }\n ... on Node {\n __id\n }\n ... on User {\n __id\n }\n }\n lineItems {\n edges {\n node {\n artwork {\n artist_names\n title\n date\n shippingOrigin\n image {\n resized_ArtworkSummaryItem: resized(width: 55) {\n url\n }\n __id: id\n }\n __id\n }\n __id: id\n }\n }\n }\n __id: id\n}\n\nfragment ShippingSummaryItem_order on CommerceOrder {\n state\n requestedFulfillment {\n __typename\n ...ShippingAddress_ship\n }\n lineItems {\n edges {\n node {\n artwork {\n shippingOrigin\n __id\n }\n __id: id\n }\n }\n }\n __id: id\n}\n\nfragment CreditCardSummaryItem_order on CommerceOrder {\n creditCard {\n brand\n last_digits\n expiration_year\n expiration_month\n __id\n }\n __id: id\n}\n\nfragment OfferHistoryItem_order on CommerceOrder {\n ... on CommerceOfferOrder {\n offers {\n edges {\n node {\n id\n amount(precision: 2)\n createdAt(format: \"MMM D\")\n fromParticipant\n __id: id\n }\n }\n }\n lastOffer {\n id\n fromParticipant\n amount(precision: 2)\n shippingTotal(precision: 2)\n taxTotal(precision: 2)\n note\n __id: id\n }\n }\n totalListPrice(precision: 2)\n __id: id\n}\n\nfragment ShippingAddress_ship on CommerceShip {\n name\n addressLine1\n addressLine2\n city\n postalCode\n region\n country\n phoneNumber\n}\n", ======= "text": "query RespondTestQuery {\n order: ecommerceOrder(id: \"unused\") {\n __typename\n ...Respond_order\n __id\n }\n}\n\nfragment Respond_order on Order {\n id\n mode\n state\n currencyCode\n itemsTotal(precision: 2)\n itemsTotalCents\n totalListPrice(precision: 2)\n totalListPriceCents\n stateExpiresAt\n lineItems {\n edges {\n node {\n artwork {\n id\n __id\n }\n __id\n }\n }\n }\n ... on OfferOrder {\n lastOffer {\n createdAt\n id\n note\n __id\n }\n myLastOffer {\n createdAt\n __id\n }\n }\n ...TransactionDetailsSummaryItem_order\n ...ArtworkSummaryItem_order\n ...ShippingSummaryItem_order\n ...CreditCardSummaryItem_order\n ...OfferHistoryItem_order\n __id\n}\n\nfragment TransactionDetailsSummaryItem_order on Order {\n __typename\n mode\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n itemsTotal(precision: 2)\n totalListPrice(precision: 2)\n buyerTotal(precision: 2)\n ... on OfferOrder {\n lastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id\n }\n myLastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id\n }\n }\n __id\n}\n\nfragment ArtworkSummaryItem_order on Order {\n seller {\n __typename\n ... on Partner {\n name\n }\n ... on Node {\n __id\n }\n ... on User {\n __id\n }\n }\n lineItems {\n edges {\n node {\n artwork {\n artist_names\n title\n date\n shippingOrigin\n image {\n resized_ArtworkSummaryItem: resized(width: 55) {\n url\n }\n __id: id\n }\n __id\n }\n __id\n }\n }\n }\n __id\n}\n\nfragment ShippingSummaryItem_order on Order {\n state\n requestedFulfillment {\n __typename\n ...ShippingAddress_ship\n }\n lineItems {\n edges {\n node {\n artwork {\n shippingOrigin\n __id\n }\n __id\n }\n }\n }\n __id\n}\n\nfragment CreditCardSummaryItem_order on Order {\n creditCard {\n brand\n last_digits\n expiration_year\n expiration_month\n __id\n }\n __id\n}\n\nfragment OfferHistoryItem_order on Order {\n ... on OfferOrder {\n offers {\n edges {\n node {\n id\n amount(precision: 2)\n createdAt(format: \"MMM D\")\n fromParticipant\n __id\n }\n }\n }\n lastOffer {\n id\n fromParticipant\n amount(precision: 2)\n shippingTotal(precision: 2)\n taxTotal(precision: 2)\n note\n __id\n }\n }\n totalListPrice(precision: 2)\n __id\n}\n\nfragment ShippingAddress_ship on Ship {\n name\n addressLine1\n addressLine2\n city\n postalCode\n region\n country\n phoneNumber\n}\n", >>>>>>> "text": "query RespondTestQuery {\n order: commerceOrder(id: \"unused\") {\n __typename\n ...Respond_order\n __id: id\n }\n}\n\nfragment Respond_order on CommerceOrder {\n id\n mode\n state\n currencyCode\n itemsTotal(precision: 2)\n itemsTotalCents\n totalListPrice(precision: 2)\n totalListPriceCents\n stateExpiresAt\n lineItems {\n edges {\n node {\n artwork {\n id\n __id\n }\n __id: id\n }\n }\n }\n ... on CommerceOfferOrder {\n lastOffer {\n createdAt\n id\n note\n __id: id\n }\n myLastOffer {\n createdAt\n __id: id\n }\n }\n ...TransactionDetailsSummaryItem_order\n ...ArtworkSummaryItem_order\n ...ShippingSummaryItem_order\n ...CreditCardSummaryItem_order\n ...OfferHistoryItem_order\n __id: id\n}\n\nfragment TransactionDetailsSummaryItem_order on CommerceOrder {\n __typename\n mode\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n itemsTotal(precision: 2)\n totalListPrice(precision: 2)\n buyerTotal(precision: 2)\n ... on CommerceOfferOrder {\n lastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id: id\n }\n myLastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id: id\n }\n }\n __id: id\n}\n\nfragment ArtworkSummaryItem_order on CommerceOrder {\n sellerDetails {\n __typename\n ... on Partner {\n name\n }\n ... on Node {\n __id\n }\n ... on User {\n __id\n }\n }\n lineItems {\n edges {\n node {\n artwork {\n artist_names\n title\n date\n shippingOrigin\n image {\n resized_ArtworkSummaryItem: resized(width: 55) {\n url\n }\n __id: id\n }\n __id\n }\n __id: id\n }\n }\n }\n __id: id\n}\n\nfragment ShippingSummaryItem_order on CommerceOrder {\n state\n requestedFulfillment {\n __typename\n ...ShippingAddress_ship\n }\n lineItems {\n edges {\n node {\n artwork {\n shippingOrigin\n __id\n }\n __id: id\n }\n }\n }\n __id: id\n}\n\nfragment CreditCardSummaryItem_order on CommerceOrder {\n creditCard {\n brand\n last_digits\n expiration_year\n expiration_month\n __id\n }\n __id: id\n}\n\nfragment OfferHistoryItem_order on CommerceOrder {\n ... on CommerceOfferOrder {\n offers {\n edges {\n node {\n id\n amount(precision: 2)\n createdAt(format: \"MMM D\")\n fromParticipant\n __id: id\n }\n }\n }\n lastOffer {\n id\n fromParticipant\n amount(precision: 2)\n shippingTotal(precision: 2)\n taxTotal(precision: 2)\n note\n __id: id\n }\n }\n totalListPrice(precision: 2)\n __id: id\n}\n\nfragment ShippingAddress_ship on CommerceShip {\n name\n addressLine1\n addressLine2\n city\n postalCode\n region\n country\n phoneNumber\n}\n", <<<<<<< v3, v5, ======= v2, v1, >>>>>>> v2, v3, <<<<<<< v6, ======= v10, >>>>>>> v11, <<<<<<< "kind": "ScalarField", "alias": null, "name": "mode", "args": null, "storageKey": null }, v7, v8, v9, v10, v11, v1, { "kind": "LinkedField", "alias": null, "name": "sellerDetails", "storageKey": null, "args": null, "concreteType": null, "plural": false, "selections": [ v2, v5, { "kind": "InlineFragment", "type": "Partner", "selections": [ v6 ] } ] }, { "kind": "LinkedField", "alias": null, "name": "creditCard", "storageKey": null, "args": null, "concreteType": "CreditCard", "plural": false, "selections": [ { "kind": "ScalarField", "alias": null, "name": "brand", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "last_digits", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "expiration_year", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "expiration_month", "args": null, "storageKey": null }, v5 ] }, { ======= >>>>>>> <<<<<<< v7, ======= v5, v11, >>>>>>> v6, <<<<<<< v3, v14, ======= v2, v13, >>>>>>> v2, v14,
<<<<<<< v12 = [ v10, v4, ======= v11 = [ v9, v3, >>>>>>> v12 = [ v10, v3, <<<<<<< "text": "query routes_OfferQuery(\n $orderID: ID!\n) {\n order: commerceOrder(id: $orderID) {\n __typename\n ...Offer_order\n __id: id\n }\n}\n\nfragment Offer_order on CommerceOrder {\n id\n mode\n state\n totalListPrice(precision: 2)\n totalListPriceCents\n lineItems {\n edges {\n node {\n artwork {\n id\n __id\n }\n __id: id\n }\n }\n }\n ...ArtworkSummaryItem_order\n ...TransactionDetailsSummaryItem_order\n __id: id\n}\n\nfragment ArtworkSummaryItem_order on CommerceOrder {\n sellerDetails {\n __typename\n ... on Partner {\n name\n }\n ... on Node {\n __id\n }\n ... on User {\n __id\n }\n }\n lineItems {\n edges {\n node {\n artwork {\n artist_names\n title\n date\n shippingOrigin\n image {\n resized_ArtworkSummaryItem: resized(width: 55) {\n url\n }\n __id: id\n }\n __id\n }\n __id: id\n }\n }\n }\n __id: id\n}\n\nfragment TransactionDetailsSummaryItem_order on CommerceOrder {\n __typename\n mode\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n itemsTotal(precision: 2)\n totalListPrice(precision: 2)\n buyerTotal(precision: 2)\n ... on CommerceOfferOrder {\n lastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id: id\n }\n myLastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id: id\n }\n }\n __id: id\n}\n", ======= "text": "query routes_OfferQuery(\n $orderID: String!\n) {\n order: ecommerceOrder(id: $orderID) {\n __typename\n ...Offer_order\n __id\n }\n}\n\nfragment Offer_order on Order {\n id\n mode\n state\n currencyCode\n totalListPrice(precision: 2)\n totalListPriceCents\n lineItems {\n edges {\n node {\n artwork {\n id\n __id\n }\n __id\n }\n }\n }\n ...ArtworkSummaryItem_order\n ...TransactionDetailsSummaryItem_order\n __id\n}\n\nfragment ArtworkSummaryItem_order on Order {\n seller {\n __typename\n ... on Partner {\n name\n }\n ... on Node {\n __id\n }\n ... on User {\n __id\n }\n }\n lineItems {\n edges {\n node {\n artwork {\n artist_names\n title\n date\n shippingOrigin\n image {\n resized_ArtworkSummaryItem: resized(width: 55) {\n url\n }\n __id: id\n }\n __id\n }\n __id\n }\n }\n }\n __id\n}\n\nfragment TransactionDetailsSummaryItem_order on Order {\n __typename\n mode\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n itemsTotal(precision: 2)\n totalListPrice(precision: 2)\n buyerTotal(precision: 2)\n ... on OfferOrder {\n lastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id\n }\n myLastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id\n }\n }\n __id\n}\n", >>>>>>> "text": "query routes_OfferQuery(\n $orderID: ID!\n) {\n order: commerceOrder(id: $orderID) {\n __typename\n ...Offer_order\n __id: id\n }\n}\n\nfragment Offer_order on CommerceOrder {\n id\n mode\n state\n currencyCode\n totalListPrice(precision: 2)\n totalListPriceCents\n lineItems {\n edges {\n node {\n artwork {\n id\n __id\n }\n __id: id\n }\n }\n }\n ...ArtworkSummaryItem_order\n ...TransactionDetailsSummaryItem_order\n __id: id\n}\n\nfragment ArtworkSummaryItem_order on CommerceOrder {\n sellerDetails {\n __typename\n ... on Partner {\n name\n }\n ... on Node {\n __id\n }\n ... on User {\n __id\n }\n }\n lineItems {\n edges {\n node {\n artwork {\n artist_names\n title\n date\n shippingOrigin\n image {\n resized_ArtworkSummaryItem: resized(width: 55) {\n url\n }\n __id: id\n }\n __id\n }\n __id: id\n }\n }\n }\n __id: id\n}\n\nfragment TransactionDetailsSummaryItem_order on CommerceOrder {\n __typename\n mode\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n itemsTotal(precision: 2)\n totalListPrice(precision: 2)\n buyerTotal(precision: 2)\n ... on CommerceOfferOrder {\n lastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id: id\n }\n myLastOffer {\n id\n amount(precision: 2)\n amountCents\n shippingTotal(precision: 2)\n shippingTotalCents\n taxTotal(precision: 2)\n taxTotalCents\n buyerTotal(precision: 2)\n buyerTotalCents\n fromParticipant\n note\n __id: id\n }\n }\n __id: id\n}\n", <<<<<<< v4, v6, ======= v3, v2, >>>>>>> v3, v5, <<<<<<< v3, v6, ======= v5, v2, >>>>>>> v6, v5, <<<<<<< ======= v5, v6, >>>>>>> v6,
<<<<<<< ======= is_biddable sale { is_preview display_timely_at __id } is_acquireable is_offerable >>>>>>> <<<<<<< "text": "query RelatedWorksArtworkGridQuery(\n $artworkSlug: String!\n) {\n artwork(id: $artworkSlug) {\n ...RelatedWorksArtworkGrid_artwork\n __id\n }\n}\n\nfragment RelatedWorksArtworkGrid_artwork on Artwork {\n layers {\n name\n id\n __id\n }\n layer {\n name\n artworksConnection(first: 8) {\n ...ArtworkGrid_artworks\n edges {\n node {\n id\n __id\n }\n }\n }\n __id\n }\n __id\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n href\n ...Metadata_artwork\n ...Save_artwork\n ...Badge_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Badge_artwork on Artwork {\n is_biddable\n is_acquireable\n is_offerable\n href\n sale {\n is_preview\n __id\n }\n __id\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n display_timely_at\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", ======= "text": "query RelatedWorksArtworkGridQuery(\n $artworkSlug: String!\n) {\n artwork(id: $artworkSlug) {\n ...RelatedWorksArtworkGrid_artwork\n __id\n }\n}\n\nfragment RelatedWorksArtworkGrid_artwork on Artwork {\n layers {\n name\n id\n __id\n }\n layer {\n name\n artworksConnection(first: 8) {\n ...ArtworkGrid_artworks\n edges {\n node {\n id\n __id\n }\n }\n }\n __id\n }\n __id\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n is_biddable\n sale {\n is_preview\n display_timely_at\n __id\n }\n is_acquireable\n is_offerable\n href\n ...Metadata_artwork\n ...Save_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_closed\n __id\n }\n sale_artwork {\n counts {\n bidder_positions\n }\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", >>>>>>> "text": "query RelatedWorksArtworkGridQuery(\n $artworkSlug: String!\n) {\n artwork(id: $artworkSlug) {\n ...RelatedWorksArtworkGrid_artwork\n __id\n }\n}\n\nfragment RelatedWorksArtworkGrid_artwork on Artwork {\n layers {\n name\n id\n __id\n }\n layer {\n name\n artworksConnection(first: 8) {\n ...ArtworkGrid_artworks\n edges {\n node {\n id\n __id\n }\n }\n }\n __id\n }\n __id\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n href\n ...Metadata_artwork\n ...Save_artwork\n ...Badge_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Badge_artwork on Artwork {\n is_biddable\n is_acquireable\n is_offerable\n href\n sale {\n is_preview\n display_timely_at\n __id\n }\n __id\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_closed\n __id\n }\n sale_artwork {\n counts {\n bidder_positions\n }\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", <<<<<<< } ] }, { "kind": "LinkedField", "alias": null, "name": "sale", "storageKey": null, "args": null, "concreteType": "Sale", "plural": false, "selections": [ ======= }, >>>>>>> } ] }, { "kind": "LinkedField", "alias": null, "name": "sale", "storageKey": null, "args": null, "concreteType": "Sale", "plural": false, "selections": [ { "kind": "ScalarField", "alias": null, "name": "is_auction", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_closed", "args": null, "storageKey": null }, v2, { "kind": "ScalarField", "alias": null, "name": "is_live_open", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_open", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_preview", "args": null, "storageKey": null },
<<<<<<< ======= is_biddable sale { is_preview display_timely_at __id } is_acquireable is_offerable >>>>>>> <<<<<<< "text": "query RelatedWorksArtworkGridRefetchQuery(\n $artworkSlug: String!\n $layerId: String!\n) {\n artwork(id: $artworkSlug) {\n ...RelatedWorksArtworkGrid_artwork_hOSfN\n __id\n }\n}\n\nfragment RelatedWorksArtworkGrid_artwork_hOSfN on Artwork {\n layers {\n name\n id\n __id\n }\n layer(id: $layerId) {\n name\n artworksConnection(first: 8) {\n ...ArtworkGrid_artworks\n edges {\n node {\n id\n __id\n }\n }\n }\n __id\n }\n __id\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n href\n ...Metadata_artwork\n ...Save_artwork\n ...Badge_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Badge_artwork on Artwork {\n is_biddable\n is_acquireable\n is_offerable\n href\n sale {\n is_preview\n __id\n }\n __id\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n display_timely_at\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", ======= "text": "query RelatedWorksArtworkGridRefetchQuery(\n $artworkSlug: String!\n $layerId: String!\n) {\n artwork(id: $artworkSlug) {\n ...RelatedWorksArtworkGrid_artwork_hOSfN\n __id\n }\n}\n\nfragment RelatedWorksArtworkGrid_artwork_hOSfN on Artwork {\n layers {\n name\n id\n __id\n }\n layer(id: $layerId) {\n name\n artworksConnection(first: 8) {\n ...ArtworkGrid_artworks\n edges {\n node {\n id\n __id\n }\n }\n }\n __id\n }\n __id\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n is_biddable\n sale {\n is_preview\n display_timely_at\n __id\n }\n is_acquireable\n is_offerable\n href\n ...Metadata_artwork\n ...Save_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_closed\n __id\n }\n sale_artwork {\n counts {\n bidder_positions\n }\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", >>>>>>> "text": "query RelatedWorksArtworkGridRefetchQuery(\n $artworkSlug: String!\n $layerId: String!\n) {\n artwork(id: $artworkSlug) {\n ...RelatedWorksArtworkGrid_artwork_hOSfN\n __id\n }\n}\n\nfragment RelatedWorksArtworkGrid_artwork_hOSfN on Artwork {\n layers {\n name\n id\n __id\n }\n layer(id: $layerId) {\n name\n artworksConnection(first: 8) {\n ...ArtworkGrid_artworks\n edges {\n node {\n id\n __id\n }\n }\n }\n __id\n }\n __id\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n href\n ...Metadata_artwork\n ...Save_artwork\n ...Badge_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Badge_artwork on Artwork {\n is_biddable\n is_acquireable\n is_offerable\n href\n sale {\n is_preview\n display_timely_at\n __id\n }\n __id\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_closed\n __id\n }\n sale_artwork {\n counts {\n bidder_positions\n }\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", <<<<<<< } ] }, { "kind": "LinkedField", "alias": null, "name": "sale", "storageKey": null, "args": null, "concreteType": "Sale", "plural": false, "selections": [ ======= }, >>>>>>> } ] }, { "kind": "LinkedField", "alias": null, "name": "sale", "storageKey": null, "args": null, "concreteType": "Sale", "plural": false, "selections": [ { "kind": "ScalarField", "alias": null, "name": "is_auction", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_closed", "args": null, "storageKey": null }, v2, { "kind": "ScalarField", "alias": null, "name": "is_live_open", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_open", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_preview", "args": null, "storageKey": null },
<<<<<<< ======= is_biddable sale { is_preview display_timely_at __id } is_acquireable is_offerable >>>>>>> <<<<<<< "text": "query CollectionAppTestQuery {\n collection: marketingCollection(slug: \"kaws-companions\") {\n ...CollectionApp_collection\n __id: id\n }\n}\n\nfragment CollectionApp_collection on MarketingCollection {\n id\n slug\n title\n description\n headerImage\n category\n credit\n query {\n artist_ids\n artist_id\n gene_id\n __id: id\n }\n artworks(aggregations: [MEDIUM, MAJOR_PERIOD, TOTAL], include_medium_filter_in_aggregation: true) {\n ...SeoProductsForArtworks_artworks\n __id\n }\n ...CollectionFilterContainer_collection_2d70Bt\n __id: id\n}\n\nfragment SeoProductsForArtworks_artworks on FilterArtworks {\n artworks_connection(first: 30, after: \"\") {\n edges {\n node {\n __id\n availability\n category\n date\n href\n is_acquireable\n is_price_range\n price\n price_currency\n title\n artists {\n name\n __id\n }\n image {\n url(version: \"larger\")\n }\n meta {\n description\n }\n partner(shallow: true) {\n name\n type\n profile {\n icon {\n url(version: \"larger\")\n }\n __id\n }\n locations(size: 1) {\n address\n address_2\n city\n state\n country\n postal_code\n phone\n __id\n }\n __id\n }\n }\n }\n }\n __id\n}\n\nfragment CollectionFilterContainer_collection_2d70Bt on MarketingCollection {\n artworks(aggregations: [MEDIUM, MAJOR_PERIOD, TOTAL], include_medium_filter_in_aggregation: true) {\n aggregations {\n slice\n counts {\n id\n name\n count\n __id\n }\n }\n __id\n }\n ...CollectionRefetch_collection_1pS1hi\n __id: id\n}\n\nfragment CollectionRefetch_collection_1pS1hi on MarketingCollection {\n slug\n filtered_artworks: artworks(aggregations: [TOTAL], medium: \"*\", size: 0, sort: \"-partner_updated_at\") {\n ...CollectArtworkGrid_filtered_artworks\n __id\n }\n __id: id\n}\n\nfragment CollectArtworkGrid_filtered_artworks on FilterArtworks {\n __id\n artworks: artworks_connection(first: 30, after: \"\") {\n pageInfo {\n hasNextPage\n endCursor\n }\n pageCursors {\n ...Pagination_pageCursors\n }\n ...ArtworkGrid_artworks\n edges {\n node {\n __id\n }\n }\n }\n}\n\nfragment Pagination_pageCursors on PageCursors {\n around {\n cursor\n page\n isCurrent\n }\n first {\n cursor\n page\n isCurrent\n }\n last {\n cursor\n page\n isCurrent\n }\n previous {\n cursor\n page\n }\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n href\n ...Metadata_artwork\n ...Save_artwork\n ...Badge_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Badge_artwork on Artwork {\n is_biddable\n is_acquireable\n is_offerable\n href\n sale {\n is_preview\n __id\n }\n __id\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n display_timely_at\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", ======= "text": "query CollectionAppTestQuery {\n collection: marketingCollection(slug: \"kaws-companions\") {\n ...CollectionApp_collection\n __id: id\n }\n}\n\nfragment CollectionApp_collection on MarketingCollection {\n id\n slug\n title\n description\n headerImage\n category\n credit\n query {\n artist_ids\n artist_id\n gene_id\n __id: id\n }\n artworks(aggregations: [MEDIUM, MAJOR_PERIOD, TOTAL], include_medium_filter_in_aggregation: true) {\n ...SeoProductsForArtworks_artworks\n __id\n }\n ...CollectionFilterContainer_collection_2d70Bt\n __id: id\n}\n\nfragment SeoProductsForArtworks_artworks on FilterArtworks {\n artworks_connection(first: 30, after: \"\") {\n edges {\n node {\n __id\n availability\n category\n date\n href\n is_acquireable\n is_price_range\n price\n price_currency\n title\n artists {\n name\n __id\n }\n image {\n url(version: \"larger\")\n }\n meta {\n description\n }\n partner(shallow: true) {\n name\n type\n profile {\n icon {\n url(version: \"larger\")\n }\n __id\n }\n locations(size: 1) {\n address\n address_2\n city\n state\n country\n postal_code\n phone\n __id\n }\n __id\n }\n }\n }\n }\n __id\n}\n\nfragment CollectionFilterContainer_collection_2d70Bt on MarketingCollection {\n artworks(aggregations: [MEDIUM, MAJOR_PERIOD, TOTAL], include_medium_filter_in_aggregation: true) {\n aggregations {\n slice\n counts {\n id\n name\n count\n __id\n }\n }\n __id\n }\n ...CollectionRefetch_collection_1pS1hi\n __id: id\n}\n\nfragment CollectionRefetch_collection_1pS1hi on MarketingCollection {\n slug\n filtered_artworks: artworks(aggregations: [TOTAL], medium: \"*\", size: 0, sort: \"-partner_updated_at\") {\n ...CollectArtworkGrid_filtered_artworks\n __id\n }\n __id: id\n}\n\nfragment CollectArtworkGrid_filtered_artworks on FilterArtworks {\n __id\n artworks: artworks_connection(first: 30, after: \"\") {\n pageInfo {\n hasNextPage\n endCursor\n }\n pageCursors {\n ...Pagination_pageCursors\n }\n ...ArtworkGrid_artworks\n edges {\n node {\n __id\n }\n }\n }\n}\n\nfragment Pagination_pageCursors on PageCursors {\n around {\n cursor\n page\n isCurrent\n }\n first {\n cursor\n page\n isCurrent\n }\n last {\n cursor\n page\n isCurrent\n }\n previous {\n cursor\n page\n }\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n is_biddable\n sale {\n is_preview\n display_timely_at\n __id\n }\n is_acquireable\n is_offerable\n href\n ...Metadata_artwork\n ...Save_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_closed\n __id\n }\n sale_artwork {\n counts {\n bidder_positions\n }\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", >>>>>>> "text": "query CollectionAppTestQuery {\n collection: marketingCollection(slug: \"kaws-companions\") {\n ...CollectionApp_collection\n __id: id\n }\n}\n\nfragment CollectionApp_collection on MarketingCollection {\n id\n slug\n title\n description\n headerImage\n category\n credit\n query {\n artist_ids\n artist_id\n gene_id\n __id: id\n }\n artworks(aggregations: [MEDIUM, MAJOR_PERIOD, TOTAL], include_medium_filter_in_aggregation: true) {\n ...SeoProductsForArtworks_artworks\n __id\n }\n ...CollectionFilterContainer_collection_2d70Bt\n __id: id\n}\n\nfragment SeoProductsForArtworks_artworks on FilterArtworks {\n artworks_connection(first: 30, after: \"\") {\n edges {\n node {\n __id\n availability\n category\n date\n href\n is_acquireable\n is_price_range\n price\n price_currency\n title\n artists {\n name\n __id\n }\n image {\n url(version: \"larger\")\n }\n meta {\n description\n }\n partner(shallow: true) {\n name\n type\n profile {\n icon {\n url(version: \"larger\")\n }\n __id\n }\n locations(size: 1) {\n address\n address_2\n city\n state\n country\n postal_code\n phone\n __id\n }\n __id\n }\n }\n }\n }\n __id\n}\n\nfragment CollectionFilterContainer_collection_2d70Bt on MarketingCollection {\n artworks(aggregations: [MEDIUM, MAJOR_PERIOD, TOTAL], include_medium_filter_in_aggregation: true) {\n aggregations {\n slice\n counts {\n id\n name\n count\n __id\n }\n }\n __id\n }\n ...CollectionRefetch_collection_1pS1hi\n __id: id\n}\n\nfragment CollectionRefetch_collection_1pS1hi on MarketingCollection {\n slug\n filtered_artworks: artworks(aggregations: [TOTAL], medium: \"*\", size: 0, sort: \"-partner_updated_at\") {\n ...CollectArtworkGrid_filtered_artworks\n __id\n }\n __id: id\n}\n\nfragment CollectArtworkGrid_filtered_artworks on FilterArtworks {\n __id\n artworks: artworks_connection(first: 30, after: \"\") {\n pageInfo {\n hasNextPage\n endCursor\n }\n pageCursors {\n ...Pagination_pageCursors\n }\n ...ArtworkGrid_artworks\n edges {\n node {\n __id\n }\n }\n }\n}\n\nfragment Pagination_pageCursors on PageCursors {\n around {\n cursor\n page\n isCurrent\n }\n first {\n cursor\n page\n isCurrent\n }\n last {\n cursor\n page\n isCurrent\n }\n previous {\n cursor\n page\n }\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n href\n ...Metadata_artwork\n ...Save_artwork\n ...Badge_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Badge_artwork on Artwork {\n is_biddable\n is_acquireable\n is_offerable\n href\n sale {\n is_preview\n display_timely_at\n __id\n }\n __id\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_closed\n __id\n }\n sale_artwork {\n counts {\n bidder_positions\n }\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", <<<<<<< "name": "is_live_open", ======= "name": "display_timely_at", >>>>>>> "name": "is_closed", <<<<<<< "name": "is_preview", ======= "name": "is_open", >>>>>>> "name": "is_live_open", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_open", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_preview", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "display_timely_at",
<<<<<<< ======= is_biddable sale { is_preview display_timely_at __id } is_acquireable is_offerable >>>>>>> <<<<<<< "text": "query ArtworkFilterArtworkGridQuery(\n $filteredArtworksNodeID: ID!\n $first: Int!\n $after: String\n) {\n filtered_artworks: node(__id: $filteredArtworksNodeID) {\n __typename\n ...ArtworkFilterArtworkGrid_filtered_artworks_2HEEH6\n __id\n }\n}\n\nfragment ArtworkFilterArtworkGrid_filtered_artworks_2HEEH6 on FilterArtworks {\n __id\n artworks: artworks_connection(first: $first, after: $after) {\n pageInfo {\n hasNextPage\n endCursor\n }\n pageCursors {\n ...Pagination_pageCursors\n }\n ...ArtworkGrid_artworks\n edges {\n node {\n __id\n }\n }\n }\n}\n\nfragment Pagination_pageCursors on PageCursors {\n around {\n cursor\n page\n isCurrent\n }\n first {\n cursor\n page\n isCurrent\n }\n last {\n cursor\n page\n isCurrent\n }\n previous {\n cursor\n page\n }\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n href\n ...Metadata_artwork\n ...Save_artwork\n ...Badge_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Badge_artwork on Artwork {\n is_biddable\n is_acquireable\n is_offerable\n href\n sale {\n is_preview\n __id\n }\n __id\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n display_timely_at\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", ======= "text": "query ArtworkFilterArtworkGridQuery(\n $filteredArtworksNodeID: ID!\n $first: Int!\n $after: String\n) {\n filtered_artworks: node(__id: $filteredArtworksNodeID) {\n __typename\n ...ArtworkFilterArtworkGrid_filtered_artworks_2HEEH6\n __id\n }\n}\n\nfragment ArtworkFilterArtworkGrid_filtered_artworks_2HEEH6 on FilterArtworks {\n __id\n artworks: artworks_connection(first: $first, after: $after) {\n pageInfo {\n hasNextPage\n endCursor\n }\n pageCursors {\n ...Pagination_pageCursors\n }\n ...ArtworkGrid_artworks\n edges {\n node {\n __id\n }\n }\n }\n}\n\nfragment Pagination_pageCursors on PageCursors {\n around {\n cursor\n page\n isCurrent\n }\n first {\n cursor\n page\n isCurrent\n }\n last {\n cursor\n page\n isCurrent\n }\n previous {\n cursor\n page\n }\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n is_biddable\n sale {\n is_preview\n display_timely_at\n __id\n }\n is_acquireable\n is_offerable\n href\n ...Metadata_artwork\n ...Save_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_closed\n __id\n }\n sale_artwork {\n counts {\n bidder_positions\n }\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", >>>>>>> "text": "query ArtworkFilterArtworkGridQuery(\n $filteredArtworksNodeID: ID!\n $first: Int!\n $after: String\n) {\n filtered_artworks: node(__id: $filteredArtworksNodeID) {\n __typename\n ...ArtworkFilterArtworkGrid_filtered_artworks_2HEEH6\n __id\n }\n}\n\nfragment ArtworkFilterArtworkGrid_filtered_artworks_2HEEH6 on FilterArtworks {\n __id\n artworks: artworks_connection(first: $first, after: $after) {\n pageInfo {\n hasNextPage\n endCursor\n }\n pageCursors {\n ...Pagination_pageCursors\n }\n ...ArtworkGrid_artworks\n edges {\n node {\n __id\n }\n }\n }\n}\n\nfragment Pagination_pageCursors on PageCursors {\n around {\n cursor\n page\n isCurrent\n }\n first {\n cursor\n page\n isCurrent\n }\n last {\n cursor\n page\n isCurrent\n }\n previous {\n cursor\n page\n }\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n href\n ...Metadata_artwork\n ...Save_artwork\n ...Badge_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Badge_artwork on Artwork {\n is_biddable\n is_acquireable\n is_offerable\n href\n sale {\n is_preview\n display_timely_at\n __id\n }\n __id\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_closed\n __id\n }\n sale_artwork {\n counts {\n bidder_positions\n }\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", <<<<<<< } ] }, { "kind": "LinkedField", "alias": null, "name": "sale", "storageKey": null, "args": null, "concreteType": "Sale", "plural": false, "selections": [ ======= }, >>>>>>> } ] }, { "kind": "LinkedField", "alias": null, "name": "sale", "storageKey": null, "args": null, "concreteType": "Sale", "plural": false, "selections": [ { "kind": "ScalarField", "alias": null, "name": "is_auction", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_closed", "args": null, "storageKey": null }, v2, { "kind": "ScalarField", "alias": null, "name": "is_live_open", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_open", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_preview", "args": null, "storageKey": null },
<<<<<<< ======= is_biddable sale { is_preview display_timely_at __id } is_acquireable is_offerable >>>>>>> <<<<<<< "text": "query CollectArtworkGridQuery(\n $filteredArtworksNodeID: ID!\n $first: Int!\n $after: String\n) {\n filtered_artworks: node(__id: $filteredArtworksNodeID) {\n __typename\n ...CollectArtworkGrid_filtered_artworks_2HEEH6\n __id\n }\n}\n\nfragment CollectArtworkGrid_filtered_artworks_2HEEH6 on FilterArtworks {\n __id\n artworks: artworks_connection(first: $first, after: $after) {\n pageInfo {\n hasNextPage\n endCursor\n }\n pageCursors {\n ...Pagination_pageCursors\n }\n ...ArtworkGrid_artworks\n edges {\n node {\n __id\n }\n }\n }\n}\n\nfragment Pagination_pageCursors on PageCursors {\n around {\n cursor\n page\n isCurrent\n }\n first {\n cursor\n page\n isCurrent\n }\n last {\n cursor\n page\n isCurrent\n }\n previous {\n cursor\n page\n }\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n href\n ...Metadata_artwork\n ...Save_artwork\n ...Badge_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Badge_artwork on Artwork {\n is_biddable\n is_acquireable\n is_offerable\n href\n sale {\n is_preview\n __id\n }\n __id\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n display_timely_at\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", ======= "text": "query CollectArtworkGridQuery(\n $filteredArtworksNodeID: ID!\n $first: Int!\n $after: String\n) {\n filtered_artworks: node(__id: $filteredArtworksNodeID) {\n __typename\n ...CollectArtworkGrid_filtered_artworks_2HEEH6\n __id\n }\n}\n\nfragment CollectArtworkGrid_filtered_artworks_2HEEH6 on FilterArtworks {\n __id\n artworks: artworks_connection(first: $first, after: $after) {\n pageInfo {\n hasNextPage\n endCursor\n }\n pageCursors {\n ...Pagination_pageCursors\n }\n ...ArtworkGrid_artworks\n edges {\n node {\n __id\n }\n }\n }\n}\n\nfragment Pagination_pageCursors on PageCursors {\n around {\n cursor\n page\n isCurrent\n }\n first {\n cursor\n page\n isCurrent\n }\n last {\n cursor\n page\n isCurrent\n }\n previous {\n cursor\n page\n }\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n is_biddable\n sale {\n is_preview\n display_timely_at\n __id\n }\n is_acquireable\n is_offerable\n href\n ...Metadata_artwork\n ...Save_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_closed\n __id\n }\n sale_artwork {\n counts {\n bidder_positions\n }\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", >>>>>>> "text": "query CollectArtworkGridQuery(\n $filteredArtworksNodeID: ID!\n $first: Int!\n $after: String\n) {\n filtered_artworks: node(__id: $filteredArtworksNodeID) {\n __typename\n ...CollectArtworkGrid_filtered_artworks_2HEEH6\n __id\n }\n}\n\nfragment CollectArtworkGrid_filtered_artworks_2HEEH6 on FilterArtworks {\n __id\n artworks: artworks_connection(first: $first, after: $after) {\n pageInfo {\n hasNextPage\n endCursor\n }\n pageCursors {\n ...Pagination_pageCursors\n }\n ...ArtworkGrid_artworks\n edges {\n node {\n __id\n }\n }\n }\n}\n\nfragment Pagination_pageCursors on PageCursors {\n around {\n cursor\n page\n isCurrent\n }\n first {\n cursor\n page\n isCurrent\n }\n last {\n cursor\n page\n isCurrent\n }\n previous {\n cursor\n page\n }\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n href\n ...Metadata_artwork\n ...Save_artwork\n ...Badge_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Badge_artwork on Artwork {\n is_biddable\n is_acquireable\n is_offerable\n href\n sale {\n is_preview\n display_timely_at\n __id\n }\n __id\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_closed\n __id\n }\n sale_artwork {\n counts {\n bidder_positions\n }\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", <<<<<<< } ] }, { "kind": "LinkedField", "alias": null, "name": "sale", "storageKey": null, "args": null, "concreteType": "Sale", "plural": false, "selections": [ ======= }, >>>>>>> } ] }, { "kind": "LinkedField", "alias": null, "name": "sale", "storageKey": null, "args": null, "concreteType": "Sale", "plural": false, "selections": [ { "kind": "ScalarField", "alias": null, "name": "is_auction", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_closed", "args": null, "storageKey": null }, v2, { "kind": "ScalarField", "alias": null, "name": "is_live_open", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_open", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_preview", "args": null, "storageKey": null },
<<<<<<< ======= is_biddable sale { is_preview display_timely_at __id } is_acquireable is_offerable >>>>>>> <<<<<<< "text": "query RelatedWorksArtworkGrid_Test_Query {\n artwork(id: \"david-hockney-early-morning-4\") {\n ...RelatedWorksArtworkGrid_artwork\n __id\n }\n}\n\nfragment RelatedWorksArtworkGrid_artwork on Artwork {\n layers {\n name\n id\n __id\n }\n layer {\n name\n artworksConnection(first: 8) {\n ...ArtworkGrid_artworks\n edges {\n node {\n id\n __id\n }\n }\n }\n __id\n }\n __id\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n href\n ...Metadata_artwork\n ...Save_artwork\n ...Badge_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Badge_artwork on Artwork {\n is_biddable\n is_acquireable\n is_offerable\n href\n sale {\n is_preview\n __id\n }\n __id\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n display_timely_at\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", ======= "text": "query RelatedWorksArtworkGrid_Test_Query {\n artwork(id: \"david-hockney-early-morning-4\") {\n ...RelatedWorksArtworkGrid_artwork\n __id\n }\n}\n\nfragment RelatedWorksArtworkGrid_artwork on Artwork {\n layers {\n name\n id\n __id\n }\n layer {\n name\n artworksConnection(first: 8) {\n ...ArtworkGrid_artworks\n edges {\n node {\n id\n __id\n }\n }\n }\n __id\n }\n __id\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n is_biddable\n sale {\n is_preview\n display_timely_at\n __id\n }\n is_acquireable\n is_offerable\n href\n ...Metadata_artwork\n ...Save_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_closed\n __id\n }\n sale_artwork {\n counts {\n bidder_positions\n }\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", >>>>>>> "text": "query RelatedWorksArtworkGrid_Test_Query {\n artwork(id: \"david-hockney-early-morning-4\") {\n ...RelatedWorksArtworkGrid_artwork\n __id\n }\n}\n\nfragment RelatedWorksArtworkGrid_artwork on Artwork {\n layers {\n name\n id\n __id\n }\n layer {\n name\n artworksConnection(first: 8) {\n ...ArtworkGrid_artworks\n edges {\n node {\n id\n __id\n }\n }\n }\n __id\n }\n __id\n}\n\nfragment ArtworkGrid_artworks on ArtworkConnection {\n edges {\n node {\n __id\n id\n href\n image {\n aspect_ratio\n }\n ...GridItem_artwork\n }\n }\n}\n\nfragment GridItem_artwork on Artwork {\n _id\n title\n image_title\n image {\n placeholder\n url(version: \"large\")\n aspect_ratio\n }\n href\n ...Metadata_artwork\n ...Save_artwork\n ...Badge_artwork\n __id\n}\n\nfragment Metadata_artwork on Artwork {\n ...Details_artwork\n ...Contact_artwork\n href\n __id\n}\n\nfragment Save_artwork on Artwork {\n __id\n _id\n id\n is_saved\n}\n\nfragment Badge_artwork on Artwork {\n is_biddable\n is_acquireable\n is_offerable\n href\n sale {\n is_preview\n display_timely_at\n __id\n }\n __id\n}\n\nfragment Details_artwork on Artwork {\n href\n title\n date\n sale_message\n cultural_maker\n artists(shallow: true) {\n __id\n href\n name\n }\n collecting_institution\n partner(shallow: true) {\n name\n href\n __id\n }\n sale {\n is_auction\n is_closed\n __id\n }\n sale_artwork {\n counts {\n bidder_positions\n }\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n __id\n }\n __id\n}\n\nfragment Contact_artwork on Artwork {\n _id\n href\n is_inquireable\n sale {\n is_auction\n is_live_open\n is_open\n is_closed\n __id\n }\n partner(shallow: true) {\n type\n __id\n }\n sale_artwork {\n highest_bid {\n display\n __id: id\n }\n opening_bid {\n display\n }\n counts {\n bidder_positions\n }\n __id\n }\n __id\n}\n", <<<<<<< } ] }, { "kind": "LinkedField", "alias": null, "name": "sale", "storageKey": null, "args": null, "concreteType": "Sale", "plural": false, "selections": [ ======= }, >>>>>>> } ] }, { "kind": "LinkedField", "alias": null, "name": "sale", "storageKey": null, "args": null, "concreteType": "Sale", "plural": false, "selections": [ { "kind": "ScalarField", "alias": null, "name": "is_auction", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_closed", "args": null, "storageKey": null }, v1, { "kind": "ScalarField", "alias": null, "name": "is_live_open", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_open", "args": null, "storageKey": null }, { "kind": "ScalarField", "alias": null, "name": "is_preview", "args": null, "storageKey": null },
<<<<<<< intent?: string onAppleLogin?: (e: Event) => void ======= intent: AuthIntent >>>>>>> intent: AuthIntent onAppleLogin?: (e: Event) => void
<<<<<<< import { ClientConfigurationError } from "./error/ClientConfigurationError"; import { AuthError } from "./error/AuthError"; import { ClientAuthError } from "./error/ClientAuthError"; ======= import { ClientConfigurationError } from "./error/ClientConfigurationError"; >>>>>>> import { ClientConfigurationError } from "./error/ClientConfigurationError"; import { AuthError } from "./error/AuthError"; import { ClientAuthError } from "./error/ClientAuthError"; <<<<<<< // Validate and filter scopes (the validate function will throw if validation fails) this.validateInputScope(scopes, false); scopes = this.filterScopes(scopes); ======= // Validate and filter scopes (the validate function will throw if validation fails) this.validateInputScope(scopes, false); >>>>>>> // Validate and filter scopes (the validate function will throw if validation fails) this.validateInputScope(scopes, false); scopes = this.filterScopes(scopes); <<<<<<< // Validate and filter scopes (the validate function will throw if validation fails) this.validateInputScope(scopes, true); scopes = this.filterScopes(scopes); ======= // Validate and filter scopes (the validate function will throw if validation fails) this.validateInputScope(scopes, true); >>>>>>> // Validate and filter scopes (the validate function will throw if validation fails) this.validateInputScope(scopes, true); scopes = this.filterScopes(scopes); <<<<<<< reject(ClientAuthError.createLoginInProgressError()); } // Validate and filter scopes (the validate function will throw if validation fails) this.validateInputScope(scopes, false); scopes = this.filterScopes(scopes); ======= // TODO: Return custom error object here in future reject(ErrorCodes.loginProgressError + Constants.resourceDelimiter + ErrorDescription.loginProgressError); return; } // Validate and filter scopes (the validate function will throw if validation fails) this.validateInputScope(scopes, false); >>>>>>> reject(ClientAuthError.createLoginInProgressError()); } // Validate and filter scopes (the validate function will throw if validation fails) this.validateInputScope(scopes, false); scopes = this.filterScopes(scopes); <<<<<<< // Validate and filter scopes (the validate function will throw if validation fails) this.validateInputScope(scopes, true); scopes = this.filterScopes(scopes); ======= // Validate and filter scopes (the validate function will throw if validation fails) this.validateInputScope(scopes, true); >>>>>>> // Validate and filter scopes (the validate function will throw if validation fails) this.validateInputScope(scopes, true); scopes = this.filterScopes(scopes); <<<<<<< } }).catch((err) => { this._logger.warning("could not resolve endpoints"); reject(ClientAuthError.createEndpointResolutionError(err.toString())); return null; }); ======= } }).catch((err) => { this._logger.warning("could not resolve endpoints"); reject(err); return null; }); >>>>>>> } }).catch((err) => { this._logger.warning("could not resolve endpoints"); reject(ClientAuthError.createEndpointResolutionError(err.toString())); return null; }); <<<<<<< // TODO: Check if this can be combined with filterScopes() private validateInputScope(scopes: Array<string>, scopesRequired: boolean): void { if (!scopes) { if (scopesRequired) { throw ClientConfigurationError.createScopesRequiredError(scopes); } else { return; } ======= private validateInputScope(scopes: Array<string>, scopesRequired: boolean): void { if (!scopes) { if (scopesRequired) { throw ClientConfigurationError.createScopesRequiredError(scopes); } else { return; } >>>>>>> private validateInputScope(scopes: Array<string>, scopesRequired: boolean): void { if (!scopes) { if (scopesRequired) { throw ClientConfigurationError.createScopesRequiredError(scopes); } else { return; } <<<<<<< } /** * Used to remove openid and profile from the list of scopes passed by the developer.These scopes are added by default * @hidden */ // TODO: Check if this can be combined with validateInputScope() private filterScopes(scopes: Array<string>): Array<string> { if (scopes) { scopes = scopes.filter(function (element) { return element !== Constants.openidScope; }); scopes = scopes.filter(function (element) { return element !== Constants.profileScope; }); } return scopes; ======= >>>>>>> } /** * Used to remove openid and profile from the list of scopes passed by the developer.These scopes are added by default * @hidden */ // TODO: Check if this can be combined with validateInputScope() private filterScopes(scopes: Array<string>): Array<string> { if (scopes) { scopes = scopes.filter(function (element) { return element !== Constants.openidScope; }); scopes = scopes.filter(function (element) { return element !== Constants.profileScope; }); } return scopes;
<<<<<<< export const UPDATE_IT_STATEMENT = 'UPDATE_IT_STATEMENT' ======= export const ADD_COMPONENT_NAME = 'ADD_COMPONENT_NAME' export const CLEAR_FILE = 'CLEAR_FILE' export const DELETE_EXPECT = 'DELETE_EXPECT' export const REMOVE_FROM_IT = 'REMOVE_FROM_IT' >>>>>>> export const UPDATE_IT_STATEMENT = 'UPDATE_IT_STATEMENT' export const ADD_COMPONENT_NAME = 'ADD_COMPONENT_NAME' export const CLEAR_FILE = 'CLEAR_FILE' export const DELETE_EXPECT = 'DELETE_EXPECT' export const REMOVE_FROM_IT = 'REMOVE_FROM_IT'
<<<<<<< its: {}, ======= keyOfExpect: 0, >>>>>>> keyOfExpect: 0, componentObj: {} <<<<<<< ======= >>>>>>> <<<<<<< ======= >>>>>>>
<<<<<<< item => expect(item.camera.shoulderModeScale).to.not.equal(undefined, 'camera.shoulderModeScale'), item => expect(Array.isArray(item.nextEvolutionBranches || [])).to.equal(true, "nextEvolutionBranches type"), item => expect(item.id !== 'BULBASAUR' || item.nextEvolutionBranches.length === 1).to.equal(true, "should have one nextEvolutionBranch for linear pokemon"), item => expect(item.id !== 'EEVEE' || item.nextEvolutionBranches.length === 5).to.equal(true, "should have 5 nextEvolutionBranch-es for Eevee"), ======= item => expect(item.name === 'Caterpie' || item.camera.shoulderModeScale !== undefined).to.equal(true, 'camera.shoulderModeScale'), >>>>>>> item => expect(item.name === 'Caterpie' || item.camera.shoulderModeScale !== undefined).to.equal(true, 'camera.shoulderModeScale'), item => expect(Array.isArray(item.nextEvolutionBranches || [])).to.equal(true, "nextEvolutionBranches type"), item => expect(item.id !== 'BULBASAUR' || item.nextEvolutionBranches.length === 1).to.equal(true, "should have one nextEvolutionBranch for linear pokemon"), item => expect(item.id !== 'EEVEE' || item.nextEvolutionBranches.length === 5).to.equal(true, "should have 5 nextEvolutionBranch-es for Eevee"),
<<<<<<< uploadFile(file: File): void { const { fieldName, formId, s3UploadDir, renderer, uploads, uploadUrl } = this; const filename = file.name; const existingUploadIndex = this.findUpload(filename); if (existingUploadIndex !== null) { this.removeExistingUpload(existingUploadIndex); } const uploadIndex = uploads.length; let upload: S3Uploader | Upload | null = null; if (s3UploadDir != null) { upload = new S3Uploader(file, { s3UploadDir: s3UploadDir, onProgress: (bytesUploaded: number, bytesTotal: number): void => this.handleProgress(uploadIndex, bytesUploaded, bytesTotal), onError: (error: Error): void => this.handleError(uploadIndex, error), onSuccess: (): void => this.handleSuccess(uploadIndex, (upload as S3Uploader).file.size) }); } else { upload = new Upload(file, { ======= const upload = new Upload(file, { chunkSize: this.chunkSize, >>>>>>> uploadFile(file: File): void { const { fieldName, formId, s3UploadDir, renderer, uploads, uploadUrl } = this; const filename = file.name; const existingUploadIndex = this.findUpload(filename); if (existingUploadIndex !== null) { this.removeExistingUpload(existingUploadIndex); } const uploadIndex = uploads.length; let upload: S3Uploader | Upload | null = null; if (s3UploadDir != null) { upload = new S3Uploader(file, { s3UploadDir: s3UploadDir, onProgress: (bytesUploaded: number, bytesTotal: number): void => this.handleProgress(uploadIndex, bytesUploaded, bytesTotal), onError: (error: Error): void => this.handleError(uploadIndex, error), onSuccess: (): void => this.handleSuccess(uploadIndex, (upload as S3Uploader).file.size) }); } else { upload = new Upload(file, { chunkSize: this.chunkSize,
<<<<<<< 'sort_by_title', 'sort_by_artist', 'custom_sort', ======= 'developed_by', >>>>>>> 'sort_by_title', 'sort_by_artist', 'custom_sort', 'developed_by', <<<<<<< sort_by_title: 'Sort by title', sort_by_artist: 'Sort by artist', custom_sort: 'Custom sort', ======= developed_by: 'Developed by', >>>>>>> sort_by_title: 'Sort by title', sort_by_artist: 'Sort by artist', custom_sort: 'Custom sort', developed_by: 'Developed by', <<<<<<< sort_by_title: 'Ordenar por título', sort_by_artist: 'Ordenar por artista', custom_sort: 'Classificação personalizada', ======= developed_by: 'Desenvolvido por', >>>>>>> sort_by_title: 'Ordenar por título', sort_by_artist: 'Ordenar por artista', custom_sort: 'Classificação personalizada', developed_by: 'Desenvolvido por',
<<<<<<< import { AuthenticationResult, EventMessage, EventType, InteractionType } from '@azure/msal-browser'; ======= import { EventMessage, EventType, InteractionType, PopupRequest, RedirectRequest } from '@azure/msal-browser'; >>>>>>> import { AuthenticationResult, EventMessage, EventType, InteractionType, PopupRequest, RedirectRequest } from '@azure/msal-browser';
<<<<<<< it("doesnt navigate if onRedirectNavigate returns false", (done) => { const logoutUriSpy = sinon.stub(AuthorizationCodeClient.prototype, "getLogoutUri").returns(testLogoutUrl); sinon.stub(BrowserUtils, "navigateWindow").callsFake((urlNavigate: string, timeout: number, logger: Logger, noHistory: boolean) => { // If onRedirectNavigate does not stop navigatation, this will be called, failing the test as done will be invoked twice return Promise.resolve(done()); }); pca.logout({ onRedirectNavigate: (url) => { expect(url).to.be.eq(testLogoutUrl); done(); return false; } }); const validatedLogoutRequest: CommonEndSessionRequest = { correlationId: RANDOM_TEST_GUID, postLogoutRedirectUri: TEST_URIS.TEST_REDIR_URI }; expect(logoutUriSpy.calledWith(validatedLogoutRequest)); }) ======= it("throws an error if inside an iframe", async () => { sinon.stub(BrowserUtils, "isInIframe").returns(true); await expect(pca.logout()).to.be.rejectedWith(BrowserAuthErrorMessage.redirectInIframeError.desc); }); >>>>>>> it("doesnt navigate if onRedirectNavigate returns false", (done) => { const logoutUriSpy = sinon.stub(AuthorizationCodeClient.prototype, "getLogoutUri").returns(testLogoutUrl); sinon.stub(BrowserUtils, "navigateWindow").callsFake((urlNavigate: string, timeout: number, logger: Logger, noHistory: boolean) => { // If onRedirectNavigate does not stop navigatation, this will be called, failing the test as done will be invoked twice return Promise.resolve(done()); }); pca.logout({ onRedirectNavigate: (url) => { expect(url).to.be.eq(testLogoutUrl); done(); return false; } }); const validatedLogoutRequest: CommonEndSessionRequest = { correlationId: RANDOM_TEST_GUID, postLogoutRedirectUri: TEST_URIS.TEST_REDIR_URI }; expect(logoutUriSpy.calledWith(validatedLogoutRequest)); }); it("throws an error if inside an iframe", async () => { sinon.stub(BrowserUtils, "isInIframe").returns(true); await expect(pca.logout()).to.be.rejectedWith(BrowserAuthErrorMessage.redirectInIframeError.desc); });
<<<<<<< System.import('cyph/session/session').then(Session => { const session: ISession = new Session.Session( locals.descriptor, locals.nativeCrypto, null, locals.id ); session.on(locals.events.close, () => session.close() ); session.on(locals.events.receive, (e: { data: string; }) => session.receive(e.data) ); session.on(locals.events.send, (e: { messages: IMessage[]; }) => session.sendBase(e.messages) ); session.on(locals.events.sendText, (e: { text: string; selfDestructTimeout?: number; }) => session.sendText(e.text, e.selfDestructTimeout) ); session.on(locals.events.updateState, (e: { key: string; value: any; }) => session.updateState(e.key, e.value) ); }); ======= const session: ISession = new Session.Session( locals.descriptor, locals.nativeCrypto, null, locals.id ); session.on(locals.events.close, () => session.close() ); session.on(locals.events.receive, (e: { data: string; }) => session.receive(e.data) ); session.on(locals.events.send, (e: { messages: IMessage[]; }) => session.sendBase(e.messages) ); session.on(locals.events.sendText, (e: { text: string; }) => session.sendText(e.text) ); session.on(locals.events.updateState, (e: { key: string; value: any; }) => session.updateState(e.key, e.value) ); >>>>>>> const session: ISession = new Session.Session( locals.descriptor, locals.nativeCrypto, null, locals.id ); session.on(locals.events.close, () => session.close() ); session.on(locals.events.receive, (e: { data: string; }) => session.receive(e.data) ); session.on(locals.events.send, (e: { messages: IMessage[]; }) => session.sendBase(e.messages) ); session.on(locals.events.sendText, (e: { text: string; selfDestructTimeout?: number; }) => session.sendText(e.text, e.selfDestructTimeout) ); session.on(locals.events.updateState, (e: { key: string; value: any; }) => session.updateState(e.key, e.value) );
<<<<<<< /** * Logs WebSign failure (this one is super serious). * @function */ public static logWebSign = Errors.baseErrorLog('SOMEONE JUST GOT THE WEBSIGN ERROR SCREEN LADS', true); ======= >>>>>>>
<<<<<<< /** Gets filter function. */ public readonly getFilterFunction = memoize((incoming: boolean = false) => observableAll([this.currentDirectory, this.filterFunctionSubject]).pipe( map( ([currentDirectory, filterFunction]) => ( o: IAccountFileRecord ) => (filterFunction === undefined || filterFunction(o)) && (incoming || (o.parentPath || '') === currentDirectory) ) ) ); /** @see geISODateString */ public readonly geISODateString = geISODateString; ======= /** @see getISODateString */ public readonly getISODateString = getISODateString; >>>>>>> /** Gets filter function. */ public readonly getFilterFunction = memoize((incoming: boolean = false) => observableAll([this.currentDirectory, this.filterFunctionSubject]).pipe( map( ([currentDirectory, filterFunction]) => ( o: IAccountFileRecord ) => (filterFunction === undefined || filterFunction(o)) && (incoming || (o.parentPath || '') === currentDirectory) ) ) ); /** @see getISODateString */ public readonly getISODateString = getISODateString;