Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drop insight #25843

Merged
merged 1 commit into from
Apr 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 2 additions & 22 deletions generators/app/generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,19 @@
*/
/* eslint-disable consistent-return, import/no-named-as-default-member */
import chalk from 'chalk';
import { camelCase, omit } from 'lodash-es';
import { camelCase } from 'lodash-es';

import BaseApplicationGenerator from '../base-application/index.js';
import { checkNode, loadStoredAppOptions } from './support/index.js';
import cleanupOldFilesTask from './cleanup.js';
import { askForInsightOptIn } from './prompts.js';
import statistics from '../statistics.js';
import { GENERATOR_COMMON, GENERATOR_CLIENT, GENERATOR_SERVER } from '../generator-list.js';
import { getDefaultAppName } from '../project-name/support/index.js';
import { packageJson } from '../../lib/index.js';

import { applicationTypes, applicationOptions } from '../../jdl/jhipster/index.js';
import { applicationTypes } from '../../jdl/jhipster/index.js';
import command from './command.js';

const { MICROSERVICE } = applicationTypes;
const { JHI_PREFIX, BASE_NAME, JWT_SECRET_KEY, PACKAGE_NAME, PACKAGE_FOLDER, REMEMBER_ME_KEY } = applicationOptions.OptionNames;

export default class JHipsterAppGenerator extends BaseApplicationGenerator {
command = command;
Expand Down Expand Up @@ -82,7 +79,6 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {

get prompting() {
return this.asPromptingTaskGroup({
askForInsightOptIn,
async prompting({ control }) {
if (control.existingProject && this.options.askAnswered !== true) return;
await this.prompt(this.prepareQuestions(this.command.configs));
Expand Down Expand Up @@ -174,22 +170,6 @@ export default class JHipsterAppGenerator extends BaseApplicationGenerator {
return this.delegateTasksToBlueprint(() => this.composing);
}

get default() {
return this.asDefaultTaskGroup({
insight({ control }) {
const yorc = {
...omit(this.jhipsterConfig, [JHI_PREFIX, BASE_NAME, JWT_SECRET_KEY, PACKAGE_NAME, PACKAGE_FOLDER, REMEMBER_ME_KEY]),
};
yorc.applicationType = this.jhipsterConfig.applicationType;
statistics.sendYoRc(yorc, control.existingProject, this.jhipsterConfig.jhipsterVersion);
},
});
}

get [BaseApplicationGenerator.DEFAULT]() {
return this.delegateTasksToBlueprint(() => this.default);
}

get writing() {
return this.asWritingTaskGroup({
cleanupOldFilesTask,
Expand Down
33 changes: 0 additions & 33 deletions generators/app/prompts.js

This file was deleted.

5 changes: 0 additions & 5 deletions generators/ci-cd/generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
import chalk from 'chalk';

import BaseApplicationGenerator from '../base-application/index.js';
import statistics from '../statistics.js';
import { GENERATOR_CI_CD } from '../generator-list.js';
import { clientFrameworkTypes } from '../../jdl/jhipster/index.js';
import { createPomStorage } from '../maven/support/pom-store.js';
import command from './command.js';
Expand Down Expand Up @@ -112,9 +110,6 @@ export default class CiCdGenerator extends BaseApplicationGenerator {
// Public API method used by the getter and also by Blueprints
get writing() {
return this.asWritingTaskGroup({
insight() {
statistics.sendSubGenEvent('generator', GENERATOR_CI_CD);
},
async writeFiles({ application }) {
await this.writeFiles({
blocks: [
Expand Down
20 changes: 0 additions & 20 deletions generators/client/generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import { writeFiles as writeCommonFiles } from './files-common.js';
import { addEnumerationFiles } from './entity-files.js';

import { LOGIN_REGEX_JS } from '../generator-constants.js';
import statistics from '../statistics.js';
import { GENERATOR_CYPRESS, GENERATOR_COMMON, GENERATOR_CLIENT } from '../generator-list.js';

import { testFrameworkTypes, clientFrameworkTypes } from '../../jdl/jhipster/index.js';
Expand Down Expand Up @@ -212,25 +211,6 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
return this.delegateTasksToBlueprint(() => this.preparingEachEntity);
}

get default() {
return this.asDefaultTaskGroup({
insight({ application }) {
statistics.sendSubGenEvent('generator', GENERATOR_CLIENT, {
app: {
clientFramework: application.clientFramework,
enableTranslation: application.enableTranslation,
nativeLanguage: application.nativeLanguage,
languages: application.languages,
},
});
},
});
}

get [BaseApplicationGenerator.DEFAULT]() {
return this.delegateTasksToBlueprint(() => this.default);
}

// Public API method used by the getter and also by Blueprints
get writing() {
return this.asWritingTaskGroup({
Expand Down
6 changes: 1 addition & 5 deletions generators/docker-compose/generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,10 @@ import BaseWorkspacesGenerator from '../base-workspaces/index.js';

import { writeFiles } from './files.js';
import { deploymentOptions, monitoringTypes, serviceDiscoveryTypes } from '../../jdl/jhipster/index.js';
import { GENERATOR_BOOTSTRAP_WORKSPACES, GENERATOR_DOCKER_COMPOSE } from '../generator-list.js';
import { GENERATOR_BOOTSTRAP_WORKSPACES } from '../generator-list.js';
import { stringHashCode, createFaker, convertSecretToBase64, createBase64Secret } from '../base/support/index.js';
import { checkDocker } from '../base-workspaces/internal/docker-base.js';
import { loadDockerDependenciesTask } from '../base-workspaces/internal/index.js';
import statistics from '../statistics.js';
import command from './command.js';
import { loadDerivedPlatformConfig, loadPlatformConfig } from '../server/support/index.js';

Expand Down Expand Up @@ -169,9 +168,6 @@ export default class DockerComposeGenerator extends BaseWorkspacesGenerator {

get default() {
return {
insight() {
statistics.sendSubGenEvent('generator', GENERATOR_DOCKER_COMPOSE);
},
async setAppsYaml({ workspaces, deployment, applications }) {
const faker = await createFaker();

Expand Down
6 changes: 0 additions & 6 deletions generators/export-jdl/generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ import chalk from 'chalk';

import BaseGenerator from '../base/index.js';

import statistics from '../statistics.js';
import { GENERATOR_EXPORT_JDL } from '../generator-list.js';
import { applicationOptions } from '../../jdl/jhipster/index.js';
import JSONToJDLConverter from '../../jdl/converters/json-to-jdl-converter.js';
import type { JHipsterGeneratorOptions, JHipsterGeneratorFeatures } from '../base/api.js';
Expand Down Expand Up @@ -50,10 +48,6 @@ export default class extends BaseGenerator {

get [BaseGenerator.DEFAULT]() {
return this.asDefaultTaskGroup({
insight() {
statistics.sendSubGenEvent('generator', GENERATOR_EXPORT_JDL);
},

convertToJDL() {
try {
const jdlObject = JSONToJDLConverter.convertToJDL(this.destinationPath(), false);
Expand Down
6 changes: 0 additions & 6 deletions generators/heroku/generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ import { glob } from 'glob';

import BaseGenerator from '../base-application/index.js';

import statistics from '../statistics.js';
import { JAVA_COMPATIBLE_VERSIONS, JAVA_VERSION, SERVER_MAIN_RES_DIR } from '../generator-constants.js';
import { GENERATOR_HEROKU } from '../generator-list.js';
import { mavenProfileContent } from './templates.js';
import { createPomStorage } from '../maven/support/pom-store.js';
import { addGradlePluginCallback, applyFromGradleCallback } from '../gradle/internal/needles.js';
Expand Down Expand Up @@ -214,10 +212,6 @@ export default class HerokuGenerator extends BaseGenerator {

get default() {
return this.asDefaultTaskGroup({
insight() {
statistics.sendSubGenEvent('generator', GENERATOR_HEROKU);
},

async gitInit() {
if (!this.herokuDeployType === 'git') return;

Expand Down
4 changes: 0 additions & 4 deletions generators/jdl/generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import { CLI_NAME } from '../../cli/utils.mjs';
import { GENERATOR_APP, GENERATOR_ENTITIES, GENERATOR_WORKSPACES } from '../generator-list.js';
import { ApplicationWithEntities, createImporterFromContent } from '../../jdl/jdl-importer.js';
import { GENERATOR_JHIPSTER, JHIPSTER_CONFIG_DIR } from '../generator-constants.js';
import statistics from '../statistics.js';
import { addApplicationIndex, allNewApplications, customizeForMicroservices } from './internal/index.js';
import { mergeYoRcContent } from '../../jdl/index.js';
import { normalizeBlueprintName } from '../base/internal/blueprint.js';
Expand Down Expand Up @@ -104,9 +103,6 @@ export default class JdlGenerator extends BaseGenerator {

get configuring() {
return this.asConfiguringTaskGroup({
insight() {
statistics.sendSubGenEvent('generator', 'import-jdl');
},
async downloadJdlFiles() {
if (this.jdlFiles) {
this.jdlFiles = await Promise.all(
Expand Down
6 changes: 0 additions & 6 deletions generators/kubernetes-helm/generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import BaseWorkspacesGenerator from '../base-workspaces/index.js';

import prompts from '../kubernetes/prompts.js';
import { writeFiles } from './files.js';
import { GENERATOR_KUBERNETES_HELM } from '../generator-list.js';
import { checkImages, generateJwtSecret, configureImageNames, loadFromYoRc } from '../base-workspaces/internal/docker-base.js';
import {
checkKubernetes,
Expand All @@ -34,7 +33,6 @@ import {
setupHelmConstants,
derivedKubernetesPlatformProperties,
} from '../kubernetes/kubernetes-base.js';
import statistics from '../statistics.js';
import { messageBrokerTypes } from '../../jdl/jhipster/index.js';
import { getJdbcUrl, getR2dbcUrl } from '../spring-data-relational/support/index.js';
import { loadDeploymentConfig, loadDockerDependenciesTask } from '../base-workspaces/internal/index.js';
Expand Down Expand Up @@ -103,10 +101,6 @@ export default class KubernetesHelmGenerator extends BaseWorkspacesGenerator {

get configuring() {
return {
insight() {
statistics.sendSubGenEvent('generator', GENERATOR_KUBERNETES_HELM);
},

generateJwtSecret,
};
}
Expand Down
6 changes: 0 additions & 6 deletions generators/kubernetes-knative/generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import BaseWorkspacesGenerator from '../base-workspaces/index.js';

import prompts from './prompts.js';
import { writeFiles } from './files.js';
import { GENERATOR_KUBERNETES_KNATIVE } from '../generator-list.js';
import { checkImages, generateJwtSecret, configureImageNames, loadFromYoRc } from '../base-workspaces/internal/docker-base.js';
import {
checkHelm,
Expand All @@ -34,7 +33,6 @@ import {
setupHelmConstants,
derivedKubernetesPlatformProperties,
} from '../kubernetes/kubernetes-base.js';
import statistics from '../statistics.js';
import { kubernetesPlatformTypes, buildToolTypes, messageBrokerTypes } from '../../jdl/jhipster/index.js';
import { getJdbcUrl } from '../spring-data-relational/support/index.js';
import { loadDeploymentConfig, loadDockerDependenciesTask } from '../base-workspaces/internal/index.js';
Expand Down Expand Up @@ -121,10 +119,6 @@ export default class KubernetesKnativeGenerator extends BaseWorkspacesGenerator

get configuring() {
return {
insight() {
statistics.sendSubGenEvent('generator', GENERATOR_KUBERNETES_KNATIVE);
},

generateJwtSecret,
};
}
Expand Down
6 changes: 0 additions & 6 deletions generators/kubernetes/generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import BaseWorkspacesGenerator from '../base-workspaces/index.js';
import prompts from './prompts.js';
import { writeFiles } from './files.js';
import { buildToolTypes, messageBrokerTypes } from '../../jdl/jhipster/index.js';
import { GENERATOR_KUBERNETES } from '../generator-list.js';
import statistics from '../statistics.js';

import { checkImages, generateJwtSecret, configureImageNames, loadFromYoRc } from '../base-workspaces/internal/docker-base.js';
import { checkKubernetes, loadConfig, setupKubernetesConstants, derivedKubernetesPlatformProperties } from './kubernetes-base.js';
Expand Down Expand Up @@ -98,10 +96,6 @@ export default class KubernetesGenerator extends BaseWorkspacesGenerator {

get configuring() {
return {
insight() {
statistics.sendSubGenEvent('generator', GENERATOR_KUBERNETES);
},

generateJwtSecret,
};
}
Expand Down
7 changes: 0 additions & 7 deletions generators/languages/generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ import { padEnd, startCase } from 'lodash-es';

import BaseApplicationGenerator from '../base-application/index.js';
import { askForLanguages, askI18n } from './prompts.js';
import statistics from '../statistics.js';
import { GENERATOR_LANGUAGES } from '../generator-list.js';
import { clientI18nFiles } from './files.js';
import { writeEntityFiles } from './entity-files.js';
import TranslationData, { createTranslationsFileFilter, createTranslationsFilter } from './translation-data.js';
Expand Down Expand Up @@ -241,10 +239,6 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {

control.getWebappTranslation = (...args) => this.translationData.getClientTranslation(...args);
},

insight() {
statistics.sendSubGenEvent('generator', GENERATOR_LANGUAGES);
},
});
}

Expand Down Expand Up @@ -306,7 +300,6 @@ export default class LanguagesGenerator extends BaseApplicationGenerator {
},
});
}
statistics.sendSubGenEvent('languages/language', language);
}),
);
},
Expand Down
23 changes: 1 addition & 22 deletions generators/server/generator.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import {
} from './support/index.js';
import { askForOptionalItems, askForServerSideOpts, askForServerTestOpts } from './prompts.js';

import { GENERATOR_COMMON, GENERATOR_SERVER, GENERATOR_SPRING_BOOT } from '../generator-list.js';
import { GENERATOR_COMMON, GENERATOR_SPRING_BOOT } from '../generator-list.js';
import BaseApplicationGenerator from '../base-application/index.js';
import { packageJson } from '../../lib/index.js';
import {
Expand All @@ -50,7 +50,6 @@ import {
JAVA_COMPATIBLE_VERSIONS,
JHIPSTER_DEPENDENCIES_VERSION,
} from '../generator-constants.js';
import statistics from '../statistics.js';

import {
applicationTypes,
Expand Down Expand Up @@ -520,26 +519,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
);
}
},

insight({ application }) {
statistics.sendSubGenEvent('generator', GENERATOR_SERVER, {
app: {
authenticationType: application.authenticationType,
cacheProvider: application.cacheProvider,
enableHibernateCache: application.enableHibernateCache,
websocket: application.websocket,
databaseType: application.databaseType,
devDatabaseType: application.devDatabaseType,
prodDatabaseType: application.prodDatabaseType,
searchEngine: application.searchEngine,
messageBroker: application.messageBroker,
serviceDiscoveryType: application.serviceDiscoveryType,
buildTool: application.buildTool,
enableSwaggerCodegen: application.enableSwaggerCodegen,
enableGradleEnterprise: application.enableGradleEnterprise,
},
});
},
});
}

Expand Down
Loading
Loading