conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
if (androidSDK < 21 || !response.getResponseHeaders) {
=======
if (android.os.Build.VERSION.SDK_INT < 21) {
>>>>>>>
if (android.os.Build.VERSION.SDK_INT < 21 || !response.getResponseHeaders) { |
<<<<<<<
import { UserAvatarModule } from '../user-avatar/user-avatar.module';
=======
import { InlineEditorModule } from '../inline-editor/inline-editor.module';
>>>>>>>
import { UserAvatarModule } from '../user-avatar/user-avatar.module';
import { InlineEditorModule } from '../inline-editor/inline-editor.module';
<<<<<<<
UserAvatarModule,
=======
InlineEditorModule,
>>>>>>>
UserAvatarModule,
InlineEditorModule, |
<<<<<<<
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
=======
import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component';
>>>>>>>
import { MatSlideToggleModule } from '@angular/material/slide-toggle';
import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component'; |
<<<<<<<
import { AuthService } from '../../services/auth/auth.service';
import { AuditInfo } from '../../shared/models/audit-info.model';
=======
import { LayerListItemActionsType } from '../layer-list-item/layer-list-item.component';
>>>>>>>
import { AuthService } from '../../services/auth/auth.service';
import { AuditInfo } from '../../shared/models/audit-info.model';
import { LayerListItemActionsType } from '../layer-list-item/layer-list-item.component'; |
<<<<<<<
import { RouterService } from './../../services/router/router.service';
import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component';
import { MatDialog } from '@angular/material/dialog';
import { Router } from '@angular/router';
import { DataStoreService } from '../../services/data-store/data-store.service';
=======
import { NavigationService } from './../../services/router/router.service';
>>>>>>>
import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component';
import { MatDialog } from '@angular/material/dialog';
import { Router } from '@angular/router';
import { DataStoreService } from '../../services/data-store/data-store.service';
import { NavigationService } from './../../services/router/router.service';
<<<<<<<
private routerService: RouterService,
private sanitizer: DomSanitizer,
private confirmationDialog: MatDialog,
private router: Router,
private dataStoreService: DataStoreService
=======
private navigationService: NavigationService,
private sanitizer: DomSanitizer
>>>>>>>
private sanitizer: DomSanitizer,
private confirmationDialog: MatDialog,
private router: Router,
private dataStoreService: DataStoreService,
private navigationService: NavigationService
<<<<<<<
this.routerService.getFeatureId$().subscribe(id => {
this.featureId = id;
})
);
this.subscription.add(
this.routerService.getProjectId$().subscribe(id => {
=======
this.navigationService.getProjectId$().subscribe(id => {
>>>>>>>
this.navigationService.getFeatureId$().subscribe(id => {
this.featureId = id;
})
);
this.subscription.add(
this.navigationService.getProjectId$().subscribe(id => { |
<<<<<<<
required: [false],
fieldType: new FormControl(this.fieldTypes[0]),
=======
fieldTypeOption: new FormControl(this.fieldTypeOptions[0]),
>>>>>>>
required: [false],
fieldTypeOption: new FormControl(this.fieldTypeOptions[0]),
<<<<<<<
let field: Field = {
id: fieldId,
type: FieldType['TEXT'],
required: question.required,
label: StringMap({
en: question.label || '',
}),
};
if (question.fieldType.type === 'multipleChoice') {
question.options.forEach((option: OptionModel) => {
const optionId = this.dataStoreService.generateId();
options = options.set(optionId, {
id: optionId,
code: option.code || '',
label: StringMap({
en: option.label || '',
}),
});
});
const multipleChoice: MultipleChoice = {
cardinality: Cardinality['SELECT_MULTIPLE'],
options,
};
field = {
...field,
type: FieldType['MULTIPLE_CHOICE'],
multipleChoice: multipleChoice || Map<string, Option>(),
};
}
fields = fields.set(fieldId, field);
=======
fields = fields.set(
fieldId,
this.convertQuestionToField(fieldId, question)
);
>>>>>>>
fields = fields.set(
fieldId,
this.convertQuestionToField(fieldId, question)
); |
<<<<<<<
import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component';
import { MatDialog } from '@angular/material/dialog';
import { Router } from '@angular/router';
import { DataStoreService } from '../../services/data-store/data-store.service';
import { Subscription } from 'rxjs';
=======
import { environment } from '../../../environments/environment';
import { Subscription } from 'rxjs';
>>>>>>>
import { ConfirmationDialogComponent } from '../confirmation-dialog/confirmation-dialog.component';
import { MatDialog } from '@angular/material/dialog';
import { Router } from '@angular/router';
import { DataStoreService } from '../../services/data-store/data-store.service';
import { environment } from '../../../environments/environment';
import { Subscription } from 'rxjs';
<<<<<<<
subscription: Subscription = new Subscription();
=======
projectId!: string | null;
private subscription = new Subscription();
>>>>>>>
subscription: Subscription = new Subscription();
<<<<<<<
this.subscription.add(
this.routerService.getFeatureId$().subscribe(id => {
this.featureId = id;
})
);
this.subscription.add(
this.routerService.getProjectId$().subscribe(id => {
this.projectId = id;
})
);
}
ngOnDestroy() {
this.subscription.unsubscribe();
=======
this.subscription.add(
this.routerService.getProjectId$().subscribe(id => {
this.projectId = id;
})
);
>>>>>>>
this.subscription.add(
this.routerService.getFeatureId$().subscribe(id => {
this.featureId = id;
})
);
this.subscription.add(
this.routerService.getProjectId$().subscribe(id => {
this.projectId = id;
})
);
<<<<<<<
onDeleteFeature() {
const dialogRef = this.confirmationDialog.open(
ConfirmationDialogComponent,
{
maxWidth: '500px',
data: {
title: 'Warning',
message:
'Are you sure you wish to delete this feature? Any associated data including all observations in this feature will be lost. This cannot be undone.',
},
}
);
dialogRef.afterClosed().subscribe(async dialogResult => {
if (dialogResult) {
await this.deleteFeature();
}
});
}
async deleteFeature() {
if (!this.projectId || !this.featureId) {
return;
}
await this.dataStoreService.deleteFeature(this.projectId, this.featureId);
this.onClose();
}
onClose() {
return this.router.navigate([`p/${this.projectId}`]);
}
=======
onDownloadCsv() {
const link = `https://${environment.cloudFunctionsHost}/exportCsv?p=${this.projectId}&l=${this.layer?.id}`;
}
ngOnDestroy(): void {
this.subscription.unsubscribe();
}
>>>>>>>
onDeleteFeature() {
const dialogRef = this.confirmationDialog.open(
ConfirmationDialogComponent,
{
maxWidth: '500px',
data: {
title: 'Warning',
message:
'Are you sure you wish to delete this feature? Any associated data including all observations in this feature will be lost. This cannot be undone.',
},
}
);
dialogRef.afterClosed().subscribe(async dialogResult => {
if (dialogResult) {
await this.deleteFeature();
}
});
}
async deleteFeature() {
if (!this.projectId || !this.featureId) {
return;
}
await this.dataStoreService.deleteFeature(this.projectId, this.featureId);
this.onClose();
}
onClose() {
return this.router.navigate([`p/${this.projectId}`]);
}
onDownloadCsv() {
const link = `https://${environment.cloudFunctionsHost}/exportCsv?p=${this.projectId}&l=${this.layer?.id}`;
}
ngOnDestroy(): void {
this.subscription.unsubscribe();
} |
<<<<<<<
declare module "lodash/uniqBy"
declare module 'intersperse';
=======
declare module "lodash/uniqBy";
declare module "raf";
>>>>>>>
declare module "lodash/uniqBy";
declare module 'intersperse';
declare module "raf"; |
<<<<<<<
/**
* Add an appender, if not already added, that writes logs to Azure Function's context.log.
* The benefit of doing so, vs. just using console.log, is that the logs get associated with the request
* in the Azure Portal. Otherwise the only way to see the logs is as a jumbled mess in Application Insights.
*
* @param contextLogLevel the minimum level of logs that will be logged
*/
private static addContextLogger(contextLogLevel: LogLevel) {
// If the appender was already added (which will be the case every time except the first request), don't add it again
if (Log.config.appenders[AZURE_FUNCTION_APPENDER_NAME]) {
return;
}
// Our context logger requires async hooks enabled, so don't add it if they aren't
if (Log.config.disableAsyncHooks) {
return;
}
// Add our context.log appender
Log.addAppender(AZURE_FUNCTION_APPENDER_NAME, {
write: (logEvent) => {
if (logEvent.msg) {
const host = logEvent.requestContext;
if (host && host instanceof AzureFunction) {
if (logEvent.logLevel === LogLevel.ERROR) {
host.context.log.error(logEvent.msg);
} else if (logEvent.logLevel === LogLevel.WARN) {
host.context.log.warn(logEvent.msg);
} else if (logEvent.logLevel === LogLevel.INFO) {
host.context.log.info(logEvent.msg);
} else if (logEvent.logLevel === LogLevel.VERBOSE || logEvent.logLevel === LogLevel.DEBUG) {
host.context.log.verbose(logEvent.msg);
} else {
host.context.log(logEvent.msg);
}
} else {
// this should hardly ever happen, but just in case
console.log(logEvent.msg);
}
}
},
logLevel: contextLogLevel,
ignoreFormatting: true,
trackRequest: true,
});
// Finally remove the existing console appender, since it would just be duplicating log entries now
Log.removeAppender('console');
}
=======
fail(error: Error) { // tslint:disable-line
if (!this.context.res.statusCode) {
const responseObj: any = { // tslint:disable-line
code: 500,
msg: error.message,
};
if (process.env.NODE_ENV === 'production') {
responseObj.stack = error.stack;
}
this.context.res = {
headers: {
'Content-Type': 'application/json',
},
statusCode: 500,
body: responseObj
};
this.context.done();
}
}
>>>>>>>
fail(error: Error) { // tslint:disable-line
if (!this.context.res.statusCode) {
const responseObj: any = { // tslint:disable-line
code: 500,
msg: error.message,
};
if (process.env.NODE_ENV === 'production') {
responseObj.stack = error.stack;
}
this.context.res = {
headers: {
'Content-Type': 'application/json',
},
statusCode: 500,
body: responseObj
};
this.context.done();
}
}
/**
* Add an appender, if not already added, that writes logs to Azure Function's context.log.
* The benefit of doing so, vs. just using console.log, is that the logs get associated with the request
* in the Azure Portal. Otherwise the only way to see the logs is as a jumbled mess in Application Insights.
*
* @param contextLogLevel the minimum level of logs that will be logged
*/
private static addContextLogger(contextLogLevel: LogLevel) {
// If the appender was already added (which will be the case every time except the first request), don't add it again
if (Log.config.appenders[AZURE_FUNCTION_APPENDER_NAME]) {
return;
}
// Our context logger requires async hooks enabled, so don't add it if they aren't
if (Log.config.disableAsyncHooks) {
return;
}
// Add our context.log appender
Log.addAppender(AZURE_FUNCTION_APPENDER_NAME, {
write: (logEvent) => {
if (logEvent.msg) {
const host = logEvent.requestContext;
if (host && host instanceof AzureFunction) {
if (logEvent.logLevel === LogLevel.ERROR) {
host.context.log.error(logEvent.msg);
} else if (logEvent.logLevel === LogLevel.WARN) {
host.context.log.warn(logEvent.msg);
} else if (logEvent.logLevel === LogLevel.INFO) {
host.context.log.info(logEvent.msg);
} else if (logEvent.logLevel === LogLevel.VERBOSE || logEvent.logLevel === LogLevel.DEBUG) {
host.context.log.verbose(logEvent.msg);
} else {
host.context.log(logEvent.msg);
}
} else {
// this should hardly ever happen, but just in case
console.log(logEvent.msg);
}
}
},
logLevel: contextLogLevel,
ignoreFormatting: true,
trackRequest: true,
});
// Finally remove the existing console appender, since it would just be duplicating log entries now
Log.removeAppender('console');
} |
<<<<<<<
const response = await AlexaAPI.apiCall(options);
if (response.status >= 400) {
=======
const response: any = await AlexaAPI.apiCall(options); // tslint:disable-line
if (response.httpStatus === 401) {
return Promise.reject(new ApiError('Request Unauthorized', ApiError.NO_USER_PERMISSION));
}
const httpStatus = response.httpStatus + '';
if (httpStatus.startsWith('4') || httpStatus.startsWith('5')) {
>>>>>>>
const response: any = await AlexaAPI.apiCall(options); // tslint:disable-line
if (response.httpStatus === 401) {
return Promise.reject(new ApiError('Request Unauthorized', ApiError.NO_USER_PERMISSION));
}
if (response.status >= 400) {
<<<<<<<
const response = await AlexaAPI.apiCall(options);
if (response.status >= 400) {
=======
const response: any = await AlexaAPI.apiCall(options); // tslint:disable-line
if (response.httpStatus === 401) {
return Promise.reject(new ApiError('Request Unauthorized', ApiError.NO_USER_PERMISSION));
}
const httpStatus = response.httpStatus + '';
if (httpStatus.startsWith('4') || httpStatus.startsWith('5')) {
>>>>>>>
const response: any = await AlexaAPI.apiCall(options); // tslint:disable-line
if (response.httpStatus === 401) {
return Promise.reject(new ApiError('Request Unauthorized', ApiError.NO_USER_PERMISSION));
}
if (response.status >= 400) {
<<<<<<<
const response = await AlexaAPI.apiCall(options);
if (response.status >= 400) {
=======
const response: any = await AlexaAPI.apiCall(options); // tslint:disable-line
if (response.httpStatus === 401) {
return Promise.reject(new ApiError('Request Unauthorized', ApiError.NO_USER_PERMISSION));
}
const httpStatus = response.httpStatus + '';
if (httpStatus.startsWith('4') || httpStatus.startsWith('5')) {
>>>>>>>
const response: any = await AlexaAPI.apiCall(options); // tslint:disable-line
if (response.httpStatus === 401) {
return Promise.reject(new ApiError('Request Unauthorized', ApiError.NO_USER_PERMISSION));
}
if (response.status >= 400) {
<<<<<<<
const response = await AlexaAPI.apiCall(options);
if (response.status >= 400) {
=======
const response: any = await AlexaAPI.apiCall(options); // tslint:disable-line
if (response.httpStatus === 401) {
return Promise.reject(new ApiError('Request Unauthorized', ApiError.NO_USER_PERMISSION));
}
const httpStatus = response.httpStatus + '';
if (httpStatus.startsWith('4') || httpStatus.startsWith('5')) {
>>>>>>>
const response: any = await AlexaAPI.apiCall(options); // tslint:disable-line
if (response.httpStatus === 401) {
return Promise.reject(new ApiError('Request Unauthorized', ApiError.NO_USER_PERMISSION));
}
if (response.status >= 400) {
<<<<<<<
const response = await AlexaAPI.apiCall(options);
if (response.status >= 400) {
=======
const response: any = await AlexaAPI.apiCall(options); // tslint:disable-line
if (response.httpStatus === 401) {
return Promise.reject(new ApiError('Request Unauthorized', ApiError.NO_USER_PERMISSION));
}
const httpStatus = response.httpStatus + '';
if (httpStatus.startsWith('4') || httpStatus.startsWith('5')) {
>>>>>>>
const response: any = await AlexaAPI.apiCall(options); // tslint:disable-line
if (response.httpStatus === 401) {
return Promise.reject(new ApiError('Request Unauthorized', ApiError.NO_USER_PERMISSION));
}
if (response.status >= 400) { |
<<<<<<<
import { EmotionName, EmotionIntensity } from './core/Interfaces';
=======
import { AmazonPay } from './modules/AmazonPay';
>>>>>>>
import { EmotionName, EmotionIntensity } from './core/Interfaces';
import { AmazonPay } from './modules/AmazonPay';
<<<<<<<
interface AppAlexaConfig {
Alexa?: Config;
}
=======
// Amazon Pay
declare module './core/AlexaSkill' {
interface AlexaSkill {
$pay?: AmazonPay;
pay(): AmazonPay | undefined;
}
}
>>>>>>>
interface AppAlexaConfig {
Alexa?: Config;
}
// Amazon Pay
declare module './core/AlexaSkill' {
interface AlexaSkill {
$pay?: AmazonPay;
pay(): AmazonPay | undefined;
}
} |
<<<<<<<
testInjector.register("gradleCommandService", GradleCommandService);
testInjector.register("gradleBuildService", GradleBuildService);
testInjector.register("gradleBuildArgsService", GradleBuildArgsService);
=======
testInjector.register("cleanupService", {
setShouldDispose: (shouldDispose: boolean): void => undefined
});
>>>>>>>
testInjector.register("gradleCommandService", GradleCommandService);
testInjector.register("gradleBuildService", GradleBuildService);
testInjector.register("gradleBuildArgsService", GradleBuildArgsService);
testInjector.register("cleanupService", {
setShouldDispose: (shouldDispose: boolean): void => undefined
}); |
<<<<<<<
testInjector.register("timers", {});
testInjector.register("iOSSigningService", IOSSigningService);
testInjector.register("xcodebuildService", XcodebuildService);
testInjector.register("xcodebuildCommandService", XcodebuildCommandService);
testInjector.register("xcodebuildArgsService", XcodebuildArgsService);
testInjector.register("exportOptionsPlistService", ExportOptionsPlistService);
=======
testInjector.register("iOSWatchAppService", {
removeWatchApp: () => { /* */ },
addWatchAppFromPath: () => Promise.resolve()
});
>>>>>>>
testInjector.register("timers", {});
testInjector.register("iOSSigningService", IOSSigningService);
testInjector.register("xcodebuildService", XcodebuildService);
testInjector.register("xcodebuildCommandService", XcodebuildCommandService);
testInjector.register("xcodebuildArgsService", XcodebuildArgsService);
testInjector.register("exportOptionsPlistService", ExportOptionsPlistService);
testInjector.register("iOSWatchAppService", {
removeWatchApp: () => { /* */ },
addWatchAppFromPath: () => Promise.resolve()
});
<<<<<<<
=======
describe("buildProject", () => {
let xcodeBuildCommandArgs: string[] = [];
function setup(data: { frameworkVersion: string, deploymentTarget: string, devices?: Mobile.IDevice[] }): IInjector {
const projectPath = "myTestProjectPath";
const projectName = "myTestProjectName";
const testInjector = createTestInjector(projectPath, projectName);
const childProcess = testInjector.resolve("childProcess");
childProcess.spawnFromEvent = (command: string, args: string[]) => {
if (command === "xcodebuild" && args[0] !== "-exportArchive") {
xcodeBuildCommandArgs = args;
}
};
const projectDataService = testInjector.resolve("projectDataService");
projectDataService.getNSValue = (projectDir: string, propertyName: string) => {
if (propertyName === "tns-ios") {
return {
name: "tns-ios",
version: data.frameworkVersion
};
}
};
const projectData = testInjector.resolve("projectData");
projectData.appResourcesDirectoryPath = join(projectPath, "app", "App_Resources");
const devicesService = testInjector.resolve("devicesService");
devicesService.initialize = () => ({});
devicesService.getDeviceInstances = () => data.devices || [];
const xcconfigService = testInjector.resolve("xcconfigService");
xcconfigService.readPropertyValue = (projectDir: string, propertyName: string) => {
if (propertyName === "IPHONEOS_DEPLOYMENT_TARGET") {
return data.deploymentTarget;
}
};
const pbxprojDomXcode = testInjector.resolve("pbxprojDomXcode");
pbxprojDomXcode.Xcode = {
open: () => ({
getSigning: () => ({}),
setAutomaticSigningStyle: () => ({}),
setAutomaticSigningStyleByTargetProductType: () => ({}),
setAutomaticSigningStyleByTargetProductTypesList: () => ({}),
setAutomaticSigningStyleByTargetKey: () => ({}),
save: () => ({})
})
};
const iOSProvisionService = testInjector.resolve("iOSProvisionService");
iOSProvisionService.getDevelopmentTeams = () => ({});
iOSProvisionService.getTeamIdsWithName = () => ({});
return testInjector;
}
function executeTests(testCases: any[], data: { buildForDevice: boolean }) {
_.each(testCases, testCase => {
it(`${testCase.name}`, async () => {
const testInjector = setup({ frameworkVersion: testCase.frameworkVersion, deploymentTarget: testCase.deploymentTarget });
const projectData: IProjectData = testInjector.resolve("projectData");
const iOSProjectService = <IOSProjectService>testInjector.resolve("iOSProjectService");
(<any>iOSProjectService).getExportOptionsMethod = () => ({});
await iOSProjectService.buildProject("myProjectRoot", projectData, <any>{ buildForDevice: data.buildForDevice });
const archsItem = xcodeBuildCommandArgs.find(item => item.startsWith("ARCHS="));
if (testCase.expectedArchs) {
const archsValue = archsItem.split("=")[1];
assert.deepEqual(archsValue, testCase.expectedArchs);
} else {
assert.deepEqual(undefined, archsItem);
}
});
});
}
describe("for device", () => {
afterEach(() => {
xcodeBuildCommandArgs = [];
});
const testCases = <any[]>[{
name: "shouldn't exclude armv7 architecture when deployment target 10",
frameworkVersion: "5.0.0",
deploymentTarget: "10.0",
expectedArchs: "armv7 arm64"
}, {
name: "should exclude armv7 architecture when deployment target is 11",
frameworkVersion: "5.0.0",
deploymentTarget: "11.0",
expectedArchs: "arm64"
}, {
name: "shouldn't pass architecture to xcodebuild command when frameworkVersion is 5.1.0",
frameworkVersion: "5.1.0",
deploymentTarget: "11.0"
}, {
name: "should pass only 64bit architecture to xcodebuild command when frameworkVersion is 5.0.0 and deployment target is 11.0",
frameworkVersion: "5.0.0",
deploymentTarget: "11.0",
expectedArchs: "arm64"
}, {
name: "should pass both architectures to xcodebuild command when frameworkVersion is 5.0.0 and deployment target is 10.0",
frameworkVersion: "5.0.0",
deploymentTarget: "10.0",
expectedArchs: "armv7 arm64"
}, {
name: "should pass both architectures to xcodebuild command when frameworkVersion is 5.0.0 and no deployment target",
frameworkVersion: "5.0.0",
deploymentTarget: null,
expectedArchs: "armv7 arm64"
}];
executeTests(testCases, { buildForDevice: true });
});
describe("for simulator", () => {
afterEach(() => {
xcodeBuildCommandArgs = [];
});
const testCases = [{
name: "shouldn't exclude i386 architecture when deployment target is 10",
frameworkVersion: "5.0.0",
deploymentTarget: "10.0",
expectedArchs: "i386 x86_64"
}, {
name: "should exclude i386 architecture when deployment target is 11",
frameworkVersion: "5.0.0",
deploymentTarget: "11.0",
expectedArchs: "x86_64"
}, {
name: "shouldn't pass architecture to xcodebuild command when frameworkVersion is 5.1.0",
frameworkVersion: "5.1.0",
deploymentTarget: "11.0"
}, {
name: "should pass only 64bit architecture to xcodebuild command when frameworkVersion is 5.0.0 and deployment target is 11.0",
frameworkVersion: "5.0.0",
deploymentTarget: "11.0",
expectedArchs: "x86_64"
}, {
name: "should pass both architectures to xcodebuild command when frameworkVersion is 5.0.0 and deployment target is 10.0",
frameworkVersion: "5.0.0",
deploymentTarget: "10.0",
expectedArchs: "i386 x86_64"
}, {
name: "should pass both architectures to xcodebuild command when frameworkVersion is 5.0.0 and no deployment target",
frameworkVersion: "5.0.0",
deploymentTarget: null,
expectedArchs: "i386 x86_64"
}];
executeTests(testCases, { buildForDevice: false });
});
});
>>>>>>> |
<<<<<<<
import { Device, FilesPayload } from "nativescript-preview-sdk";
import { APP_RESOURCES_FOLDER_NAME, APP_FOLDER_NAME } from "../../../constants";
=======
import { FilePayload, Device, FilesPayload } from "nativescript-preview-sdk";
import { PreviewSdkEventNames, PreviewAppLiveSyncEvents } from "./preview-app-constants";
import { APP_FOLDER_NAME, APP_RESOURCES_FOLDER_NAME, TNS_MODULES_FOLDER_NAME } from "../../../constants";
>>>>>>>
import { Device, FilesPayload } from "nativescript-preview-sdk";
import { APP_RESOURCES_FOLDER_NAME, APP_FOLDER_NAME } from "../../../constants";
import { PreviewAppLiveSyncEvents } from "./preview-app-constants";
<<<<<<<
=======
private async syncFilesForPlatformSafe(data: IPreviewAppLiveSyncData, platform: string, opts?: ISyncFilesOptions): Promise<FilesPayload> {
this.$logger.info(`Start syncing changes for platform ${platform}.`);
opts = opts || {};
let payloads = null;
try {
const { env, projectDir } = data;
const projectData = this.$projectDataService.getProjectData(projectDir);
const platformData = this.$platformsData.getPlatformData(platform, projectData);
if (!opts.skipPrepare) {
await this.preparePlatform(platform, data, env, projectData);
}
if (opts.isInitialSync) {
const platformsAppFolderPath = path.join(platformData.appDestinationDirectoryPath, APP_FOLDER_NAME);
opts.filesToSync = this.$projectFilesManager.getProjectFiles(platformsAppFolderPath);
payloads = this.getFilesPayload(platformData, projectData, opts);
this.$logger.info(`Successfully synced changes for platform ${platform}.`);
} else {
opts.filesToSync = _.map(opts.filesToSync, file => this.$projectFilesProvider.mapFilePath(file, platformData.normalizedPlatformName, projectData));
payloads = this.getFilesPayload(platformData, projectData, opts);
await this.$previewSdkService.applyChanges(payloads);
this.$logger.info(`Successfully synced ${payloads.files.map(filePayload => filePayload.file.yellow)} for platform ${platform}.`);
}
return payloads;
} catch (error) {
this.$logger.warn(`Unable to apply changes for platform ${platform}. Error is: ${error}, ${JSON.stringify(error, null, 2)}.`);
this.emit(PreviewAppLiveSyncEvents.PREVIEW_APP_LIVE_SYNC_ERROR, {
error,
data,
platform,
deviceId: opts.deviceId
});
}
}
private getFilesPayload(platformData: IPlatformData, projectData: IProjectData, opts?: ISyncFilesOptions): FilesPayload {
const { filesToSync, filesToRemove, deviceId } = opts;
const filesToTransfer = filesToSync
.filter(file => file.indexOf(TNS_MODULES_FOLDER_NAME) === -1)
.filter(file => file.indexOf(APP_RESOURCES_FOLDER_NAME) === -1)
.filter(file => !_.includes(this.excludedFiles, path.basename(file)))
.filter(file => !_.includes(this.excludedFileExtensions, path.extname(file)));
this.$logger.trace(`Transferring ${filesToTransfer.join("\n")}.`);
const payloadsToSync = filesToTransfer.map(file => this.createFilePayload(file, platformData, projectData, PreviewSdkEventNames.CHANGE_EVENT_NAME));
const payloadsToRemove = _.map(filesToRemove, file => this.createFilePayload(file, platformData, projectData, PreviewSdkEventNames.UNLINK_EVENT_NAME));
const payloads = payloadsToSync.concat(payloadsToRemove);
const hmrMode = opts.useHotModuleReload ? 1 : 0;
return { files: payloads, platform: platformData.normalizedPlatformName.toLowerCase(), hmrMode, deviceId };
}
private async preparePlatform(platform: string, data: IPreviewAppLiveSyncData, env: Object, projectData: IProjectData): Promise<void> {
const appFilesUpdaterOptions = {
bundle: data.bundle,
useHotModuleReload: data.useHotModuleReload,
release: false
};
const nativePrepare = { skipNativePrepare: true };
const config = <IPlatformOptions>{};
const platformTemplate = <string>null;
const prepareInfo = {
platform,
appFilesUpdaterOptions,
env,
projectData,
nativePrepare,
config,
platformTemplate,
skipCopyTnsModules: true,
skipCopyAppResourcesFiles: true
};
await this.$platformService.preparePlatform(prepareInfo);
}
>>>>>>> |
<<<<<<<
const formattedPlatformsList = helpers.formatListOfNames(this.$platformCommandHelper.getAvailablePlatforms(this.$projectData), "and");
this.$logger.out("Available platforms for this OS: ", formattedPlatformsList);
this.$logger.out("No installed platforms found. Use $ tns platform add");
=======
const formattedPlatformsList = helpers.formatListOfNames(this.$platformService.getAvailablePlatforms(this.$projectData), "and");
this.$logger.info("Available platforms for this OS: ", formattedPlatformsList);
this.$logger.info("No installed platforms found. Use $ tns platform add");
>>>>>>>
const formattedPlatformsList = helpers.formatListOfNames(this.$platformCommandHelper.getAvailablePlatforms(this.$projectData), "and");
this.$logger.info("Available platforms for this OS: ", formattedPlatformsList);
this.$logger.info("No installed platforms found. Use $ tns platform add"); |
<<<<<<<
// Other dependencies
declare var jIO: any
declare module 'mnemonicjs'
=======
// For Quentin's test
interface Window {
muteTest: {
insert: (index: number, text: string) => void,
delete: (index: number, length: number) => void
getText: (index?: number, length?: number) => string
}
}
// Other dependencies
declare var jIO: any
declare module 'mnemonicjs'
>>>>>>>
// For Quentin's test
interface Window {
muteTest: {
insert: (index: number, text: string) => void,
delete: (index: number, length: number) => void,
getText: (index?: number, length?: number) => string
}
}
// Other dependencies
declare var jIO: any
declare module 'mnemonicjs' |
<<<<<<<
=======
public pulsarOn: boolean
constructor(
private zone: NgZone,
private route: ActivatedRoute,
private cryptoService: CryptoService,
private pulsarService: PulsarService
) {
this.route.paramMap.subscribe((params) => {
this.pulsarOn = params.get('pulsar') === 'true' ? true : false
console.log('BOOOOOOOOOOOOOOOOOOOL', this.pulsarOn)
console.log('PARAAAAAAAAAAAAAAAAAAAAAAAAAM', params.get('pulsar'))
})
>>>>>>>
<<<<<<<
if (streamId.type === MuteCoreStreams.DOCUMENT_CONTENT && environment.cryptography.type !== EncryptionType.NONE) {
if (!recipientId && this._pulsarOn) {
console.log('setMessageIn NOW PULSAR')
this.pulsarService.sendMessageToPulsar(streamId.type, this.wg.key, content)
}
this.cryptoService.crypto
.encrypt(content)
.then((encryptedContent) => {
this.send(streamId, encryptedContent, recipientId)
})
.catch((err) => {})
} else {
this.send(streamId, content, recipientId)
if (!recipientId && this._pulsarOn) {
console.log('setMessageIn NOW PULSAR')
this.pulsarService.sendMessageToPulsar(streamId.type, this.wg.key, content)
=======
if (streamId === MuteCoreStreams.DOCUMENT_CONTENT && environment.cryptography.type !== EncryptionType.NONE) {
this.cryptoService.crypto
.encrypt(content)
.then((encryptedContent) => {
if (!recipientId && this.pulsarOn) {
this.pulsarService.sendMessageToPulsar(streamId, this.wg.key, content)
}
this.send(streamId, encryptedContent, recipientId)
})
.catch((err) => {})
} else {
this.send(streamId, content, recipientId)
if (!recipientId && this.pulsarOn) {
this.pulsarService.sendMessageToPulsar(streamId, this.wg.key, content)
>>>>>>>
if (streamId.type === MuteCoreStreams.DOCUMENT_CONTENT && environment.cryptography.type !== EncryptionType.NONE) {
if (!recipientId && this._pulsarOn) {
console.log('setMessageIn NOW PULSAR')
this.pulsarService.sendMessageToPulsar(streamId.type, this.wg.key, content)
}
this.cryptoService.crypto
.encrypt(content)
.then((encryptedContent) => {
this.send(streamId, encryptedContent, recipientId)
})
.catch((err) => {})
} else {
this.send(streamId, content, recipientId)
if (!recipientId && this._pulsarOn) {
console.log('setMessageIn NOW PULSAR')
this.pulsarService.sendMessageToPulsar(streamId.type, this.wg.key, content)
<<<<<<<
this.route.data.subscribe(({ doc }: { doc: Doc }) => {
console.log('Le doc au sein de network service : ', doc)
doc.onMetadataChanges
.pipe(
filter(({ isLocal, changedProperties }) => {
console.log(changedProperties.includes(Doc.PULSAR))
return changedProperties.includes(Doc.PULSAR)
})
)
.subscribe(() => {
console.log('Le doc au sein de network service : ', doc)
console.log('Le bool au sein de network service :', doc.pulsar)
this._pulsarOn = doc.pulsar
if (doc.pulsar) {
this.pulsarConnect(this.wg.id)
}
})
// console.log('Le doc au sein de network service : ', doc)
// this._pulsarOn = doc.pulsar
// console.log('Le bool au sein de network service :', this._pulsarOn)
// if (this._pulsarOn) {
// this.pulsarConnect(this.wg.id)
// }
})
}
pulsarConnect(id: number) {
console.log('PULSSAAAAAAAAAAAAAAAAAAAAR ONNNNNNNNNNNNNNNNNNNNNNNNNNNNn')
this.pulsarService.sockets = this.wg.key
this.pulsarService.pulsarMessage$.subscribe((messagePulsar) => {
try {
// if (messagePulsar.streamId === MuteCoreStreams.DOCUMENT_CONTENT && environment.cryptography.type !== EncryptionType.NONE) {
// this.cryptoService.crypto
// .decrypt(messagePulsar.content)
// .then((decryptedContent) => {
// console.log('DECRYPT PULSAR', decryptedContent)
// this.messageSubject.next({ streamId: {type : messagePulsar.streamId, subtype : StreamsSubtype.METADATA_PULSAR}, content: decryptedContent, senderId: id })
// })
// .catch((err) => {
// console.log('decrypt err', err)
// })
// return
// }
this.messageSubject.next({
streamId: { type: messagePulsar.streamId, subtype: StreamsSubtype.METADATA_PULSAR },
content: messagePulsar.content,
senderId: id,
})
} catch (err) {
log.warn('Message from network decode error: ', err.message)
}
})
=======
if (this.pulsarOn) {
this.pulsarConnect(this.wg.id)
}
}
pulsarConnect(id: number) {
console.log('PULSSAAAAAAAAAAAAAAAAAAAAR ONNNNNNNNNNNNNNNNNNNNNNNNNNNNn')
this.pulsarService.sockets = this.wg.key
this.pulsarService.pulsarMessage$.subscribe((messagePulsar) => {
try {
// if (messagePulsar.streamId === MuteCoreStreams.DOCUMENT_CONTENT && environment.cryptography.type !== EncryptionType.NONE) {
// this.cryptoService.crypto
// .decrypt(messagePulsar.content)
// .then((decryptedContent) => {
// this.messageSubject.next({ streamId: messagePulsar.streamId, content: decryptedContent, senderId: id })
// })
// .catch((err) => {
// console.log('decrypt err', err)
// })
// return
// }
this.messageSubject.next({ streamId: messagePulsar.streamId, content: messagePulsar.content, senderId: id })
} catch (err) {
log.warn('Message from network decode error: ', err.message)
}
})
>>>>>>>
this.route.data.subscribe(({ doc }: { doc: Doc }) => {
console.log('Le doc au sein de network service : ', doc)
doc.onMetadataChanges
.pipe(
filter(({ isLocal, changedProperties }) => {
console.log(changedProperties.includes(Doc.PULSAR))
return changedProperties.includes(Doc.PULSAR)
})
)
.subscribe(() => {
console.log('Le doc au sein de network service : ', doc)
console.log('Le bool au sein de network service :', doc.pulsar)
this._pulsarOn = doc.pulsar || this._pulsarOn
if (this._pulsarOn) {
this.pulsarConnect(this.wg.id)
}
})
// console.log('Le doc au sein de network service : ', doc)
// this._pulsarOn = doc.pulsar
// console.log('Le bool au sein de network service :', this._pulsarOn)
// if (this._pulsarOn) {
// this.pulsarConnect(this.wg.id)
// }
})
}
pulsarConnect(id: number) {
console.log('PULSSAAAAAAAAAAAAAAAAAAAAR ONNNNNNNNNNNNNNNNNNNNNNNNNNNNn')
this.pulsarService.sockets = this.wg.key
this.pulsarService.pulsarMessage$.subscribe((messagePulsar) => {
try {
// if (messagePulsar.streamId === MuteCoreStreams.DOCUMENT_CONTENT && environment.cryptography.type !== EncryptionType.NONE) {
// this.cryptoService.crypto
// .decrypt(messagePulsar.content)
// .then((decryptedContent) => {
// console.log('DECRYPT PULSAR', decryptedContent)
// this.messageSubject.next({ streamId: {type : messagePulsar.streamId, subtype : StreamsSubtype.METADATA_PULSAR}, content: decryptedContent, senderId: id })
// })
// .catch((err) => {
// console.log('decrypt err', err)
// })
// return
// }
this.messageSubject.next({
streamId: { type: messagePulsar.streamId, subtype: StreamsSubtype.METADATA_PULSAR },
content: messagePulsar.content,
senderId: id,
})
} catch (err) {
log.warn('Message from network decode error: ', err.message)
}
})
<<<<<<<
send(streamId: StreamId, content: Uint8Array, id?: number): void {
if (this.members.length > 1) {
const msg = Message.create({ type: streamId.type, subtype: streamId.subtype, content })
if (id === undefined) {
this.wg.send(Message.encode(msg).finish())
} else {
id = id === 0 ? this.randomMember() : id
this.wg.sendTo(id, Message.encode(msg).finish())
}
=======
send(streamId: number, content: Uint8Array, id?: number): void {
if (this.members.length > 1) {
const msg = Message.create({ streamId, content })
if (id === undefined) {
this.wg.send(Message.encode(msg).finish())
} else {
id = id === 0 ? this.randomMember() : id
this.wg.sendTo(id, Message.encode(msg).finish())
}
>>>>>>>
send(streamId: StreamId, content: Uint8Array, id?: number): void {
if (this.members.length > 1) {
const msg = Message.create({ type: streamId.type, subtype: streamId.subtype, content })
if (id === undefined) {
this.wg.send(Message.encode(msg).finish())
} else {
id = id === 0 ? this.randomMember() : id
this.wg.sendTo(id, Message.encode(msg).finish())
}
<<<<<<<
console.log('DECRYPT', decryptedContent)
this.messageSubject.next({ streamId: { type, subtype }, content: decryptedContent, senderId: id })
=======
console.log('DECRYPT', decryptedContent)
this.messageSubject.next({ streamId, content: decryptedContent, senderId: id })
>>>>>>>
console.log('DECRYPT', decryptedContent)
this.messageSubject.next({ streamId: { type, subtype }, content: decryptedContent, senderId: id }) |
<<<<<<<
Document,
=======
DocumentNode,
FragmentDefinitionNode,
>>>>>>>
DocumentNode,
FragmentDefinitionNode,
<<<<<<<
=======
// This interface is deprecated because we no longer pass around fragments separately in the core.
export interface DeprecatedWatchQueryOptions extends ModifiableWatchQueryOptions {
/**
* A GraphQL document that consists of a single query to be sent down to the
* server.
*/
query: DocumentNode;
/**
* A list of fragments that are returned by {@link createFragment} which can be
* referenced from the query document.
*/
fragments?: FragmentDefinitionNode[];
/**
* Arbitrary metadata stored in Redux with this query. Designed for debugging,
* developer tools, etc.
*/
metadata?: any;
}
>>>>>>>
<<<<<<<
=======
fragments?: FragmentDefinitionNode[];
>>>>>>>
<<<<<<<
=======
fragments?: FragmentDefinitionNode[];
>>>>>>> |
<<<<<<<
function isStringValue(value: Value): value is StringValue {
=======
import isObject = require('lodash/isObject');
function isStringValue(value: ValueNode): value is StringValueNode {
>>>>>>>
function isStringValue(value: Value): value is StringValueNode { |
<<<<<<<
export function getMutationDefinition(doc: Document): OperationDefinition {
=======
import countBy = require('lodash/countBy');
import identity = require('lodash/identity');
import uniq = require('lodash/uniq');
export function getMutationDefinition(doc: DocumentNode): OperationDefinitionNode {
>>>>>>>
export function getMutationDefinition(doc: DocumentNode): OperationDefinitionNode {
<<<<<<<
=======
}
// Utility function that takes a list of fragment definitions and adds them to a particular
// document.
export function addFragmentsToDocument(queryDoc: DocumentNode,
fragments: FragmentDefinitionNode[]): DocumentNode {
if (!fragments) {
return queryDoc;
}
checkDocument(queryDoc);
return ({
...queryDoc,
definitions: uniq(queryDoc.definitions.concat(fragments)),
}) as DocumentNode;
>>>>>>> |
<<<<<<<
): NetworkInterface {
return new MockBatchedNetworkInterface(mockedResponses);
=======
): BatchedNetworkInterface {
return new MockBatchedNetworkInterface(...mockedResponses);
>>>>>>>
): BatchedNetworkInterface {
return new MockBatchedNetworkInterface(mockedResponses); |
<<<<<<<
import {
DataProxy,
} from '../data/proxy';
=======
import {
PureQueryOptions,
} from './types';
>>>>>>>
import {
DataProxy,
} from '../data/proxy';
import {
PureQueryOptions,
} from './types';
<<<<<<<
refetchQueries?: string[];
update?: (proxy: DataProxy, mutationResult: Object) => void;
=======
refetchQueries?: string[] | PureQueryOptions[];
>>>>>>>
refetchQueries?: string[] | PureQueryOptions[];
update?: (proxy: DataProxy, mutationResult: Object) => void; |
<<<<<<<
public watchQuery<T>(options: WatchQueryOptions): ObservableQuery<T> {
=======
public watchQuery<T, TVariables = OperationVariables>(
options: WatchQueryOptions<TVariables>,
): ObservableQuery<T> {
this.initQueryManager();
>>>>>>>
public watchQuery<T, TVariables = OperationVariables>(
options: WatchQueryOptions<TVariables>,
): ObservableQuery<T> {
<<<<<<<
public query<T>(options: QueryOptions): Promise<ApolloQueryResult<T>> {
=======
public query<T, TVariables = OperationVariables>(
options: QueryOptions<TVariables>,
): Promise<ApolloQueryResult<T>> {
this.initQueryManager();
>>>>>>>
public query<T, TVariables = OperationVariables>(
options: QueryOptions<TVariables>,
): Promise<ApolloQueryResult<T>> {
<<<<<<<
public mutate<T>(options: MutationOptions<T>): Promise<FetchResult<T>> {
=======
public mutate<T, TVariables = OperationVariables>(
options: MutationOptions<T, TVariables>,
): Promise<FetchResult<T>> {
this.initQueryManager();
>>>>>>>
public mutate<T, TVariables = OperationVariables>(
options: MutationOptions<T, TVariables>,
): Promise<FetchResult<T>> {
<<<<<<<
public subscribe<T = any>(options: SubscriptionOptions): Observable<T> {
return this.initQueryManager().startGraphQLSubscription(options);
=======
public subscribe<T = any, TVariables = OperationVariables>(
options: SubscriptionOptions<TVariables>,
): Observable<T> {
this.initQueryManager();
return this.queryManager.startGraphQLSubscription(options);
>>>>>>>
public subscribe<T = any, TVariables = OperationVariables>(
options: SubscriptionOptions<TVariables>,
): Observable<T> {
return this.initQueryManager().startGraphQLSubscription(options); |
<<<<<<<
let obs: Observable<FetchResult>;
let updatedContext = {};
const clientQuery = this.localState.clientQuery(document);
const serverQuery = this.localState.serverQuery(document);
if (serverQuery) {
const operation = this.buildOperationForLink(serverQuery, variables, {
...context,
forceFetch: !this.queryDeduplication,
});
updatedContext = operation.context;
obs = execute(this.deduplicator, operation);
} else {
updatedContext = this.prepareContext(context);
obs = Observable.of({ data: {} });
}
// Need to assign the reject function to the rejectFetchPromise variable
// in the outer scope so that we can refer to it in the .catch handler.
this.fetchQueryRejectFns.add((rejectFetchPromise = reject));
=======
this.fetchQueryRejectFns.set(`fetchRequest:${queryId}`, reject);
>>>>>>>
let obs: Observable<FetchResult>;
let updatedContext = {};
const clientQuery = this.localState.clientQuery(document);
const serverQuery = this.localState.serverQuery(document);
if (serverQuery) {
const operation = this.buildOperationForLink(serverQuery, variables, {
...context,
forceFetch: !this.queryDeduplication,
});
updatedContext = operation.context;
obs = execute(this.deduplicator, operation);
} else {
updatedContext = this.prepareContext(context);
obs = Observable.of({ data: {} });
}
this.fetchQueryRejectFns.set(`fetchRequest:${queryId}`, reject);
<<<<<<<
if (!handlingNext) {
this.fetchQueryRejectFns.delete(reject);
this.setQuery(queryId, ({ subscriptions }) => ({
subscriptions: subscriptions.filter(x => x !== subscription),
}));
resolve({
data: resultFromStore,
errors: errorsFromStore,
loading: false,
networkStatus: NetworkStatus.ready,
stale: false,
});
}
complete = true;
=======
this.fetchQueryRejectFns.delete(`fetchRequest:${queryId}`);
this.setQuery(queryId, ({ subscriptions }) => ({
subscriptions: subscriptions.filter(x => x !== subscription),
}));
resolve({
data: resultFromStore,
errors: errorsFromStore,
loading: false,
networkStatus: NetworkStatus.ready,
stale: false,
});
>>>>>>>
if (!handlingNext) {
this.fetchQueryRejectFns.delete(`fetchRequest:${queryId}`);
this.setQuery(queryId, ({ subscriptions }) => ({
subscriptions: subscriptions.filter(x => x !== subscription),
}));
resolve({
data: resultFromStore,
errors: errorsFromStore,
loading: false,
networkStatus: NetworkStatus.ready,
stale: false,
});
}
complete = true; |
<<<<<<<
=======
if (observer.next) {
if (this.isDifferentResult(lastResult, resultFromStore)) {
lastResult = resultFromStore;
observer.next(this.transformResult<T>(resultFromStore));
}
}
>>>>>>>
<<<<<<<
this.fetchQuery(queryId, options)
// `fetchQuery` returns a Promise. In case of a failure it should be caucht or else the
// console will show an `Uncaught (in promise)` message. Ignore the error for now.
.catch((error: Error) => undefined);
=======
// If the pollInterval is present, the scheduler has already taken care of firing the first
// fetch so we don't have to worry about it here.
if (!options.pollInterval) {
this.fetchQuery<T>(queryId, options);
}
>>>>>>>
this.fetchQuery<T>(queryId, options)
// `fetchQuery` returns a Promise. In case of a failure it should be caucht or else the
// console will show an `Uncaught (in promise)` message. Ignore the error for now.
.catch((error: Error) => undefined); |
<<<<<<<
declare module 'lodash.find' {
import main = require('~lodash/index');
export = main.find;
}
=======
declare module 'lodash.flatten' {
import main = require('~lodash/index');
export = main.flatten;
}
declare module 'lodash.pick' {
import main = require('~lodash/index');
export = main.pick;
}
>>>>>>>
declare module 'lodash.find' {
import main = require('~lodash/index');
export = main.find;
}
declare module 'lodash.flatten' {
import main = require('~lodash/index');
export = main.flatten;
}
declare module 'lodash.pick' {
import main = require('~lodash/index');
export = main.pick;
} |
<<<<<<<
describe('directives', () => {
it('should be able to send a query with a skip directive true', (done) => {
const query = gql`
query {
fortuneCookie @skip(if: true)
}`;
const result = {};
const networkInterface = mockNetworkInterface(
{
request: { query },
result: { data: result },
}
);
const client = new ApolloClient({
networkInterface,
});
client.query({ query }).then((actualResult) => {
assert.deepEqual(actualResult.data, result);
done();
});
});
it('should be able to send a query with a skip directive false', (done) => {
const query = gql`
query {
fortuneCookie @skip(if: false)
}`;
const result = {
fortuneCookie: 'result',
};
const networkInterface = mockNetworkInterface(
{
request: { query },
result: { data: result },
}
);
const client = new ApolloClient({
networkInterface,
});
client.query({ query }).then((actualResult) => {
assert.deepEqual(actualResult.data, result);
done();
});
});
it('should reject the query promise if skipped data arrives in the result', (done) => {
const query = gql`
query {
fortuneCookie @skip(if: true)
otherThing
}`;
const result = {
fortuneCookie: 'you will go far',
otherThing: 'false',
};
const networkInterface = mockNetworkInterface(
{
request: { query },
result: { data: result },
}
);
const client = new ApolloClient({
networkInterface,
});
// we need this so it doesn't print out a bunch of stuff we don't need
// when we're trying to test an exception.
client.store = createApolloStore({ reportCrashes: false });
client.queryManager = new QueryManager({
networkInterface,
store: client.store,
reduxRootKey: 'apollo',
});
client.query({ query }).then(() => {
// do nothing
}).catch((error) => {
assert.include(error.message, 'Found extra field');
done();
});
});
});
=======
it('should send operationName along with the query to the server', (done) => {
const query = gql`
query myQueryName {
fortuneCookie
}`;
const data = {
'fortuneCookie': 'The waiter spit in your food',
};
const networkInterface: NetworkInterface = {
query(request: Request): Promise<GraphQLResult> {
assert.equal(request.operationName, 'myQueryName');
return Promise.resolve({ data });
},
};
const client = new ApolloClient({
networkInterface,
});
client.query({ query }).then((actualResult) => {
assert.deepEqual(actualResult.data, data);
done();
});
});
it('should send operationName along with the mutation to the server', (done) => {
const mutation = gql`
mutation myMutationName {
fortuneCookie
}`;
const data = {
'fortuneCookie': 'The waiter spit in your food',
};
const networkInterface: NetworkInterface = {
query(request: Request): Promise<GraphQLResult> {
assert.equal(request.operationName, 'myMutationName');
return Promise.resolve({ data });
},
};
const client = new ApolloClient({
networkInterface,
});
client.mutate({ mutation }).then((actualResult) => {
assert.deepEqual(actualResult.data, data);
done();
});
});
>>>>>>>
describe('directives', () => {
it('should be able to send a query with a skip directive true', (done) => {
const query = gql`
query {
fortuneCookie @skip(if: true)
}`;
const result = {};
const networkInterface = mockNetworkInterface(
{
request: { query },
result: { data: result },
}
);
const client = new ApolloClient({
networkInterface,
});
client.query({ query }).then((actualResult) => {
assert.deepEqual(actualResult.data, result);
done();
});
});
it('should be able to send a query with a skip directive false', (done) => {
const query = gql`
query {
fortuneCookie @skip(if: false)
}`;
const result = {
fortuneCookie: 'result',
};
const networkInterface = mockNetworkInterface(
{
request: { query },
result: { data: result },
}
);
const client = new ApolloClient({
networkInterface,
});
client.query({ query }).then((actualResult) => {
assert.deepEqual(actualResult.data, result);
done();
});
});
it('should reject the query promise if skipped data arrives in the result', (done) => {
const query = gql`
query {
fortuneCookie @skip(if: true)
otherThing
}`;
const result = {
fortuneCookie: 'you will go far',
otherThing: 'false',
};
const networkInterface = mockNetworkInterface(
{
request: { query },
result: { data: result },
}
);
const client = new ApolloClient({
networkInterface,
});
// we need this so it doesn't print out a bunch of stuff we don't need
// when we're trying to test an exception.
client.store = createApolloStore({ reportCrashes: false });
client.queryManager = new QueryManager({
networkInterface,
store: client.store,
reduxRootKey: 'apollo',
});
client.query({ query }).then(() => {
// do nothing
}).catch((error) => {
assert.include(error.message, 'Found extra field');
done();
});
});
});
it('should send operationName along with the query to the server', (done) => {
const query = gql`
query myQueryName {
fortuneCookie
}`;
const data = {
'fortuneCookie': 'The waiter spit in your food',
};
const networkInterface: NetworkInterface = {
query(request: Request): Promise<GraphQLResult> {
assert.equal(request.operationName, 'myQueryName');
return Promise.resolve({ data });
},
};
const client = new ApolloClient({
networkInterface,
});
client.query({ query }).then((actualResult) => {
assert.deepEqual(actualResult.data, data);
done();
});
});
it('should send operationName along with the mutation to the server', (done) => {
const mutation = gql`
mutation myMutationName {
fortuneCookie
}`;
const data = {
'fortuneCookie': 'The waiter spit in your food',
};
const networkInterface: NetworkInterface = {
query(request: Request): Promise<GraphQLResult> {
assert.equal(request.operationName, 'myMutationName');
return Promise.resolve({ data });
},
};
const client = new ApolloClient({
networkInterface,
});
client.mutate({ mutation }).then((actualResult) => {
assert.deepEqual(actualResult.data, data);
done();
});
}); |
<<<<<<<
import { DataWrite } from '../src/actions';
=======
import {getOperationName} from '../src/queries/getFromAST';
>>>>>>>
import { DataWrite } from '../src/actions';
import {getOperationName} from '../src/queries/getFromAST';
<<<<<<<
assert.deepEqual<DataWrite[]>(writes, [
=======
const document1 = addTypenameToDocument(gql`{ a b c }`);
const document2 = addTypenameToDocument(gql`{ foo(id: $id) { d e bar { f g } } }`);
assert.deepEqual(writes, [
>>>>>>>
const document1 = addTypenameToDocument(gql`{ a b c }`);
const document2 = addTypenameToDocument(gql`{ foo(id: $id) { d e bar { f g } } }`);
assert.deepEqual<DataWrite[]>(writes, [ |
<<<<<<<
/**
* Something resembling the monadic fixpoint combinatior for Now.
*/
function mfixNow<M extends BehaviorObject, O>(
comp: (m: M) => Now<[M, O]>
): Now<[M, O]> {
return new MfixNow(comp);
}
export function isGeneratorFunction<A, T>(fn: any): fn is ((a: A) => Iterator<T>) {
return fn !== undefined
&& fn.constructor !== undefined
&& fn.constructor.name === "GeneratorFunction";
}
=======
>>>>>>>
export function isGeneratorFunction<A, T>(fn: any): fn is ((a: A) => Iterator<T>) {
return fn !== undefined
&& fn.constructor !== undefined
&& fn.constructor.name === "GeneratorFunction";
}
<<<<<<<
model: ((v: V) => Now<[M, O]>) | ((v: V) => Iterator<Now<[M,O]>>),
view: ((m: M) => Component<V>) | ((m: M) => Iterator<Component<V>>)
=======
model: (v: V) => Now<[M, O]>,
view: (m: M) => Component<V>,
toViewBehaviorNames?: string[]
>>>>>>>
model: ((v: V) => Now<[M, O]>) | ((v: V) => Iterator<Now<[M,O]>>),
view: ((m: M) => Component<V>) | ((m: M) => Iterator<Component<V>>),
toViewBehaviorNames?: string[]
<<<<<<<
const m = isGeneratorFunction(model) ? (v: V) => fgo(model)(v) : model;
const v = isGeneratorFunction(view) ? (m: M) => fgo(view)(m) : view;
return new Component<O>((parent: Node) => mfixNow<M, O>(
(bs) => v(bs).content(parent).chain(m)
=======
return new Component((parent: Node) => new MfixNow<M, O>(
(bs) => view(bs).content(parent).chain((v: V) => model(v)),
toViewBehaviorNames
>>>>>>>
const m = isGeneratorFunction(model) ? (v: V) => fgo(model)(v) : model;
const v = isGeneratorFunction(view) ? (m: M) => fgo(view)(m) : view;
return new Component<O>((parent: Node) => new MfixNow<M, O>(
(bs) => v(bs).content(parent).chain(m),
toViewBehaviorNames |
<<<<<<<
// either "nextinput" or "default"
// If nextinput, <Tab> after gi brings selects the next input
// If default, <Tab> selects the next selectable element, e.g. a link
"gistyle": "nextinput", // either "nextinput" or "default"
=======
"theme": "default", // currently available: "default", "dark"
"vimium-gi": true,
>>>>>>>
// either "nextinput" or "default"
// If nextinput, <Tab> after gi brings selects the next input
// If default, <Tab> selects the next selectable element, e.g. a link
"gistyle": "nextinput", // either "nextinput" or "default"
"theme": "default", // currently available: "default", "dark" |
<<<<<<<
*
* @param urlarr
* - if first word looks like it has a schema, treat as a URI
* - else if the first word contains a dot, treat as a domain name
* - else if the first word is a key of [[SEARCH_URLS]], treat all following terms as search parameters for that provider
* - else treat as search parameters for google
*
* Related settings:
* "searchengine": "google" or any of [[SEARCH_URLS]]
* Can only open about:* or file:* URLs if you have the native messenger installed, and on OSX you must set `browser` to something that will open Firefox from a terminal pass it commmand line options.
*
*/
=======
@param urlarr
- if first word looks like it has a schema, treat as a URI
- else if the first word contains a dot, treat as a domain name
- else if the first word is a key of [[SEARCH_URLS]], treat all following terms as search parameters for that provider
- else treat as search parameters for google
Related settings:
"searchengine": "google" or any of [[SEARCH_URLS]]
"historyresults": the n-most-recent results to ask Firefox for before they are sorted by frequency. Reduce this number if you find your results are bad.
*/
>>>>>>>
*
* @param urlarr
* - if first word looks like it has a schema, treat as a URI
* - else if the first word contains a dot, treat as a domain name
* - else if the first word is a key of [[SEARCH_URLS]], treat all following terms as search parameters for that provider
* - else treat as search parameters for google
*
* Related settings:
* "searchengine": "google" or any of [[SEARCH_URLS]]
* "historyresults": the n-most-recent results to ask Firefox for before they are sorted by frequency. Reduce this number if you find your results are bad.
* Can only open about:* or file:* URLs if you have the native messenger installed, and on OSX you must set `browser` to something that will open Firefox from a terminal pass it commmand line options.
*
*/ |
<<<<<<<
export interface SelectMenuProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {
initialTab?: string
}
export interface SelectMenuModalProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {
title?: string
}
export interface SelectMenuListProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {}
export interface SelectMenuItemProps extends CommonProps,
Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, 'color'> {
selected?: boolean
}
export interface SelectMenuFooterProps extends CommonProps, Omit<React.HTMLAttributes<HTMLElement>, 'color'> {}
export interface SelectMenuDividerProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {}
export interface SelectMenuFilterProps extends TextInputProps {
autofocus?: boolean
}
export interface SelectMenuTabsProps extends CommonProps,
Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'color'> {
tabs: string[]
}
export interface SelectMenuTabPanelProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {
tabName: string
}
export interface LoadingOctofaceProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {}
export const SelectMenu: React.FunctionComponent<SelectMenuProps> & {
ContextProvider: React.FunctionComponent<{
value: {
selectedTab: string | undefined
setSelectedTab: (selectedTab: string | undefined) => void
filterText: string | undefined
setFilterText: (filterText: string | undefined) => void
}
}>
Divider: React.FunctionComponent<SelectMenuDividerProps>
Filter: React.FunctionComponent<SelectMenuFilterProps>
Footer: React.FunctionComponent<SelectMenuFooterProps>
List: React.FunctionComponent<SelectMenuListProps>
Item: React.FunctionComponent<SelectMenuItemProps>
Modal: React.FunctionComponent<SelectMenuModalProps>
Tabs: React.FunctionComponent<SelectMenuTabsProps>
TabPanel: React.FunctionComponent<SelectMenuTabPanelProps>
}
export const LoadingOctoface: React.FunctionComponent<LoadingOctofaceProps>
=======
export interface SideNavProps extends CommonProps, BorderProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {
bordered?: boolean
variant?: 'normal' | 'lightweight'
}
export interface SideNavLinkProps
extends CommonProps,
TypographyProps,
LinkProps,
Omit<React.HTMLAttributes<HTMLAnchorElement>, 'color'> {
variant?: 'normal' | 'full'
}
export const SideNav: React.FunctionComponent<SideNavProps> & {
Link: React.FunctionComponent<SideNavLinkProps>
}
>>>>>>>
export interface SelectMenuProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {
initialTab?: string
}
export interface SelectMenuModalProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {
title?: string
}
export interface SelectMenuListProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {}
export interface SelectMenuItemProps extends CommonProps,
Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, 'color'> {
selected?: boolean
}
export interface SelectMenuFooterProps extends CommonProps, Omit<React.HTMLAttributes<HTMLElement>, 'color'> {}
export interface SelectMenuDividerProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {}
export interface SelectMenuFilterProps extends TextInputProps {
autofocus?: boolean
}
export interface SelectMenuTabsProps extends CommonProps,
Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'color'> {
tabs: string[]
}
export interface SelectMenuTabPanelProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {
tabName: string
}
export const SelectMenu: React.FunctionComponent<SelectMenuProps> & {
ContextProvider: React.FunctionComponent<{
value: {
selectedTab: string | undefined
setSelectedTab: (selectedTab: string | undefined) => void
filterText: string | undefined
setFilterText: (filterText: string | undefined) => void
}
}>
Divider: React.FunctionComponent<SelectMenuDividerProps>
Filter: React.FunctionComponent<SelectMenuFilterProps>
Footer: React.FunctionComponent<SelectMenuFooterProps>
List: React.FunctionComponent<SelectMenuListProps>
Item: React.FunctionComponent<SelectMenuItemProps>
Modal: React.FunctionComponent<SelectMenuModalProps>
Tabs: React.FunctionComponent<SelectMenuTabsProps>
TabPanel: React.FunctionComponent<SelectMenuTabPanelProps>
}
export interface LoadingOctofaceProps extends CommonProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {}
export const LoadingOctoface: React.FunctionComponent<LoadingOctofaceProps>
export interface SideNavProps extends CommonProps, BorderProps, Omit<React.HTMLAttributes<HTMLDivElement>, 'color'> {
bordered?: boolean
variant?: 'normal' | 'lightweight'
}
export interface SideNavLinkProps
extends CommonProps,
TypographyProps,
LinkProps,
Omit<React.HTMLAttributes<HTMLAnchorElement>, 'color'> {
variant?: 'normal' | 'full'
}
export const SideNav: React.FunctionComponent<SideNavProps> & {
Link: React.FunctionComponent<SideNavLinkProps>
}
<<<<<<<
}
declare module '@primer/components/src/LoadingOctoface' {
import {LoadingOctoface} from '@primer/components'
export default LoadingOctoface
}
=======
}
declare module '@primer/components/src/Breadcrumbs' {
import {Breadcrumb} from '@primer/components'
export default Breadcrumb
}
>>>>>>>
}
declare module '@primer/components/src/LoadingOctoface' {
import {LoadingOctoface} from '@primer/components'
export default LoadingOctoface
}
declare module '@primer/components/src/Breadcrumbs' {
import {Breadcrumb} from '@primer/components'
export default Breadcrumb
} |
<<<<<<<
export const ButtonTableList: React.FunctionComponent<ButtonTableListProps>
=======
export const ButtonGroup: React.FunctionComponent<BoxProps>
>>>>>>>
export const ButtonTableList: React.FunctionComponent<ButtonTableListProps>
export const ButtonGroup: React.FunctionComponent<BoxProps>
<<<<<<<
declare module '@primer/components/src/ButtonTableList' {
import {ButtonTableList} from '@primer/components'
export default ButtonTableList
}
=======
declare module '@primer/components/src/ButtonGroup' {
import {ButtonGroup} from '@primer/components'
export default ButtonGroup
}
>>>>>>>
declare module '@primer/components/src/ButtonTableList' {
import {ButtonTableList} from '@primer/components'
export default ButtonTableList
declare module '@primer/components/src/ButtonGroup' {
import {ButtonGroup} from '@primer/components'
export default ButtonGroup
} |
<<<<<<<
export interface Configuration {
willSaveTextDocumentWaitUntilRequest?: boolean | ((textDocument: TextDocument) => boolean);
}
=======
export enum RevealOutputChannelOn {
Info = 1,
Warn = 2,
Error = 3,
Never = 4
}
>>>>>>>
export interface Configuration {
willSaveTextDocumentWaitUntilRequest?: boolean | ((textDocument: TextDocument) => boolean);
}
export enum RevealOutputChannelOn {
Info = 1,
Warn = 2,
Error = 3,
Never = 4
}
<<<<<<<
this._configuration = clientOptions.configuration || {};
=======
this._clientOptions.revealOutputChannelOn == this._clientOptions.revealOutputChannelOn || RevealOutputChannelOn.Error;
>>>>>>>
this._configuration = clientOptions.configuration || {};
this._clientOptions.revealOutputChannelOn == this._clientOptions.revealOutputChannelOn || RevealOutputChannelOn.Error; |
<<<<<<<
import * as progress from './protocol.progress.proposed';
=======
import * as sr from './protocol.selectionRange.proposed';
>>>>>>>
import * as progress from './protocol.progress.proposed';
import * as sr from './protocol.selectionRange.proposed'; |
<<<<<<<
import { WindowProgressFeature } from './progress.proposed';
=======
import { CallHierarchyFeature } from './callHierarchy.proposed';
>>>>>>>
import { WindowProgressFeature } from './progress.proposed';
import { CallHierarchyFeature } from './callHierarchy.proposed';
<<<<<<<
new SelectionRangeFeature(client),
new WindowProgressFeature(client)
=======
new SelectionRangeFeature(client),
new CallHierarchyFeature(client)
>>>>>>>
new SelectionRangeFeature(client),
new WindowProgressFeature(client)
new CallHierarchyFeature(client) |
<<<<<<<
import { Base64ImageComponent } from './base64-image/base64-image.component';
import { CustomMarkdownComponent } from './custom-markdown/custom-markdown.component';
=======
import { PlotlyComponent } from './plotly/plotly.component';
>>>>>>>
import { PlotlyComponent } from './plotly/plotly.component';
import { Base64ImageComponent } from './base64-image/base64-image.component';
import { CustomMarkdownComponent } from './custom-markdown/custom-markdown.component';
<<<<<<<
VDOMComponent,
Base64ImageComponent,
CustomMarkdownComponent
=======
PlotlyComponent,
VDOMComponent
>>>>>>>
VDOMComponent,
Base64ImageComponent,
CustomMarkdownComponent,
PlotlyComponent |
<<<<<<<
if (index > -1) {
this.lastDeletedCard = this.cards[index];
this.cards.splice(index, 1);
}
=======
if (index > -1 && index < this.cards.length) { this.cards.splice(index, 1); }
>>>>>>>
if (index > -1 && index < this.cards.length) {
this.lastDeletedCard = this.cards[index];
this.cards.splice(index, 1);
} |
<<<<<<<
import { HighlightPipe } from './classes/highlight.pipe';
import { AnsiColorizePipe } from './classes/ansi-colorize.pipe';
import { RunScriptsDirective } from './classes/run-scripts.directive';
=======
import {PreviewPipe} from "./classes/preview.pipe";
>>>>>>>
import { HighlightPipe } from './classes/highlight.pipe';
import { AnsiColorizePipe } from './classes/ansi-colorize.pipe';
import { RunScriptsDirective } from './classes/run-scripts.directive';
import {PreviewPipe} from "./classes/preview.pipe";
<<<<<<<
CardComponent,
HighlightPipe,
AnsiColorizePipe,
RunScriptsDirective
=======
CardComponent,
PreviewPipe
>>>>>>>
CardComponent,
HighlightPipe,
AnsiColorizePipe,
RunScriptsDirective,
PreviewPipe |
<<<<<<<
import { entityFactory } from '../helpers/entity-factory';
import { cfUserSchemaKey } from '../helpers/entity-factory';
=======
import { UserSchema } from '../types/user.types';
import { OrgUserRoles } from '../../features/cloud-foundry/cf.helpers';
>>>>>>>
import { entityFactory } from '../helpers/entity-factory';
import { cfUserSchemaKey } from '../helpers/entity-factory';
import { OrgUserRoles } from '../../features/cloud-foundry/cf.helpers';
<<<<<<<
=======
export const REMOVE_PERMISSION = '[Users] Remove Permission';
export const REMOVE_PERMISSION_SUCCESS = '[Users] Remove Permission success';
export const REMOVE_PERMISSION_FAILED = '[Users] Remove Permission failed';
>>>>>>>
export const REMOVE_PERMISSION = '[Users] Remove Permission';
export const REMOVE_PERMISSION_SUCCESS = '[Users] Remove Permission success';
export const REMOVE_PERMISSION_FAILED = '[Users] Remove Permission failed'; |
<<<<<<<
import { CreateNewApplication } from '../../../../store/actions/application.actions';
import { GetOrganisation } from '../../../../store/actions/organisation.actions';
=======
import { AssociateRouteWithAppApplication, CreateNewApplication } from '../../../../store/actions/application.actions';
import { GetOrganization } from '../../../../store/actions/organization.actions';
>>>>>>>
import { CreateNewApplication } from '../../../../store/actions/application.actions';
import { GetOrganisation } from '../../../../store/actions/organisation.actions';
import { GetOrganization } from '../../../../store/actions/organization.actions'; |
<<<<<<<
=======
import { combineLatest } from 'rxjs/observable/combineLatest';
import { map } from 'rxjs/operators';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { combineAll } from 'rxjs/operator/combineAll';
>>>>>>> |
<<<<<<<
import { combineLatest } from 'rxjs/observable/combineLatest';
import { distinctUntilChanged, filter, map, pairwise } from 'rxjs/operators';
=======
import { combineLatest } from 'rxjs/observable/combineLatest';
import { map, pairwise, tap } from 'rxjs/operators';
>>>>>>>
import { combineLatest } from 'rxjs/observable/combineLatest';
import { distinctUntilChanged, filter, map, pairwise, tap } from 'rxjs/operators';
<<<<<<<
=======
import { combineAll } from 'rxjs/operator/combineAll';
>>>>>>> |
<<<<<<<
import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog.service';
=======
import { IApp } from '../../../../../../core/src/core/cf-api.types';
>>>>>>>
<<<<<<<
import { IApp } from '../../../../cf-api.types';
import { appStatsEntityType } from '../../../../cf-entity-types';
import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
=======
import { cfEntityCatalog } from '../../../../cf-entity-catalog';
>>>>>>>
import { IApp } from '../../../../cf-api.types';
import { cfEntityCatalog } from '../../../../cf-entity-catalog'; |
<<<<<<<
import { entityCatalogue } from '../../../core/entity-catalogue/entity-catalogue.service';
import { getIdFromRoute } from '../../../core/utils.service';
=======
import { getIdFromRoute } from '../../../../../cloud-foundry/src/features/cloud-foundry/cf.helpers';
import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
>>>>>>>
import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog.service';
import { getIdFromRoute } from '../../../core/utils.service'; |
<<<<<<<
import { IntroScreenComponent } from './components/intro-screen/intro-screen.component';
=======
import { GithubCommitAuthorComponent } from './components/github-commit-author/github-commit-author.component';
import { IntroScreenComponent } from './components/intro-screen/intro-screen.component';
>>>>>>>
import { GithubCommitAuthorComponent } from './components/github-commit-author/github-commit-author.component';
import { IntroScreenComponent } from './components/intro-screen/intro-screen.component';
<<<<<<<
import { TableComponent } from './components/list/list-table/table.component';
import { TableCellSelectOrgComponent } from './components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component';
=======
>>>>>>>
import { TableComponent } from './components/list/list-table/table.component';
import { TableCellSelectOrgComponent } from './components/list/list-types/cf-users-org-space-roles/table-cell-select-org/table-cell-select-org.component';
<<<<<<<
CfRoleCheckboxComponent,
EnumerateComponent,
UserProfileBannerComponent,
=======
GithubCommitAuthorComponent,
UserProfileBannerComponent,
>>>>>>>
CfRoleCheckboxComponent,
EnumerateComponent,
GithubCommitAuthorComponent,
UserProfileBannerComponent,
<<<<<<<
CliCommandComponent,
CfRoleCheckboxComponent,
EnumerateComponent,
=======
CliCommandComponent,
GithubCommitAuthorComponent,
>>>>>>>
CliCommandComponent,
CfRoleCheckboxComponent,
EnumerateComponent,
GithubCommitAuthorComponent, |
<<<<<<<
import { browser, promise } from 'protractor';
=======
import { browser, protractor } from 'protractor';
>>>>>>>
import { browser, promise, protractor } from 'protractor';
<<<<<<<
import { E2E, e2e } from '../e2e';
import { CFHelpers } from '../helpers/cf-helpers';
=======
import { e2e } from '../e2e';
import { CFHelpers } from '../helpers/cf-helpers';
>>>>>>>
import { e2e } from '../e2e';
import { CFHelpers } from '../helpers/cf-helpers';
<<<<<<<
=======
const until = protractor.ExpectedConditions;
>>>>>>>
const until = protractor.ExpectedConditions;
<<<<<<<
browser.wait(ApplicationSummary.detect()
.then(appSummary => {
appSummary.waitForPage();
appSummary.header.waitForTitleText(appName);
return appSummary.cfGuid;
})
.then(cfGuid => applicationE2eHelper.deleteApplication(null, { appName })));
=======
ApplicationSummary.detect().then(appSummary => {
appSummary.waitForPage();
browser.wait(until.presenceOf(appSummary.header.getTitle()), 5000);
expect(appSummary.getAppName()).toBe('cf-quick-app');
applicationE2eHelper.cfHelper.deleteApp(appSummary.cfGuid, appSummary.appGuid);
});
>>>>>>>
browser.wait(ApplicationSummary.detect()
.then(appSummary => {
appSummary.waitForPage();
appSummary.header.waitForTitleText(appName);
return appSummary.cfGuid;
})
.then(cfGuid => applicationE2eHelper.deleteApplication(null, { appName }))); |
<<<<<<<
import {
SuccessfulApiResponseDataMapper,
PreApiRequest,
PrePaginationApiRequest
} from '../../../../store/src/entity-request-pipeline/entity-request-pipeline.types';
import {
PaginationPageIteratorConfig
} from '../../../../store/src/entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe';
=======
import { Omit } from '../utils.service';
>>>>>>>
import {
SuccessfulApiResponseDataMapper,
PreApiRequest,
PrePaginationApiRequest
} from '../../../../store/src/entity-request-pipeline/entity-request-pipeline.types';
import {
PaginationPageIteratorConfig
} from '../../../../store/src/entity-request-pipeline/pagination-request-base-handlers/pagination-iterator.pipe';
import { Omit } from '../utils.service'; |
<<<<<<<
import { currentUserRolesReducer } from './reducers/current-user-roles-reducer/current-user-roles.reducer';
=======
import { createServiceInstanceReducer } from './reducers/create-service-instance.reducer';
>>>>>>>
import { createServiceInstanceReducer } from './reducers/create-service-instance.reducer';
import { currentUserRolesReducer } from './reducers/current-user-roles-reducer/current-user-roles.reducer'; |
<<<<<<<
this.appEdits = {
name: '',
instances: 0,
memory: 0,
enable_ssh: false
};
this.summaryDataChanging$ = this.applicationService.isFetchingApp$
=======
this.summaryDataChanging$ = this.applicationService.app$
>>>>>>>
this.summaryDataChanging$ = this.applicationService.isFetchingApp$ |
<<<<<<<
import {
getTabsFromExtensions,
StratosTabType,
StratosActionMetadata,
getActionsFromExtensions,
StratosActionType
} from '../../../../../../core/extension/extension-service';
import { IPageSideNavTab } from '../../../../../dashboard/page-side-nav/page-side-nav.component';
=======
>>>>>>>
import { IPageSideNavTab } from '../../../../../dashboard/page-side-nav/page-side-nav.component'; |
<<<<<<<
import { entityFactory, serviceSchemaKey, servicePlanVisibilitySchemaKey, serviceBrokerSchemaKey } from '../../store/helpers/entity-factory';
=======
import { entityFactory, serviceSchemaKey, servicePlanVisibilitySchemaKey, organizationSchemaKey } from '../../store/helpers/entity-factory';
>>>>>>>
import { entityFactory, serviceSchemaKey, servicePlanVisibilitySchemaKey, serviceBrokerSchemaKey } from '../../store/helpers/entity-factory';
<<<<<<<
import { filter, map, tap, publish, refCount, publishReplay, first, combineLatest, switchMap } from 'rxjs/operators';
=======
import { filter, map, tap, publish, refCount, publishReplay, first, combineLatest, share, switchMap } from 'rxjs/operators';
>>>>>>>
import { filter, map, tap, publish, refCount, publishReplay, first, combineLatest, switchMap } from 'rxjs/operators';
<<<<<<<
import { GetServiceBrokers } from '../../store/actions/service-broker.actions';
export interface ServicePlanAccessibility {
spaceScoped?: boolean;
hasVisibilities?: boolean;
isPublic: boolean;
}
=======
import { selectCreateServiceInstanceServicePlan } from '../../store/selectors/create-service-instance.selectors';
import { CloudFoundryEndpointService } from '../cloud-foundry/services/cloud-foundry-endpoint.service';
import { IOrganization } from '../../core/cf-api.types';
>>>>>>>
import { GetServiceBrokers } from '../../store/actions/service-broker.actions';
export interface ServicePlanAccessibility {
spaceScoped?: boolean;
hasVisibilities?: boolean;
isPublic: boolean;
}
<<<<<<<
return this.service$.pipe(
switchMap(o => this.getServiceBrokerById(o.entity.service_broker_guid)),
combineLatest(this.servicePlanVisibilities$),
filter(([p, q]) => !!p && !!q),
map(([serviceBroker, allServicePlanVisibilities]) => {
if (serviceBroker.entity.space_guid) {
return {
isPublic: false,
spaceScoped: true
};
} else {
const servicePlanVisibilities = allServicePlanVisibilities.filter(
s => s.entity.service_plan_guid === servicePlan.metadata.guid
);
if (servicePlanVisibilities.length > 0) {
return {
isPublic: false,
spaceScoped: false,
hasVisibilities: true
};
}
}
})
);
}
=======
getServicePlanByGuid = (servicePlanGuid: string) => {
return this.servicePlans$.pipe(
filter(p => !!p),
map(servicePlans => servicePlans.filter(o => o.metadata.guid === servicePlanGuid)),
map(o => o[0])
);
}
getSelectedServicePlan = (): Observable<APIResource<IServicePlan>> => {
return Observable.combineLatest(this.store.select(selectCreateServiceInstanceServicePlan), this.servicePlans$)
.pipe(
filter(([p, q]) => !!p && !!q),
map(([servicePlanGuid, servicePlans]) => servicePlans.filter(o => o.metadata.guid === servicePlanGuid)),
map(p => p[0]),
filter(p => !!p)
);
}
getOrgsForSelectedServicePlan = (): Observable<APIResource<IOrganization>[]> => {
return this.getSelectedServicePlan()
.pipe(
switchMap(servicePlan => {
if (servicePlan.entity.public) {
const getAllOrgsAction = CloudFoundryEndpointService.createGetAllOrganizationsLimitedSchema(this.cfGuid);
return getPaginationObservables<APIResource<IOrganization>>({
store: this.store,
action: getAllOrgsAction,
paginationMonitor: this.paginationMonitorFactory.create(
getAllOrgsAction.paginationKey,
entityFactory(organizationSchemaKey)
)
}, true)
.entities$.pipe(
share(),
first()
);
} else {
// Service plan is not public, fetch visibilities
return this.getServicePlanVisibilitiesForPlan(servicePlan.metadata.guid)
.pipe(
map(s => s.map(o => o.entity.organization)),
share(),
first()
);
}
})
);
}
>>>>>>>
return this.service$.pipe(
switchMap(o => this.getServiceBrokerById(o.entity.service_broker_guid)),
combineLatest(this.servicePlanVisibilities$),
filter(([p, q]) => !!p && !!q),
map(([serviceBroker, allServicePlanVisibilities]) => {
if (serviceBroker.entity.space_guid) {
return {
isPublic: false,
spaceScoped: true
};
} else {
const servicePlanVisibilities = allServicePlanVisibilities.filter(
s => s.entity.service_plan_guid === servicePlan.metadata.guid
);
if (servicePlanVisibilities.length > 0) {
return {
isPublic: false,
spaceScoped: false,
hasVisibilities: true
};
}
}
})
);
}
getSelectedServicePlan = (): Observable<APIResource<IServicePlan>> => {
return Observable.combineLatest(this.store.select(selectCreateServiceInstanceServicePlan), this.servicePlans$)
.pipe(
filter(([p, q]) => !!p && !!q),
map(([servicePlanGuid, servicePlans]) => servicePlans.filter(o => o.metadata.guid === servicePlanGuid)),
map(p => p[0]),
filter(p => !!p)
);
}
getOrgsForSelectedServicePlan = (): Observable<APIResource<IOrganization>[]> => {
return this.getSelectedServicePlan()
.pipe(
switchMap(servicePlan => {
if (servicePlan.entity.public) {
const getAllOrgsAction = CloudFoundryEndpointService.createGetAllOrganizationsLimitedSchema(this.cfGuid);
return getPaginationObservables<APIResource<IOrganization>>({
store: this.store,
action: getAllOrgsAction,
paginationMonitor: this.paginationMonitorFactory.create(
getAllOrgsAction.paginationKey,
entityFactory(organizationSchemaKey)
)
}, true)
.entities$.pipe(
share(),
first()
);
} else {
// Service plan is not public, fetch visibilities
return this.getServicePlanVisibilitiesForPlan(servicePlan.metadata.guid)
.pipe(
map(s => s.map(o => o.entity.organization)),
share(),
first()
);
}
})
);
} |
<<<<<<<
import { APIResource, CFResponse } from '../../frontend/app/store/types/api.types';
import { CfUser } from '../../frontend/app/store/types/user.types';
import { e2e, E2ESetup } from '../e2e';
=======
import { IOrganization, IRoute } from '../../frontend/app/core/cf-api.types';
import { APIResource } from '../../frontend/app/store/types/api.types';
import { e2e, E2ESetup } from '../e2e';
>>>>>>>
import { IOrganization, IRoute, ISpace } from '../../frontend/app/core/cf-api.types';
import { APIResource, CFResponse } from '../../frontend/app/store/types/api.types';
import { CfUser } from '../../frontend/app/store/types/user.types';
import { e2e, E2ESetup } from '../e2e';
<<<<<<<
import { CFRequestHelpers } from './cf-request-helpers';
import { IOrganization, ISpace } from '../../frontend/app/core/cf-api.types';
=======
import { CFRequestHelpers } from './cf-request-helpers';
>>>>>>>
import { CFRequestHelpers } from './cf-request-helpers';
<<<<<<<
private assignAdminAndUserGuids(cnsiGuid: string, endpoint: E2EConfigCloudFoundry): promise.Promise<any> {
if (endpoint.creds.admin.guid && endpoint.creds.nonAdmin.guid) {
return promise.fullyResolved({});
}
return this.fetchUsers(cnsiGuid).then(users => {
const testUser = this.findUser(users, endpoint.creds.nonAdmin.username);
const testAdminUser = this.findUser(users, endpoint.creds.admin.username);
=======
addOrgIfMissingForEndpointUsers(
guid: string,
endpoint: E2EConfigCloudFoundry,
testOrgName: string
): promise.Promise<APIResource<IOrganization>> {
let testAdminUser, testUser;
return this.fetchUsers(guid).then(users => {
testUser = this.findUser(users, endpoint.creds.nonAdmin.username);
testAdminUser = this.findUser(users, endpoint.creds.admin.username);
>>>>>>>
private assignAdminAndUserGuids(cnsiGuid: string, endpoint: E2EConfigCloudFoundry): promise.Promise<any> {
if (endpoint.creds.admin.guid && endpoint.creds.nonAdmin.guid) {
return promise.fullyResolved({});
}
return this.fetchUsers(cnsiGuid).then(users => {
const testUser = this.findUser(users, endpoint.creds.nonAdmin.username);
const testAdminUser = this.findUser(users, endpoint.creds.admin.username);
<<<<<<<
addOrgIfMissing(cnsiGuid, orgName, adminGuid, userGuid): promise.Promise<APIResource<IOrganization>> {
=======
addOrgIfMissing(cnsiGuid, orgName, adminGuid?: string, userGuid?: string): promise.Promise<APIResource<IOrganization>> {
>>>>>>>
addOrgIfMissing(cnsiGuid, orgName, adminGuid, userGuid): promise.Promise<APIResource<IOrganization>> {
<<<<<<<
// const org = newOrg.resources ? newOrg.resources[0] as any : newOrg;
const orgGuid = newOrg.metadata.guid;
=======
const orgGuid = newOrg.metadata.guid;
>>>>>>>
const orgGuid = newOrg.metadata.guid;
<<<<<<<
fetchOrg(cnsiGuid: string, orgName: string): promise.Promise<APIResource<any>> {
return this.cfRequestHelper.sendCfGet(cnsiGuid, 'organizations?q=name IN ' + orgName).then(json => {
if (json.total_results > 0) {
const org = json.resources[0];
return org;
}
return null;
}).catch(err => {
e2e.log(`Failed to fetch organisation with name '${orgName}' from endpoint ${cnsiGuid}`);
throw new Error(err);
});
}
fetchSpace(cnsiGuid: string, spaceName: string) {
return this.cfRequestHelper.sendCfGet(cnsiGuid, 'spaces?q=name IN ' + spaceName).then(json => {
=======
fetchOrg(cnsiGuid: string, orgName: string): promise.Promise<APIResource<any>> {
return this.cfRequestHelper.sendCfGet(cnsiGuid, 'organizations?q=name IN ' + orgName).then(json => {
if (json.total_results > 0) {
const org = json.resources[0];
return org;
}
return null;
}).catch(err => {
e2e.log(`Failed to fetch organisation with name '${orgName}' from endpoint ${cnsiGuid}`);
throw new Error(err);
});
}
fetchSpace(cnsiGuid: string, orgGuid: string, spaceName: string) {
return this.cfRequestHelper.sendCfGet(cnsiGuid, 'spaces?q=name IN ' + spaceName + '&organization_guid=' + orgGuid).then(json => {
>>>>>>>
fetchOrg(cnsiGuid: string, orgName: string): promise.Promise<APIResource<any>> {
return this.cfRequestHelper.sendCfGet(cnsiGuid, 'organizations?q=name IN ' + orgName).then(json => {
if (json.total_results > 0) {
const org = json.resources[0];
return org;
}
return null;
}).catch(err => {
e2e.log(`Failed to fetch organisation with name '${orgName}' from endpoint ${cnsiGuid}`);
throw new Error(err);
});
}
fetchSpace(cnsiGuid: string, orgGuid: string, spaceName: string) {
return this.cfRequestHelper.sendCfGet(cnsiGuid, 'spaces?q=name IN ' + spaceName + '&organization_guid=' + orgGuid).then(json => {
<<<<<<<
fetchAppsCountInSpace(cnsiGuid: string, spaceGuid: string) {
return this.cfRequestHelper.sendCfGet(cnsiGuid, `spaces/${spaceGuid}/apps`).then(json => {
return json.total_results;
});
}
createApp(cnsiGuid: string, spaceGuid: string, appName: string) {
=======
fetchAppsCountInSpace(cnsiGuid: string, spaceGuid: string) {
console.log(cnsiGuid, spaceGuid);
return this.cfRequestHelper.sendCfGet(cnsiGuid, `spaces/${spaceGuid}/apps`).then(json => {
console.log(json.total_results);
return json.total_results;
});
}
// For fully fleshed out fetch see application-e2e-helpers
baseFetchApp(cnsiGuid: string, spaceGuid: string, appName: string) {
return this.cfRequestHelper.sendCfGet(cnsiGuid,
`apps?inline-relations-depth=1&include-relations=routes,service_bindings&q=name IN ${appName},space_guid IN ${spaceGuid}`);
}
// For fully fleshed our create see application-e2e-helpers
baseCreateApp(cnsiGuid: string, spaceGuid: string, appName: string) {
>>>>>>>
fetchAppsCountInSpace(cnsiGuid: string, spaceGuid: string) {
return this.cfRequestHelper.sendCfGet(cnsiGuid, `spaces/${spaceGuid}/apps`).then(json => {
return json.total_results;
});
}
// For fully fleshed out fetch see application-e2e-helpers
baseFetchApp(cnsiGuid: string, spaceGuid: string, appName: string) {
return this.cfRequestHelper.sendCfGet(cnsiGuid,
`apps?inline-relations-depth=1&include-relations=routes,service_bindings&q=name IN ${appName},space_guid IN ${spaceGuid}`);
}
// For fully fleshed our create see application-e2e-helpers
baseCreateApp(cnsiGuid: string, spaceGuid: string, appName: string) { |
<<<<<<<
=======
import { IServiceBroker, IServicePlan } from '../../../../../core/src/core/cf-api-svc.types';
>>>>>>>
<<<<<<<
import { IServiceBroker, IServicePlan } from '../../../cf-api-svc.types';
=======
import { cfEntityCatalog } from '../../../cf-entity-catalog';
>>>>>>>
import { IServiceBroker, IServicePlan } from '../../../cf-api-svc.types';
import { cfEntityCatalog } from '../../../cf-entity-catalog'; |
<<<<<<<
import { UsageGaugeComponent } from './components/usage-gauge/usage-gauge.component';
import { PercentagePipe } from './pipes/percentage.pipe';
import { TableCellUsageComponent } from './components/table/custom-cells/table-cell-usage/table-cell-usage.component';
=======
import { CardAppStatusComponent } from './components/cards/custom-cards/card-app-status/card-app-status.component';
import { CardAppInstancesComponent } from './components/cards/custom-cards/card-app-instances/card-app-instances.component';
>>>>>>>
import { CardAppStatusComponent } from './components/cards/custom-cards/card-app-status/card-app-status.component';
import { CardAppInstancesComponent } from './components/cards/custom-cards/card-app-instances/card-app-instances.component';
import { UsageGaugeComponent } from './components/usage-gauge/usage-gauge.component';
import { PercentagePipe } from './pipes/percentage.pipe';
import { TableCellUsageComponent } from './components/table/custom-cells/table-cell-usage/table-cell-usage.component';
<<<<<<<
UsageGaugeComponent,
TableCellUsageComponent,
=======
CardAppStatusComponent,
CardAppInstancesComponent,
>>>>>>>
CardAppStatusComponent,
CardAppInstancesComponent,
UsageGaugeComponent,
TableCellUsageComponent,
<<<<<<<
UsageGaugeComponent,
TableCellUsageComponent,
=======
CardAppStatusComponent,
CardAppInstancesComponent,
>>>>>>>
CardAppStatusComponent,
CardAppInstancesComponent,
UsageGaugeComponent,
TableCellUsageComponent, |
<<<<<<<
import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
import { EntityInfo } from '../../../../../../../store/src/types/api.types';
=======
import { AppState } from '../../../../../../../store/src/app-state';
import { APIResource } from '../../../../../../../store/src/types/api.types';
>>>>>>>
import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
import { APIResource } from '../../../../../../../store/src/types/api.types'; |
<<<<<<<
import { BaseCF } from '../cf-page.types';
=======
import { ActiveRouteCfOrgSpace } from '../cf-page.types';
import { IOrganization, ISpace, IApp } from '../../../core/cf-api.types';
>>>>>>>
import { ActiveRouteCfOrgSpace } from '../cf-page.types';
<<<<<<<
this.cfGuid = baseCf.guid;
this.getAllOrgsAction = CfOrgsDataSourceService.createGetAllOrganisations(this.cfGuid);
=======
this.cfGuid = activeRouteCfOrgSpace.cfGuid;
>>>>>>>
this.cfGuid = activeRouteCfOrgSpace.cfGuid;
this.getAllOrgsAction = CfOrgsDataSourceService.createGetAllOrganisations(this.cfGuid); |
<<<<<<<
import { XSRFModule } from './xsrf.module';
=======
import { PageNotFoundComponentComponent } from './core/page-not-found-component/page-not-found-component.component';
>>>>>>>
import { PageNotFoundComponentComponent } from './core/page-not-found-component/page-not-found-component.component';
import { XSRFModule } from './xsrf.module'; |
<<<<<<<
securityGroup:{},
=======
buildpack: {},
>>>>>>>
securityGroup:{},
buildpack: {},
<<<<<<<
securityGroup:{},
securityRule:{},
=======
buildpack:{},
>>>>>>>
securityGroup:{},
securityRule:{},
buildpack:{},
<<<<<<<
securityGroup: {},
securityRule: {},
=======
buildpack: {},
>>>>>>>
securityGroup: {},
securityRule: {},
buildpack: {}, |
<<<<<<<
this.cardMenu = [{
label: 'Detach',
action: this.detach,
can: this.appService.waitForAppEntity$.pipe(
switchMap(app => this.currentUserPermissionsService.can(
CurrentUserPermissions.SERVICE_BINDING_EDIT,
this.appService.cfGuid,
app.entity.entity.space_guid
)))
}];
=======
this.cardMenu = [
{
label: 'Unbind',
action: this.detach
}
];
>>>>>>>
this.cardMenu = [{
label: 'Unbind',
action: this.detach,
can: this.appService.waitForAppEntity$.pipe(
switchMap(app => this.currentUserPermissionsService.can(
CurrentUserPermissions.SERVICE_BINDING_EDIT,
this.appService.cfGuid,
app.entity.entity.space_guid
)))
}]; |
<<<<<<<
import { Observable , Subscription } from 'rxjs';
=======
import { Observable } from 'rxjs/Observable';
import { map, publishReplay, refCount } from 'rxjs/operators';
import { Subscription } from 'rxjs/Subscription';
>>>>>>>
import { Observable, Subscription } from 'rxjs';
import { map, publishReplay, refCount } from 'rxjs/operators';
<<<<<<<
import { map, tap, first, publishReplay, refCount } from 'rxjs/operators';
import { ISubHeaderTabs } from '../../../shared/components/page-subheader/page-subheader.types';
=======
>>>>>>> |
<<<<<<<
import { CfBuildpackCardComponent } from '../../list-types/cf-buildpacks/cf-buildpack-card/cf-buildpack-card.component';
=======
import { CfStacksCardComponent } from '../../list-types/cf-stacks/cf-stacks-card/cf-stacks-card.component';
>>>>>>>
import { CfBuildpackCardComponent } from '../../list-types/cf-buildpacks/cf-buildpack-card/cf-buildpack-card.component';
import { CfStacksCardComponent } from '../../list-types/cf-stacks/cf-stacks-card/cf-stacks-card.component';
<<<<<<<
CfSpaceCardComponent,
CfBuildpackCardComponent
=======
CfSpaceCardComponent,
CfStacksCardComponent
>>>>>>>
CfSpaceCardComponent,
CfBuildpackCardComponent,
CfStacksCardComponent |
<<<<<<<
import { tag } from 'rxjs-spy/operators/tag';
import { debounceTime, distinctUntilChanged, filter, first, tap, withLatestFrom, map } from 'rxjs/operators';
import { Subscription , Observable } from 'rxjs';
=======
import { Observable } from 'rxjs/Observable';
import { map } from 'rxjs/operators';
import { Subscription } from 'rxjs/Rx';
>>>>>>>
import { Observable, Subscription } from 'rxjs';
import { map } from 'rxjs/operators';
<<<<<<<
import { selectPaginationState } from '../../../store/selectors/pagination.selectors';
import { APIResource } from '../../../store/types/api.types';
import { CloudFoundryEndpointService } from '../../cloud-foundry/services/cloud-foundry-endpoint.service';
import { CloudFoundryService } from '../../../shared/data-services/cloud-foundry.service';
import { GetCFUser } from '../../../store/actions/users.actions';
import { CurrentUserPermissionsService } from '../../../core/current-user-permissions.service';
import { CurrentUserPermissions } from '../../../core/current-user-permissions.config';
=======
>>>>>>> |
<<<<<<<
import { APIResource } from '../../store/types/api.types';
import { GetAppEnvVarsAction } from './../../store/actions/app-metadata.actions';
=======
import {
ApplicationEnvVars,
} from '../../features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
import { EnvVarSchema, GetAppEnvVarsAction, getPaginationKey } from './../../store/actions/app-metadata.actions';
>>>>>>>
import {
ApplicationEnvVars,
} from '../../features/applications/application/application-tabs-base/tabs/build-tab/application-env-vars.service';
<<<<<<<
import { getPaginationKey } from '../../store/actions/pagination.actions';
import { AppEnvVarSchema, AppEnvVarsState } from '../../store/types/app-metadata.types';
=======
>>>>>>>
import { AppEnvVarSchema, AppEnvVarsState } from '../../store/types/app-metadata.types'; |
<<<<<<<
import {SetArrays} from '../../../web/js/util/SetArrays';
import {Tag} from '../../../web/js/tags/Tags';
=======
import {Sets} from '../../../web/js/util/Sets';
import {DataObjectIndex} from './DataObjectIndex';
>>>>>>>
import {SetArrays} from '../../../web/js/util/SetArrays';
import {Tag} from '../../../web/js/tags/Tags';
import {DataObjectIndex} from './DataObjectIndex'; |
<<<<<<<
import {
currentUserCfRolesRequestStateReducer,
currentUserRolesRequestStateReducer,
} from './current-user-request-state.reducers';
import { roleInfoFromSessionReducer } from './current-user-role-session.reducer';
=======
import { VerifiedSession, SESSION_VERIFIED } from '../../actions/auth.actions';
import { roleInfoFromSessionReducer, updateNewlyConnectedEndpoint } from './current-user-role-session.reducer';
import {
DISCONNECT_ENDPOINTS_SUCCESS,
DisconnectEndpoint,
UNREGISTER_ENDPOINTS_SUCCESS,
REGISTER_ENDPOINTS_SUCCESS,
RegisterEndpoint,
EndpointActionComplete,
CONNECT_ENDPOINTS_SUCCESS
} from '../../actions/endpoint.actions';
import { removeEndpointRoles, addEndpoint, removeOrgRoles, removeSpaceRoles } from './current-user-roles-clear.reducers';
import { DELETE_ORGANIZATION_SUCCESS } from '../../actions/organization.actions';
import { APISuccessOrFailedAction } from '../../types/request.types';
import { DELETE_SPACE_SUCCESS } from '../../actions/space.actions';
>>>>>>>
import {
currentUserCfRolesRequestStateReducer,
currentUserRolesRequestStateReducer,
} from './current-user-request-state.reducers';
import { roleInfoFromSessionReducer, updateNewlyConnectedEndpoint } from './current-user-role-session.reducer';
import { addEndpoint, removeEndpointRoles, removeOrgRoles, removeSpaceRoles } from './current-user-roles-clear.reducers';
<<<<<<<
const verifiedSession = action as VerifiedSession;
return roleInfoFromSessionReducer(state, verifiedSession.sessionData.user, verifiedSession.sessionData.endpoints);
case GET_CURRENT_USER_RELATIONS:
case GET_CURRENT_USER_RELATIONS_SUCCESS:
case GET_CURRENT_USER_RELATIONS_FAILED:
return {
...state,
state: currentUserRolesRequestStateReducer(state.state, action.type)
};
case GET_CURRENT_USER_CF_RELATIONS:
case GET_CURRENT_USER_CF_RELATIONS_SUCCESS:
case GET_CURRENT_USER_CF_RELATIONS_FAILED:
return {
...state,
cf: currentUserCfRolesRequestStateReducer(state.cf, action as GetUserCfRelations)
};
=======
return roleInfoFromSessionReducer(state, action as VerifiedSession);
case REGISTER_ENDPOINTS_SUCCESS:
return addEndpoint(state, action as EndpointActionComplete);
case CONNECT_ENDPOINTS_SUCCESS:
return updateNewlyConnectedEndpoint(state, action as EndpointActionComplete);
case DISCONNECT_ENDPOINTS_SUCCESS:
case UNREGISTER_ENDPOINTS_SUCCESS:
return removeEndpointRoles(state, action as EndpointActionComplete);
case DELETE_ORGANIZATION_SUCCESS:
return removeOrgRoles(state, action as APISuccessOrFailedAction);
case DELETE_SPACE_SUCCESS:
return removeSpaceRoles(state, action as APISuccessOrFailedAction);
>>>>>>>
return roleInfoFromSessionReducer(state, action as VerifiedSession);
case REGISTER_ENDPOINTS_SUCCESS:
return addEndpoint(state, action as EndpointActionComplete);
case CONNECT_ENDPOINTS_SUCCESS:
return updateNewlyConnectedEndpoint(state, action as EndpointActionComplete);
case DISCONNECT_ENDPOINTS_SUCCESS:
case UNREGISTER_ENDPOINTS_SUCCESS:
return removeEndpointRoles(state, action as EndpointActionComplete);
case DELETE_ORGANIZATION_SUCCESS:
return removeOrgRoles(state, action as APISuccessOrFailedAction);
case DELETE_SPACE_SUCCESS:
return removeSpaceRoles(state, action as APISuccessOrFailedAction);
case GET_CURRENT_USER_RELATIONS:
case GET_CURRENT_USER_RELATIONS_SUCCESS:
case GET_CURRENT_USER_RELATIONS_FAILED:
return {
...state,
state: currentUserRolesRequestStateReducer(state.state, action.type)
};
case GET_CURRENT_USER_CF_RELATIONS:
case GET_CURRENT_USER_CF_RELATIONS_SUCCESS:
case GET_CURRENT_USER_CF_RELATIONS_FAILED:
return {
...state,
cf: currentUserCfRolesRequestStateReducer(state.cf, action as GetUserCfRelations)
}; |
<<<<<<<
TableCellUsageComponent,
=======
TableCellRouteComponent,
TableCellTCPRouteComponent,
>>>>>>>
TableCellUsageComponent,
TableCellRouteComponent,
TableCellTCPRouteComponent, |
<<<<<<<
import { GeneralEntityAppState, GeneralRequestDataState } from '../../store/src/app-state';
import { endpointSchemaKey } from '../../store/src/helpers/entity-factory';
=======
import { AppState } from '../../store/src/app-state';
import {
applicationSchemaKey,
endpointSchemaKey,
organizationSchemaKey,
spaceSchemaKey,
} from '../../store/src/helpers/entity-factory';
>>>>>>>
import { GeneralEntityAppState, GeneralRequestDataState } from '../../store/src/app-state';
import { endpointSchemaKey } from '../../store/src/helpers/entity-factory';
<<<<<<<
import { IFavoriteMetadata, UserFavorite } from '../../store/src/types/user-favorites.types';
=======
import { APIResource } from '../../store/src/types/api.types';
import { EndpointModel } from '../../store/src/types/endpoint.types';
import { IRequestDataState } from '../../store/src/types/entity.types';
import { IEndpointFavMetadata, IFavoriteMetadata, UserFavorite } from '../../store/src/types/user-favorites.types';
>>>>>>>
import { IFavoriteMetadata, UserFavorite } from '../../store/src/types/user-favorites.types';
<<<<<<<
import { FavoritesConfigMapper } from './shared/components/favorites-meta-card/favorite-config-mapper';
import { GlobalEventData, GlobalEventService } from './shared/global-events.service';
=======
import { FavoriteConfig, favoritesConfigMapper } from './shared/components/favorites-meta-card/favorite-config-mapper';
import { GlobalEventData, GlobalEventService } from './shared/global-events.service';
>>>>>>>
import { FavoritesConfigMapper } from './shared/components/favorites-meta-card/favorite-config-mapper';
import { GlobalEventData, GlobalEventService } from './shared/global-events.service';
<<<<<<<
=======
import { CfAutoscalerModule } from '../../cf-autoscaler/src/cf-autoscaler.module';
>>>>>>>
<<<<<<<
=======
CloudFoundryModule,
CfAutoscalerModule
>>>>>>>
CfAutoscalerModule
<<<<<<<
EntityActionDispatcher.initialize(this.store);
eventService.addEventConfig<boolean>(
{
eventTriggered: (state: GeneralEntityAppState) => new GlobalEventData(!state.dashboard.timeoutSession),
message: 'Timeout session is disabled - this is considered a security risk.',
key: 'timeoutSessionWarning',
link: '/user-profile'
}
);
=======
eventService.addEventConfig<boolean>({
eventTriggered: (state: AppState) => new GlobalEventData(!state.dashboard.timeoutSession),
message: 'Timeout session is disabled - this is considered a security risk.',
key: 'timeoutSessionWarning',
link: '/user-profile'
});
eventService.addEventConfig<boolean>({
eventTriggered: (state: AppState) => new GlobalEventData(!state.dashboard.pollingEnabled),
message: 'Polling is disabled - some pages may show stale data.',
key: 'pollingEnabledWarning',
link: '/user-profile'
});
>>>>>>>
EntityActionDispatcher.initialize(this.store);
eventService.addEventConfig<boolean>({
eventTriggered: (state: GeneralEntityAppState) => new GlobalEventData(!state.dashboard.timeoutSession),
message: 'Timeout session is disabled - this is considered a security risk.',
key: 'timeoutSessionWarning',
link: '/user-profile'
});
eventService.addEventConfig<boolean>({
eventTriggered: (state: GeneralEntityAppState) => new GlobalEventData(!state.dashboard.pollingEnabled),
message: 'Polling is disabled - some pages may show stale data.',
key: 'pollingEnabledWarning',
link: '/user-profile'
}); |
<<<<<<<
import { Store } from '@ngrx/store';
import { Observable } from 'rxjs';
import { first, map } from 'rxjs/operators';
=======
import { Validators } from '@angular/forms';
>>>>>>>
import { Store } from '@ngrx/store';
import { Observable } from 'rxjs';
import { first, map } from 'rxjs/operators';
import { Validators } from '@angular/forms';
<<<<<<<
}
export function endpointHasMetrics(endpointGuid: string, store: Store<AppState>): Observable<boolean> {
return store.select(selectEntities<EndpointModel>(endpointSchemaKey)).pipe(
first(),
map(state => !!state[endpointGuid].metadata && !!state[endpointGuid].metadata.metrics)
);
=======
}
export function getEndpointAuthTypes() {
return endpointAuthTypes;
>>>>>>>
}
export function endpointHasMetrics(endpointGuid: string, store: Store<AppState>): Observable<boolean> {
return store.select(selectEntities<EndpointModel>(endpointSchemaKey)).pipe(
first(),
map(state => !!state[endpointGuid].metadata && !!state[endpointGuid].metadata.metrics)
);
}
export function getEndpointAuthTypes() {
return endpointAuthTypes; |
<<<<<<<
import { applicationEntityType, appStatsEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
=======
import { IAppSummary } from '../../../../../../../../core/src/core/cf-api.types';
>>>>>>>
<<<<<<<
import { IAppSummary } from '../../../../../../cf-api.types';
import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
import { GitSCMService, GitSCMType } from '../../../../../../shared/data-services/scm/scm.service';
=======
import { cfEntityCatalog } from '../../../../../../cf-entity-catalog';
>>>>>>>
import { IAppSummary } from '../../../../../../cf-api.types';
import { cfEntityCatalog } from '../../../../../../cf-entity-catalog';
import { GitSCMService, GitSCMType } from '../../../../../../shared/data-services/scm/scm.service'; |
<<<<<<<
import { IDomain } from '../../../../cf-api.types';
import { CF_ENDPOINT_TYPE } from '../../../../cf-types';
=======
import { cfEntityCatalog } from '../../../../cf-entity-catalog';
>>>>>>>
import { IDomain } from '../../../../cf-api.types';
import { cfEntityCatalog } from '../../../../cf-entity-catalog'; |
<<<<<<<
import { EntityInlineChildAction } from '../entity-relations/entity-relations.types';
import { PaginatedAction } from '../../../store/src/types/pagination.types';
import { CFStartAction, ICFAction } from '../../../store/src/types/request.types';
=======
import { CFStartAction } from './cf-action.types';
>>>>>>>
import { CFStartAction } from './cf-action.types';
import { EntityInlineChildAction } from '../entity-relations/entity-relations.types'; |
<<<<<<<
import { createEntityRelationKey } from '../../../../../store/helpers/entity-relations.types';
const orgWithSpaceSchema = entityFactory(organisationWithSpaceKey);
const spaceSchema = entityFactory(spaceSchemaKey);
=======
import { AppReducersModule } from '../../../../../store/reducers.module';
import { GetAllOrganisations } from '../../../../../store/actions/organisation.actions';
import { OrganisationSchema, OrganisationWithSpaceSchema } from '../../../../../store/actions/action-types';
import { CloudFoundryEndpointService } from '../../../../../features/cloud-foundry/services/cloud-foundry-endpoint.service';
import { getPaginationKey } from '../../../../../store/actions/pagination.actions';
>>>>>>>
import { createEntityRelationKey } from '../../../../../store/helpers/entity-relations.types';
<<<<<<<
public static paginationKey = 'cf-organizations';
constructor(store: Store<AppState>, listConfig?: IListConfig<APIResource>) {
const { paginationKey } = CfOrgsDataSourceService;
const action = new GetAllOrganisations(
paginationKey, [
createEntityRelationKey(organisationWithSpaceKey, spaceSchemaKey),
createEntityRelationKey(spaceSchemaKey, routeSchemaKey),
]);
=======
constructor(store: Store<AppState>, cfGuid: string, listConfig?: IListConfig<APIResource>) {
const paginationKey = getPaginationKey('cf-organizations', cfGuid);
const action = new GetAllOrganisations(paginationKey);
>>>>>>>
public static paginationKey = 'cf-organizations';
constructor(store: Store<AppState>, listConfig?: IListConfig<APIResource>) {
const { paginationKey } = CfOrgsDataSourceService;
const action = new GetAllOrganisations(
paginationKey, [
createEntityRelationKey(organisationWithSpaceKey, spaceSchemaKey),
createEntityRelationKey(spaceSchemaKey, routeSchemaKey),
]); |
<<<<<<<
import { Injectable } from '@angular/core';
import { MatDialog } from '@angular/material';
import { GetSystemInfo } from '../../store/actions/system.actions';
=======
>>>>>>> |
<<<<<<<
}
export interface IStack {
name: string;
description: string;
}
export interface IBuildpack {
name: string;
position: number;
enabled: boolean;
locked: boolean;
filename: string;
=======
}
export interface IServiceInstance {
guid: string;
cfGuid: string;
}
export interface IPrivateDomain {
guid: string;
cfGuid: string;
}
export interface IQuotaDefinition {
memory_limit: number;
app_instance_limit: number;
instance_memory_limit: number;
name: string;
organization_guid?: string;
total_services?: number;
total_routes?: number;
total_private_domains?: number;
}
export interface IUpdateSpace {
name?: string;
organization_guid?: string;
developer_guids?: string[];
manager_guids?: string[];
auditor_guids?: string[];
domain_guids?: string[];
security_group_guids?: string[];
allow_ssh?: boolean;
isolation_segment_guid?: string;
}
export interface IUpdateOrganization {
name?: string;
status?: string;
quota_definition_guid?: string;
default_isolation_segment_guid?: string;
>>>>>>>
}
export interface IStack {
name: string;
description: string;
}
export interface IBuildpack {
name: string;
position: number;
enabled: boolean;
locked: boolean;
filename: string;
}
export interface IServiceInstance {
guid: string;
cfGuid: string;
}
export interface IPrivateDomain {
guid: string;
cfGuid: string;
}
export interface IQuotaDefinition {
memory_limit: number;
app_instance_limit: number;
instance_memory_limit: number;
name: string;
organization_guid?: string;
total_services?: number;
total_routes?: number;
total_private_domains?: number;
}
export interface IUpdateSpace {
name?: string;
organization_guid?: string;
developer_guids?: string[];
manager_guids?: string[];
auditor_guids?: string[];
domain_guids?: string[];
security_group_guids?: string[];
allow_ssh?: boolean;
isolation_segment_guid?: string;
}
export interface IUpdateOrganization {
name?: string;
status?: string;
quota_definition_guid?: string;
default_isolation_segment_guid?: string; |
<<<<<<<
import { PortalModule } from '@angular/cdk/portal';
=======
import { NoContentMessageComponent } from '../shared/components/no-content-message/no-content-message.component';
>>>>>>>
import { PortalModule } from '@angular/cdk/portal';
import { NoContentMessageComponent } from '../shared/components/no-content-message/no-content-message.component'; |
<<<<<<<
import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
import { Customizations } from '../../../core/customizations.types';
import { MDAppModule } from '../../../core/md.module';
=======
import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
import { CustomizationService } from '../../../core/customizations.types';
import { MDAppModule } from '../../../core/md.module';
>>>>>>>
import { CoreTestingModule } from '../../../../test-framework/core-test.modules';
import { createBasicStoreModule } from '../../../../test-framework/store-test-helper';
import { CustomizationService } from '../../../core/customizations.types';
import { MDAppModule } from '../../../core/md.module'; |
<<<<<<<
import { PaginationMonitorFactory } from '../../../../monitors/pagination-monitor.factory';
import { DataFunctionDefinition, ListDataSource } from '../../data-sources-controllers/list-data-source';
import { IListConfig } from '../../list.component.types';
import { EndpointDataSourceHelper } from './endpoint-data-source.helpers';
import { entityFactory } from '../../../../../store/helpers/entity-factory';
import { endpointSchemaKey } from '../../../../../store/helpers/entity-factory';
=======
import { tap } from 'rxjs/operators/tap';
import { combineLatest } from 'rxjs/observable/combineLatest';
import { EndpointsEffect } from '../../../../../store/effects/endpoint.effects';
import { PaginationMonitor } from '../../../../monitors/pagination-monitor';
import { ListRowSateHelper } from './endpoint-data-source.helpers';
>>>>>>>
import { PaginationMonitorFactory } from '../../../../monitors/pagination-monitor.factory';
import { DataFunctionDefinition, ListDataSource } from '../../data-sources-controllers/list-data-source';
import { IListConfig } from '../../list.component.types';
import { ListRowSateHelper } from './endpoint-data-source.helpers'; |
<<<<<<<
import { compose, Store } from '@ngrx/store';
import { combineLatest, interval, Observable } from 'rxjs';
import { filter, map, publishReplay, refCount, switchMap, tap, withLatestFrom } from 'rxjs/operators';
=======
import { Store, compose } from '@ngrx/store';
import { tag } from 'rxjs-spy/operators/tag';
import { interval, Observable, combineLatest } from 'rxjs';
import { filter, map, publishReplay, refCount, share, tap, withLatestFrom, switchMap, first, distinctUntilChanged } from 'rxjs/operators';
>>>>>>>
import { compose, Store } from '@ngrx/store';
import { combineLatest, interval, Observable } from 'rxjs';
import { filter, first, map, publishReplay, refCount, switchMap, tap, withLatestFrom } from 'rxjs/operators'; |
<<<<<<<
import { AppState } from './../../../../../../store/app-state';
=======
>>>>>>>
<<<<<<<
import { map, first, tap } from 'rxjs/operators';
=======
import { map } from 'rxjs/operators';
>>>>>>>
import { first, map, tap } from 'rxjs/operators';
import { getFavoriteFromCfEntity } from '../../../../../../core/user-favorite-helpers';
import { UserFavoriteManager } from '../../../../../../core/user-favorite-manager';
import { UserFavorite } from '../../../../../../store/types/user-favorites.types';
<<<<<<<
public favorite: UserFavorite;
userFavoriteManager: UserFavoriteManager;
@Input()
=======
statusIcon = true;
@Input()
statusIconByTitle = false;
@Input()
statusIconTooltip: string;
@Input()
>>>>>>>
public favorite: UserFavorite;
userFavoriteManager: UserFavoriteManager;
statusIcon = true;
@Input()
statusIconByTitle = false;
@Input()
statusIconTooltip: string;
@Input() |
<<<<<<<
securityGroup:{},
=======
featureFlag: {},
>>>>>>>
securityGroup:{},
featureFlag: {},
<<<<<<<
securityGroup:{},
securityRule:{},
=======
featureFlag: {},
>>>>>>>
securityGroup:{},
securityRule:{},
featureFlag: {},
<<<<<<<
securityGroup: {},
securityRule: {},
=======
featureFlag: {},
>>>>>>>
securityGroup: {},
securityRule: {},
featureFlag: {}, |
<<<<<<<
});
=======
}));
it('First filter hidden if only one option', async(() => {
component.config.getMultiFiltersConfigs = () => {
return [
{
key: 'filterTestKey',
label: 'filterTestLabel',
list$: observableOf([
{
label: 'filterItemLabel',
item: 'filterItemItem',
value: 'filterItemValue'
},
]),
loading$: observableOf(false),
select: new BehaviorSubject(false)
}
];
};
component.config.enableTextFilter = true;
component.config.viewType = ListViewTypes.CARD_ONLY;
component.config.defaultView = 'card' as ListView;
component.config.cardComponent = EndpointCardComponent;
component.config.getColumns = () => [
{
columnId: 'filterTestKey',
headerCell: () => 'a',
cellDefinition: {
getValue: (row) => `${row}`
},
sort: true,
}
];
fixture.detectChanges();
const hostElement = fixture.nativeElement;
// multi filters
const multiFilterSection: HTMLElement = hostElement.querySelector('.list-component__header__left--multi-filters');
expect(multiFilterSection.hidden).toBeFalsy();
expect(multiFilterSection.childElementCount).toBe(0);
}));
>>>>>>>
});
it('First filter hidden if only one option', async(() => {
component.config.getMultiFiltersConfigs = () => {
return [
{
key: 'filterTestKey',
label: 'filterTestLabel',
list$: observableOf([
{
label: 'filterItemLabel',
item: 'filterItemItem',
value: 'filterItemValue'
},
]),
loading$: observableOf(false),
select: new BehaviorSubject(false)
}
];
};
component.config.enableTextFilter = true;
component.config.viewType = ListViewTypes.CARD_ONLY;
component.config.defaultView = 'card' as ListView;
component.config.cardComponent = EndpointCardComponent;
component.config.getColumns = () => [
{
columnId: 'filterTestKey',
headerCell: () => 'a',
cellDefinition: {
getValue: (row) => `${row}`
},
sort: true,
}
];
fixture.detectChanges();
const hostElement = fixture.nativeElement;
// multi filters
const multiFilterSection: HTMLElement = hostElement.querySelector('.list-component__header__left--multi-filters');
expect(multiFilterSection.hidden).toBeFalsy();
expect(multiFilterSection.childElementCount).toBe(0);
})); |
<<<<<<<
=======
import { CFAppState } from '../../cloud-foundry/src/cf-app-state';
import { ActiveRouteCfOrgSpace } from '../../cloud-foundry/src/features/cloud-foundry/cf-page.types';
import {
CloudFoundryEndpointService,
} from '../../cloud-foundry/src/features/cloud-foundry/services/cloud-foundry-endpoint.service';
import { UserInviteService } from '../../cloud-foundry/src/features/cloud-foundry/user-invites/user-invite.service';
import { CfOrgSpaceDataService } from '../../cloud-foundry/src/shared/data-services/cf-org-space-service.service';
import { CfUserService } from '../../cloud-foundry/src/shared/data-services/cf-user.service';
import { CloudFoundryService } from '../../cloud-foundry/src/shared/data-services/cloud-foundry.service';
>>>>>>> |
<<<<<<<
import { combineLatest, distinct, map } from 'rxjs/operators';
=======
import { combineLatest, distinct, map, tap, startWith } from 'rxjs/operators';
>>>>>>>
import { combineLatest, distinct, map, startWith } from 'rxjs/operators';
<<<<<<<
const scmType = deploySource.scm as GitSCMType;
const scm = this.scmService.getSCM(scmType);
deploySource.label = scm.getLabel();
deploySource.commitURL = scm.getCommitURL(deploySource.project, deploySource.commit);
deploySource.icon = scm.getIcon();
=======
if (deploySource.type === 'gitscm') {
const scmType = deploySource.scm as GitSCMType;
const scm = this.scmService.getSCM(scmType);
deploySource.label = scm.getLabel();
deploySource.commitURL = scm.getCommitURL(deploySource.project, deploySource.commit);
deploySource.icon = scm.getIcon();
}
>>>>>>>
if (deploySource.type === 'gitscm') {
const scmType = deploySource.scm as GitSCMType;
const scm = this.scmService.getSCM(scmType);
deploySource.label = scm.getLabel();
deploySource.commitURL = scm.getCommitURL(deploySource.project, deploySource.commit);
deploySource.icon = scm.getIcon();
} |
<<<<<<<
import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
import * as moment from 'moment';
import { Subscription } from 'rxjs';
import { debounceTime, takeWhile, tap } from 'rxjs/operators';
import { MetricQueryConfig, MetricQueryType, MetricsAction } from '../../../store/actions/metrics.actions';
import { entityFactory, metricSchemaKey } from '../../../store/helpers/entity-factory';
=======
import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core';
import { Subscription } from 'rxjs';
import { FetchApplicationMetricsAction, MetricsAction } from '../../../store/actions/metrics.actions';
import { entityFactory, metricSchemaKey } from '../../../store/helpers/entity-factory';
>>>>>>>
import { Component, EventEmitter, Input, OnDestroy, Output } from '@angular/core';
import { Subscription } from 'rxjs';
import { MetricsAction } from '../../../store/actions/metrics.actions';
import { entityFactory, metricSchemaKey } from '../../../store/helpers/entity-factory';
<<<<<<<
enum RangeType {
ROLLING_WINDOW = 'ROLLING_WINDOW',
START_END = 'START_END'
}
interface ITimeRange {
value?: string;
label: string;
type: RangeType;
}
=======
import { MetricsRangeSelectorManagerService } from '../../services/metrics-range-selector-manager.service';
import { MetricQueryType } from '../../services/metrics-range-selector.types';
>>>>>>>
import { MetricsRangeSelectorManagerService } from '../../services/metrics-range-selector-manager.service';
import { MetricQueryType } from '../../services/metrics-range-selector.types';
<<<<<<<
private newMetricsAction(action: MetricsAction, newQuery: MetricQueryConfig, queryType: MetricQueryType): MetricsAction {
return {
...action,
query: newQuery,
queryType
};
}
private commitDate(date: moment.Moment, type: 'start' | 'end') {
const index = type === 'start' ? this.startIndex : this.endIndex;
const oldDate = this.startEnd[index];
if (!date.isValid() || date.isSame(oldDate)) {
return;
}
this.startEnd[index] = date;
const [start, end] = this.startEnd;
if (start && end) {
const startUnix = start.unix();
const endUnix = end.unix();
const oldAction = this.baseAction;
const action = this.newMetricsAction(oldAction, new MetricQueryConfig(this.baseAction.query.metric, {
start: startUnix,
end: end.unix(),
step: Math.max((endUnix - startUnix) / 200, 0)
}), MetricQueryType.RANGE_QUERY);
this.commit = () => {
this.committedStartEnd = [
this.startEnd[0],
this.startEnd[1]
];
this.commitAction(action);
};
}
}
get selectedTimeRange() {
return this.selectedTimeRangeValue;
}
set selectedTimeRange(timeRange: ITimeRange) {
this.commit = null;
this.selectedTimeRangeValue = timeRange;
if (this.selectedTimeRangeValue.type === RangeType.ROLLING_WINDOW) {
this.commitWindow(this.selectedTimeRangeValue);
} else if (this.selectedTimeRangeValue.type === RangeType.START_END) {
if (!this.startEnd[0] || !this.startEnd[1]) {
this.showOverlay = true;
}
}
}
private getInitSub(entityMonitor: EntityMonitor<IMetrics>) {
return entityMonitor.entity$.pipe(
debounceTime(1),
tap(metrics => {
if (!this.selectedTimeRange) {
if (metrics) {
if (metrics.queryType === MetricQueryType.RANGE_QUERY) {
const start = moment.unix(parseInt(metrics.query.params.start as string, 10));
const end = moment.unix(parseInt(metrics.query.params.end as string, 10));
const isDifferent = !start.isSame(this.start) || !end.isSame(this.end);
if (isDifferent) {
this.start = start;
this.end = end;
this.committedStartEnd = [start, end];
}
this.selectedTimeRange = this.times.find(time => time.type === RangeType.START_END);
} else {
const newWindow = metrics.query.params.window ?
this.times.find(time => time.value === metrics.query.params.window) :
this.getDefaultTimeRange();
if (this.selectedTimeRange !== newWindow) {
this.selectedTimeRange = newWindow;
}
}
} else {
this.selectedTimeRange = this.getDefaultTimeRange();
}
}
}),
takeWhile(metrics => !metrics)
).subscribe();
}
private commitWindow(window: ITimeRange) {
if (!window) {
return;
}
this.committedStartEnd = [null, null];
this.startEnd = [null, null];
const oldAction = this.baseAction;
const action = this.newMetricsAction(oldAction, new MetricQueryConfig(this.baseAction.query.metric, {
window: window.value
}), MetricQueryType.QUERY);
this.commitAction(action);
}
set start(start: moment.Moment) {
this.commitDate(start, 'start');
}
get start() {
return this.startEnd[this.startIndex];
}
set end(end: moment.Moment) {
this.commitDate(end, 'end');
}
get end() {
return this.startEnd[this.endIndex];
}
private getDefaultTimeRange() {
return this.times.find(time => time.value === '1h') || this.times[0];
}
=======
>>>>>>> |
<<<<<<<
import { PaginationAction } from '../types/pagination.types';
import { ApplicationSchema } from './application.actions';
=======
import { PaginationAction } from '../types/pagination.types';
import { RouteSchema } from '../../shared/components/list/list-types/app-route/cf-app-routes-data-source';
>>>>>>>
import { PaginationAction } from '../types/pagination.types';
import { ApplicationSchema } from './application.actions';
import { RouteSchema } from '../../shared/components/list/list-types/app-route/cf-app-routes-data-source'; |
<<<<<<<
MultilineTitleComponent,
StackedInputActionsComponent,
StackedInputActionComponent,
=======
FavoritesGlobalListComponent,
FavoritesMetaCardComponent,
FavoritesEntityListComponent,
MultilineTitleComponent
>>>>>>>
StackedInputActionsComponent,
StackedInputActionComponent,
FavoritesGlobalListComponent,
FavoritesMetaCardComponent,
FavoritesEntityListComponent,
<<<<<<<
MetricsParentRangeSelectorComponent,
StackedInputActionsComponent,
StackedInputActionComponent,
=======
MetricsParentRangeSelectorComponent,
FavoritesMetaCardComponent,
FavoritesGlobalListComponent
>>>>>>>
MetricsParentRangeSelectorComponent,
StackedInputActionsComponent,
StackedInputActionComponent,
FavoritesMetaCardComponent,
FavoritesGlobalListComponent |
<<<<<<<
import { userFavoritesEntitySchema } from '../../../core/src/base-entity-schemas';
=======
>>>>>>>
<<<<<<<
import { entityCatalog } from '../entity-catalog/entity-catalog';
import { proxyAPIVersion } from '../jetstream';
=======
import { userFavoritesEntitySchema } from '../base-entity-schemas';
import { entityCatalog } from '../entity-catalog/entity-catalog';
>>>>>>>
import { entityCatalog } from '../entity-catalog/entity-catalog';
import { proxyAPIVersion } from '../jetstream'; |
<<<<<<<
import {
appEnvVarsSchemaKey,
appStatsSchemaKey,
appSummarySchemaKey,
privateDomainsSchemaKey,
spaceQuotaSchemaKey,
serviceInstancesSchemaKey,
servicePlanSchemaKey,
serviceSchemaKey,
serviceBindingSchemaKey,
buildpackSchemaKey,
securityGroupSchemaKey,
featureFlagSchemaKey,
domainSchemaKey,
cfUserSchemaKey,
githubBranchesSchemaKey,
endpointSchemaKey,
appEventSchemaKey,
routeSchemaKey,
organisationSchemaKey,
spaceSchemaKey,
stackSchemaKey,
applicationSchemaKey,
} from '../helpers/entity-factory';
=======
>>>>>>>
import {
appEnvVarsSchemaKey,
appEventSchemaKey,
applicationSchemaKey,
appStatsSchemaKey,
appSummarySchemaKey,
buildpackSchemaKey,
cfUserSchemaKey,
domainSchemaKey,
endpointSchemaKey,
featureFlagSchemaKey,
githubBranchesSchemaKey,
organisationSchemaKey,
privateDomainsSchemaKey,
routeSchemaKey,
securityGroupSchemaKey,
serviceBindingSchemaKey,
serviceInstancesSchemaKey,
servicePlanSchemaKey,
serviceSchemaKey,
spaceQuotaSchemaKey,
spaceSchemaKey,
stackSchemaKey,
} from '../helpers/entity-factory';
<<<<<<<
import { EndpointModel } from './endpoint.types';
=======
import { AppEnvVarSchema, AppStatSchema, AppSummarySchema } from './app-metadata.types';
import { EndpointModel } from './endpoint.types';
import { GitBranch, GithubCommit } from './github.types';
import { CfService, CfServiceBinding, CfServiceInstance, CfServicePlan } from './service.types';
>>>>>>>
import { EndpointModel } from './endpoint.types';
import { GitBranch, GithubCommit } from './github.types';
import { CfService, CfServiceBinding, CfServiceInstance, CfServicePlan } from './service.types';
<<<<<<<
=======
featureFlag: IRequestEntityTypeState<IFeatureFlag>;
application: IRequestEntityTypeState<APIResource<IApp>>;
stack: IRequestEntityTypeState<APIResource<IStack>>;
space: IRequestEntityTypeState<APIResource<ISpace>>;
organization: IRequestEntityTypeState<APIResource<IOrganization>>;
route: IRequestEntityTypeState<APIResource<IRoute>>;
event: IRequestEntityTypeState<APIResource>;
githubBranches: IRequestEntityTypeState<APIResource<GitBranch>>;
githubCommits: IRequestEntityTypeState<APIResource<GithubCommit>>;
domain: IRequestEntityTypeState<APIResource<IDomain>>;
user: IRequestEntityTypeState<APIResource<CfUser>>;
serviceInstance: IRequestEntityTypeState<APIResource<CfServiceInstance>>;
servicePlan: IRequestEntityTypeState<APIResource<CfServicePlan>>;
service: IRequestEntityTypeState<APIResource<CfService>>;
serviceBinding: IRequestEntityTypeState<APIResource<CfServiceBinding>>;
securityGroup: IRequestEntityTypeState<APIResource<ISecurityGroup>>;
>>>>>>>
featureFlag: IRequestEntityTypeState<IFeatureFlag>;
application: IRequestEntityTypeState<APIResource<IApp>>;
stack: IRequestEntityTypeState<APIResource<IStack>>;
space: IRequestEntityTypeState<APIResource<ISpace>>;
organization: IRequestEntityTypeState<APIResource<IOrganization>>;
route: IRequestEntityTypeState<APIResource<IRoute>>;
event: IRequestEntityTypeState<APIResource>;
githubBranches: IRequestEntityTypeState<APIResource<GitBranch>>;
githubCommits: IRequestEntityTypeState<APIResource<GithubCommit>>;
domain: IRequestEntityTypeState<APIResource<IDomain>>;
user: IRequestEntityTypeState<APIResource<CfUser>>;
serviceInstance: IRequestEntityTypeState<APIResource<CfServiceInstance>>;
servicePlan: IRequestEntityTypeState<APIResource<CfServicePlan>>;
service: IRequestEntityTypeState<APIResource<CfService>>;
serviceBinding: IRequestEntityTypeState<APIResource<CfServiceBinding>>;
securityGroup: IRequestEntityTypeState<APIResource<ISecurityGroup>>;
<<<<<<<
=======
featureFlag: IRequestEntityTypeState<RequestInfoState>;
stack: IRequestEntityTypeState<RequestInfoState>;
space: IRequestEntityTypeState<RequestInfoState>;
organization: IRequestEntityTypeState<RequestInfoState>;
route: IRequestEntityTypeState<RequestInfoState>;
event: IRequestEntityTypeState<RequestInfoState>;
githubBranches: IRequestEntityTypeState<RequestInfoState>;
githubCommits: IRequestEntityTypeState<RequestInfoState>;
domain: IRequestEntityTypeState<RequestInfoState>;
user: IRequestEntityTypeState<RequestInfoState>;
serviceInstance: IRequestEntityTypeState<RequestInfoState>;
servicePlan: IRequestEntityTypeState<RequestInfoState>;
service: IRequestEntityTypeState<RequestInfoState>;
serviceBinding: IRequestEntityTypeState<RequestInfoState>;
securityGroup: IRequestEntityTypeState<RequestInfoState>;
>>>>>>>
featureFlag: IRequestEntityTypeState<RequestInfoState>;
stack: IRequestEntityTypeState<RequestInfoState>;
space: IRequestEntityTypeState<RequestInfoState>;
organization: IRequestEntityTypeState<RequestInfoState>;
route: IRequestEntityTypeState<RequestInfoState>;
event: IRequestEntityTypeState<RequestInfoState>;
githubBranches: IRequestEntityTypeState<RequestInfoState>;
githubCommits: IRequestEntityTypeState<RequestInfoState>;
domain: IRequestEntityTypeState<RequestInfoState>;
user: IRequestEntityTypeState<RequestInfoState>;
serviceInstance: IRequestEntityTypeState<RequestInfoState>;
servicePlan: IRequestEntityTypeState<RequestInfoState>;
service: IRequestEntityTypeState<RequestInfoState>;
serviceBinding: IRequestEntityTypeState<RequestInfoState>;
securityGroup: IRequestEntityTypeState<RequestInfoState>; |
<<<<<<<
import { appEventEntityType, cfEntityFactory } from '../cf-entity-factory';
import { PaginatedAction } from '../../../store/src/types/pagination.types';
import { CFStartAction } from '../../../store/src/types/request.types';
import { QParam } from '../../../store/src/q-param';
=======
import { PaginatedAction, QParam } from '../../../store/src/types/pagination.types';
import { appEventEntityType, cfEntityFactory } from '../cf-entity-factory';
import { CFStartAction } from './cf-action.types';
>>>>>>>
import { PaginatedAction } from '../../../store/src/types/pagination.types';
import { appEventEntityType, cfEntityFactory } from '../cf-entity-factory';
import { CFStartAction } from './cf-action.types';
import { QParam } from '../../../store/src/q-param'; |
<<<<<<<
import { ListView } from '../../../../../../../store/src/actions/list.actions';
import { CFAppState } from '../../../../../../../store/src/app-state';
import { APIResource } from '../../../../../../../store/src/types/api.types';
=======
>>>>>>> |
<<<<<<<
import {
DeleteUserProvidedInstance,
UpdateUserProvidedServiceInstance,
} from '../../../../cloud-foundry/src/actions/user-provided-service.actions';
=======
>>>>>>>
<<<<<<<
import {
serviceBindingEntityType,
serviceInstancesEntityType,
userProvidedServiceInstanceEntityType,
} from '../../../../cloud-foundry/src/cf-entity-types';
=======
import { serviceInstancesEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
import { IServiceBinding } from '../../../../core/src/core/cf-api-svc.types';
>>>>>>>
import { serviceInstancesEntityType } from '../../../../cloud-foundry/src/cf-entity-types';
<<<<<<<
import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog.service';
import { EntityCatalogEntityConfig, IEntityMetadata } from '../../../../store/src/entity-catalog/entity-catalog.types';
import { EntityServiceFactory } from '../../../../store/src/entity-service-factory.service';
=======
import { EntityCatalogEntityConfig } from '../../../../store/src/entity-catalog/entity-catalog.types';
import { EntityService } from '../../../../store/src/entity-service';
>>>>>>>
import { EntityCatalogEntityConfig } from '../../../../store/src/entity-catalog/entity-catalog.types';
import { EntityService } from '../../../../store/src/entity-service';
<<<<<<<
import { APIResource, EntityInfo } from '../../../../store/src/types/api.types';
import { UpdateServiceInstance } from '../../actions/service-instances.actions';
import { IServiceBinding, IServiceInstance, IUserProvidedServiceInstance } from '../../cf-api-svc.types';
import { CF_ENDPOINT_TYPE } from '../../cf-types';
import { ServiceBindingActionBuilders } from '../../entity-action-builders/service-binding.action-builders';
import { ServiceInstanceActionBuilders } from '../../entity-action-builders/service-instance.action.builders';
=======
import { APIResource } from '../../../../store/src/types/api.types';
import { cfEntityCatalog } from '../../cf-entity-catalog';
import { CF_ENDPOINT_TYPE } from '../../cf-types';
>>>>>>>
import { APIResource } from '../../../../store/src/types/api.types';
import { IServiceBinding } from '../../cf-api-svc.types';
import { cfEntityCatalog } from '../../cf-entity-catalog';
import { CF_ENDPOINT_TYPE } from '../../cf-types'; |
<<<<<<<
// The apiResponse will be null if we're validating as part of the entity service, not during an api request
const entities = apiResponse ? apiResponse.response.entities : null;
return validateEntityRelations({
=======
return apiAction.skipValidation ? {
started: false,
completed: Promise.resolve([])
} : validateEntityRelations({
>>>>>>>
// The apiResponse will be null if we're validating as part of the entity service, not during an api request
const entities = apiResponse ? apiResponse.response.entities : null;
return apiAction.skipValidation ? {
started: false,
completed: Promise.resolve([])
} : validateEntityRelations({ |
<<<<<<<
import { initEndpointTypes } from '../endpoint-helpers';
=======
import { ConnectEndpointComponent } from '../connect-endpoint/connect-endpoint.component';
>>>>>>>
import { ConnectEndpointComponent } from '../connect-endpoint/connect-endpoint.component';
import { initEndpointTypes } from '../endpoint-helpers'; |
<<<<<<<
appType: 'private',
consumerKey: 'myConsumerKey',
consumerSecret: 'myConsumerSecret',
privateKey: 'shhhhhhh',
userAgent: 'xero-node-v3-unit-test'
=======
AppType: 'partner',
ConsumerKey: 'myConsumerKey',
ConsumerSecret: 'myConsumerSecret',
PrivateKeyCert: 'shhhhhhh',
UserAgent: 'xero-node-v3-unit-test'
>>>>>>>
AppType: 'private',
ConsumerKey: 'myConsumerKey',
ConsumerSecret: 'myConsumerSecret',
PrivateKeyCert: 'shhhhhhh',
UserAgent: 'xero-node-v3-unit-test'
<<<<<<<
it('getUnauthorisedRequestToken returns the request token', () => {
expect(unauthRequestToken).toMatchObject({oauth_token: oauthToken, oauth_token_secret: oauthSecret});
=======
it('sets the options for Partner Apps', () => {
expect(testXeroAPIClient.state.oauthToken).toEqual(xeroClientConfig.ConsumerKey);
expect(testXeroAPIClient.state.oauthSecret).toEqual(xeroClientConfig.PrivateKeyCert);
expect(testXeroAPIClient.state.consumerKey).toEqual(xeroClientConfig.ConsumerKey);
expect(testXeroAPIClient.state.consumerSecret).toEqual(xeroClientConfig.PrivateKeyCert);
expect(testXeroAPIClient.state.signatureMethod).toEqual('RSA-SHA1');
>>>>>>>
it('getUnauthorisedRequestToken returns the request token', () => {
expect(unauthRequestToken).toMatchObject({oauth_token: oauthToken, oauth_token_secret: oauthSecret}); |
<<<<<<<
import { RouteEvents } from './route.actions';
=======
import { SpaceSchema, spaceSchemaKey, SpaceWithOrganisationSchema } from './action-types';
import { getActions } from './action.helper';
import { PaginationAction } from '../types/pagination.types';
import { ApplicationSchema } from './application.actions';
import { RouteSchema } from '../../shared/components/list/list-types/app-route/cf-app-routes-data-source';
import { IUpdateSpace } from '../../core/cf-api.types';
import { ActionMergeFunction } from '../types/api.types';
import { pick } from '../helpers/reducer.helper';
>>>>>>>
import { RouteEvents } from './route.actions';
import { getActions } from './action.helper';
import { IUpdateSpace } from '../../core/cf-api.types';
<<<<<<<
initialParams = {
'results-per-page': 100,
'inline-relations-depth': '1'
};
}
export class GetSpaceRoutes extends CFStartAction implements PaginatedAction, EntityInlineParentAction, EntityInlineChildAction {
constructor(
public spaceGuid: string,
public cfGuid: string,
public paginationKey: string,
public includeRelations = [],
public populateMissing = false
) {
super();
this.options = new RequestOptions();
this.options.url = `spaces/${spaceGuid}/routes`;
this.options.method = 'get';
this.endpointGuid = cfGuid;
this.parentGuid = spaceGuid;
}
actions = [
RouteEvents.GET_SPACE_ALL,
RouteEvents.GET_SPACE_ALL_SUCCESS,
RouteEvents.GET_SPACE_ALL_FAILED
];
initialParams = {
'results-per-page': 100,
'inline-relations-depth': '1',
page: 1,
'order-direction': 'desc',
'order-direction-field': 'attachedApps',
};
parentGuid: string;
entity = entityFactory(routeSchemaKey);
entityKey = routeSchemaKey;
options: RequestOptions;
endpointGuid: string;
flattenPagination = true;
=======
}
export class GetAllAppsInSpace extends CFStartAction implements PaginationAction {
constructor(public cfGuid: string, public spaceGuid: string, public paginationKey: string) {
super();
this.options = new RequestOptions();
this.options.url = `spaces/${spaceGuid}/apps`;
this.options.method = 'get';
this.options.params = new URLSearchParams();
}
actions = getActions('Spaces', 'Get Apps');
entity = [ApplicationSchema];
entityKey = ApplicationSchema.key;
options: RequestOptions;
initialParams = {
page: 1,
'results-per-page': 100,
'inline-relations-depth': 2
};
}
export class DeleteSpace extends CFStartAction implements ICFAction {
constructor(public guid: string, public endpointGuid: string) {
super();
this.options = new RequestOptions();
this.options.url = `spaces/${guid}`;
this.options.method = 'delete';
this.options.params = new URLSearchParams();
this.options.params.append('recursive', 'true');
this.options.params.append('async', 'false');
}
actions = getActions('Spaces', 'Delete Space');
entity = [SpaceSchema];
entityKey = spaceSchemaKey;
options: RequestOptions;
}
export class CreateSpace extends CFStartAction implements ICFAction {
constructor(public name: string, public orgGuid: string, public endpointGuid: string) {
super();
this.options = new RequestOptions();
this.options.url = `spaces`;
this.options.method = 'post';
this.guid = `${orgGuid}-${name}`;
this.options.body = {
name: name,
organization_guid: orgGuid
};
}
actions = getActions('Spaces', 'Create Space');
entity = [SpaceSchema];
entityKey = spaceSchemaKey;
options: RequestOptions;
guid: string;
}
export class UpdateSpace extends CFStartAction implements ICFAction {
public static UpdateExistingSpace = 'Updating-Existing-Space';
constructor(public guid: string, public endpointGuid: string, updateSpace: IUpdateSpace) {
super();
this.options = new RequestOptions();
this.options.url = `spaces/${guid}`;
this.options.method = 'put';
this.options.body = updateSpace;
}
actions = getActions('Spaces', 'Update Space');
entity = [SpaceSchema];
entityKey = spaceSchemaKey;
options: RequestOptions;
updatingKey = UpdateSpace.UpdateExistingSpace;
}
export class GetRoutesInSpace extends CFStartAction implements PaginationAction {
constructor(public spaceGuid: string, public cfGuid: string, public paginationKey: string) {
super();
this.options = new RequestOptions();
this.options.url = `spaces/${spaceGuid}/routes`;
this.options.method = 'get';
this.options.params = new URLSearchParams();
}
actions = getActions('Spaces', 'Get routes');
entity = [RouteSchema];
entityKey = RouteSchema.key;
options: RequestOptions;
initialParams = {
page: 1,
'results-per-page': 100,
'inline-relations-depth': 2
};
>>>>>>>
initialParams = {
'results-per-page': 100,
'inline-relations-depth': '1'
};
}
export class GetSpaceRoutes extends CFStartAction implements PaginatedAction, EntityInlineParentAction, EntityInlineChildAction {
constructor(
public spaceGuid: string,
public cfGuid: string,
public paginationKey: string,
public includeRelations = [],
public populateMissing = false
) {
super();
this.options = new RequestOptions();
this.options.url = `spaces/${spaceGuid}/routes`;
this.options.method = 'get';
this.endpointGuid = cfGuid;
this.parentGuid = spaceGuid;
}
actions = [
RouteEvents.GET_SPACE_ALL,
RouteEvents.GET_SPACE_ALL_SUCCESS,
RouteEvents.GET_SPACE_ALL_FAILED
];
initialParams = {
'results-per-page': 100,
'inline-relations-depth': '1',
page: 1,
'order-direction': 'desc',
'order-direction-field': 'attachedApps',
};
parentGuid: string;
entity = entityFactory(routeSchemaKey);
entityKey = routeSchemaKey;
options: RequestOptions;
endpointGuid: string;
flattenPagination = true;
}
export class GetAllAppsInSpace extends CFStartAction implements PaginationAction {
constructor(public cfGuid: string, public spaceGuid: string, public paginationKey: string) {
super();
this.options = new RequestOptions();
this.options.url = `spaces/${spaceGuid}/apps`;
this.options.method = 'get';
}
actions = getActions('Spaces', 'Get Apps');
entity = [entityFactory(applicationSchemaKey)];
entityKey = applicationSchemaKey;
options: RequestOptions;
initialParams = {
page: 1,
'results-per-page': 100,
'inline-relations-depth': 2
};
}
export class DeleteSpace extends CFStartAction implements ICFAction {
constructor(public guid: string, public endpointGuid: string) {
super();
this.options = new RequestOptions();
this.options.url = `spaces/${guid}`;
this.options.method = 'delete';
this.options.params = new URLSearchParams();
this.options.params.append('recursive', 'true');
this.options.params.append('async', 'false');
}
actions = getActions('Spaces', 'Delete Space');
entity = [entityFactory(spaceSchemaKey)];
entityKey = spaceSchemaKey;
options: RequestOptions;
}
export class CreateSpace extends CFStartAction implements ICFAction {
constructor(public name: string, public orgGuid: string, public endpointGuid: string) {
super();
this.options = new RequestOptions();
this.options.url = `spaces`;
this.options.method = 'post';
this.guid = `${orgGuid}-${name}`;
this.options.body = {
name: name,
organization_guid: orgGuid
};
}
actions = getActions('Spaces', 'Create Space');
entity = [entityFactory(spaceSchemaKey)];
entityKey = spaceSchemaKey;
options: RequestOptions;
guid: string;
}
export class UpdateSpace extends CFStartAction implements ICFAction {
public static UpdateExistingSpace = 'Updating-Existing-Space';
constructor(public guid: string, public endpointGuid: string, updateSpace: IUpdateSpace) {
super();
this.options = new RequestOptions();
this.options.url = `spaces/${guid}`;
this.options.method = 'put';
this.options.body = updateSpace;
}
actions = getActions('Spaces', 'Update Space');
entity = [entityFactory(spaceSchemaKey)];
entityKey = spaceSchemaKey;
options: RequestOptions;
updatingKey = UpdateSpace.UpdateExistingSpace;
}
export class GetRoutesInSpace extends CFStartAction implements PaginationAction {
constructor(public spaceGuid: string, public cfGuid: string, public paginationKey: string) {
super();
this.options = new RequestOptions();
this.options.url = `spaces/${spaceGuid}/routes`;
this.options.method = 'get';
}
actions = getActions('Spaces', 'Get routes');
entity = [entityFactory(routeSchemaKey)];
entityKey = routeSchemaKey;
options: RequestOptions;
initialParams = {
page: 1,
'results-per-page': 100,
'inline-relations-depth': 2
}; |
<<<<<<<
import { trigger, transition, style, animate } from '@angular/animations';
import { map } from 'rxjs/operators';
import { AuthState } from '../../../store/reducers/auth.reducer';
=======
import { ToggleSideNav } from './../../../store/actions/dashboard-actions';
import { AppState } from './../../../store/app-state';
import { BREADCRUMB_URL_PARAM, IHeaderBreadcrumb, IHeaderBreadcrumbLink } from './page-header.types';
>>>>>>>
import { ToggleSideNav } from './../../../store/actions/dashboard-actions';
import { AppState } from './../../../store/app-state';
import { BREADCRUMB_URL_PARAM, IHeaderBreadcrumb, IHeaderBreadcrumbLink } from './page-header.types';
<<<<<<<
public userNameFirstLetter$: Observable<string>;
public username$: Observable<string>;
=======
public actionsKey: String;
>>>>>>>
public userNameFirstLetter$: Observable<string>;
public username$: Observable<string>;
public actionsKey: String; |
<<<<<<<
super(confirmDialog, cfUserService);
=======
super(confirmDialog);
this.chipsConfig$ = combineLatest(
this.rowSubject.asObservable(),
this.configSubject.asObservable().pipe(switchMap(config => config.org$)),
this.configSubject.asObservable().pipe(switchMap(config => config.spaces$))
).pipe(
switchMap(([user, org, spaces]: [APIResource<CfUser>, APIResource<IOrganization>, APIResource<ISpace>[]]) => {
const permissionList = this.createPermissions(user, spaces && spaces.length ? spaces : null);
// If we're showing spaces from multiple orgs prefix the org name to the space name
return org ? observableOf(this.getChipConfig(permissionList)) : this.prefixOrgName(permissionList);
})
);
}
private prefixOrgName(permissionList) {
// Find all unique org guids
const orgGuids = permissionList.map(permission => permission.orgGuid).filter((value, index, self) => self.indexOf(value) === index);
// Find names of all orgs
const orgNames$ = combineLatest(
orgGuids.map(orgGuid => this.store.select<APIResource<IOrganization>>(selectEntity(organizationSchemaKey, orgGuid)))
).pipe(
map((orgs: APIResource<IOrganization>[]) => {
const orgNames: { [orgGuid: string]: string } = {};
orgs.forEach(org => {
orgNames[org.metadata.guid] = org.entity.name;
});
return orgNames;
})
);
return combineLatest(
observableOf(permissionList),
orgNames$
).pipe(
map(([permissions, orgNames]) => {
// Prefix permission name with org name
permissions.forEach(permission => {
permission.name = `${orgNames[permission.orgGuid]}: ${permission.name}`;
});
return this.getChipConfig(permissions);
})
);
>>>>>>>
super(confirmDialog, cfUserService);
this.chipsConfig$ = combineLatest(
this.rowSubject.asObservable(),
this.configSubject.asObservable().pipe(switchMap(config => config.org$)),
this.configSubject.asObservable().pipe(switchMap(config => config.spaces$))
).pipe(
switchMap(([user, org, spaces]: [APIResource<CfUser>, APIResource<IOrganization>, APIResource<ISpace>[]]) => {
const permissionList = this.createPermissions(user, spaces && spaces.length ? spaces : null);
// If we're showing spaces from multiple orgs prefix the org name to the space name
return org ? observableOf(this.getChipConfig(permissionList)) : this.prefixOrgName(permissionList);
})
);
}
private prefixOrgName(permissionList) {
// Find all unique org guids
const orgGuids = permissionList.map(permission => permission.orgGuid).filter((value, index, self) => self.indexOf(value) === index);
// Find names of all orgs
const orgNames$ = combineLatest(
orgGuids.map(orgGuid => this.store.select<APIResource<IOrganization>>(selectEntity(organizationSchemaKey, orgGuid)))
).pipe(
map((orgs: APIResource<IOrganization>[]) => {
const orgNames: { [orgGuid: string]: string } = {};
orgs.forEach(org => {
orgNames[org.metadata.guid] = org.entity.name;
});
return orgNames;
})
);
return combineLatest(
observableOf(permissionList),
orgNames$
).pipe(
map(([permissions, orgNames]) => {
// Prefix permission name with org name
permissions.forEach(permission => {
permission.name = `${orgNames[permission.orgGuid]}: ${permission.name}`;
});
return this.getChipConfig(permissions);
})
); |
<<<<<<<
public endpointParentType: string;
=======
private endpointIds = new ReplaySubject<string[]>();
public endpointIds$: Observable<string[]>;
public cardStatus$: Observable<CardStatus>;
private subs: Subscription[] = [];
>>>>>>>
public endpointParentType: string;
private endpointIds = new ReplaySubject<string[]>();
public endpointIds$: Observable<string[]>;
public cardStatus$: Observable<CardStatus>;
private subs: Subscription[] = [];
<<<<<<<
this.endpointConfig = getEndpointType(row.cnsi_type, row.sub_type);
this.endpointParentType = row.sub_type ? getEndpointType(row.cnsi_type, null).label : null;
=======
this.endpointIds.next([row.guid]);
this.endpointConfig = getEndpointType(row.cnsi_type);
>>>>>>>
this.endpointConfig = getEndpointType(row.cnsi_type, row.sub_type);
this.endpointParentType = row.sub_type ? getEndpointType(row.cnsi_type, null).label : null;
<<<<<<<
this.endpointLink = row.connectionStatus === 'connected' || this.endpointConfig.doesNotSupportConnect ?
EndpointsService.getLinkForEndpoint(row) : null;
this.updateDetails();
=======
this.endpointLink = row.connectionStatus === 'connected' ? EndpointsService.getLinkForEndpoint(row) : null;
this.updateInnerComponent();
>>>>>>>
this.endpointLink = row.connectionStatus === 'connected' || this.endpointConfig.doesNotSupportConnect ?
EndpointsService.getLinkForEndpoint(row) : null;
this.updateInnerComponent(); |
<<<<<<<
SET_STRATOS_THEME,
=======
SET_HEADER_EVENT,
SetHeaderEvent,
>>>>>>>
SET_HEADER_EVENT,
SET_STRATOS_THEME,
SetHeaderEvent,
<<<<<<<
SetThemeAction,
SHOW_SIDE_HELP,
=======
>>>>>>>
SetThemeAction,
<<<<<<<
sideHelpOpen: boolean;
sideHelpDocument: string;
themeKey: string;
=======
headerEventMinimized: boolean;
>>>>>>>
headerEventMinimized: boolean;
themeKey: string;
<<<<<<<
sideHelpOpen: false,
sideHelpDocument: null,
themeKey: null
=======
headerEventMinimized: false,
>>>>>>>
headerEventMinimized: false,
themeKey: null |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.