diff --git a/.gitignore b/.gitignore index 8bb515a8..3d2f88ce 100644 --- a/.gitignore +++ b/.gitignore @@ -134,7 +134,7 @@ dist .nx/workspace-data **/v6y-database/** -**/code-analysis-workspace/** +**/v6y-code-analysis-workspace/** **/jest-cache/** **/jest-stare/** **/v6y-logs/** diff --git a/v6y-apps/bfb-main-analyzer/env-template b/v6y-apps/bfb-main-analyzer/env-template index 3e22fd2a..e7c88553 100644 --- a/v6y-apps/bfb-main-analyzer/env-template +++ b/v6y-apps/bfb-main-analyzer/env-template @@ -13,4 +13,6 @@ V6Y_MAIN_API_PATH=/v6y/bfb-main/ V6Y_MAIN_API_PORT=4005 V6Y_STATIC_ANALYZER_API_PATH=http://localhost:port/v6y/bfb-static-auditor/auditor/start-static-auditor.json -V6Y_DYNAMIC_ANALYZER_API_PATH=http://localhost:port/v6y/bfb-dynamic-auditor/auditor/start-dynamic-auditor.json \ No newline at end of file +V6Y_DYNAMIC_ANALYZER_API_PATH=http://localhost:port/v6y/bfb-dynamic-auditor/auditor/start-dynamic-auditor.json + +ZIP_BASE_DIR=../../v6y-code-analysis-workspace \ No newline at end of file diff --git a/v6y-apps/bfb-main-analyzer/src/managers/ApplicationManager.ts b/v6y-apps/bfb-main-analyzer/src/managers/ApplicationManager.ts index 1425ab72..fac1444f 100644 --- a/v6y-apps/bfb-main-analyzer/src/managers/ApplicationManager.ts +++ b/v6y-apps/bfb-main-analyzer/src/managers/ApplicationManager.ts @@ -2,17 +2,16 @@ import { AppLogger, ApplicationProvider, ApplicationType, - RepositoryApi, + RegistryManager, ZipUtils, } from '@v6y/core-logic'; import ServerConfig from '../config/ServerConfig.ts'; -const { getRepositoryDetails, getRepositoryBranches, prepareGitBranchZipConfig } = RepositoryApi; +const { getRepositoryDetails, getRepositoryBranches, prepareGitBranchZipConfig } = RegistryManager; const { getCurrentConfig } = ServerConfig; const { staticAuditorApiPath, dynamicAuditorApiPath } = getCurrentConfig() || {}; -const ZIP_BASE_DIR = '../code-analysis-workspace'; interface BuildApplicationBranchParams { name: string; @@ -100,10 +99,18 @@ const buildApplicationDetailsByBranch = async ({ application, branch }: BuildApp application, ); AppLogger.info('[ApplicationManager - buildApplicationDetailsByBranch] branch: ', branch); + AppLogger.info( + '[ApplicationManager - buildApplicationDetailsByBranch] ZIP_BASE_DIR: ', + process.env.ZIP_BASE_DIR, + ); + + if (!process.env.ZIP_BASE_DIR?.length) { + return false; + } const { zipSourceUrl, zipDestinationDir, zipFileName, zipBaseFileName, zipOptions } = prepareGitBranchZipConfig({ - zipBaseDir: ZIP_BASE_DIR, + zipBaseDir: process.env.ZIP_BASE_DIR, application, branchName: branch?.name || '', }) || {}; @@ -249,6 +256,31 @@ const buildDynamicReports = async ({ application }: BuildApplicationParams) => { */ const buildApplicationReports = async (application: ApplicationType) => { try { + AppLogger.info( + '[ApplicationManager - buildApplicationReports] application name: ', + application?.name, + ); + AppLogger.info( + '[ApplicationManager - buildApplicationReports] application acronym: ', + application?.acronym, + ); + AppLogger.info( + '[ApplicationManager - buildApplicationReports] application contactMail: ', + application?.contactMail, + ); + AppLogger.info( + '[ApplicationManager - buildApplicationReports] application description: ', + application?.description, + ); + AppLogger.info( + '[ApplicationManager - buildApplicationReports] application repo organization: ', + application?.repo?.organization, + ); + AppLogger.info( + '[ApplicationManager - buildApplicationReports] application repo gitUrl: ', + application?.repo?.gitUrl, + ); + if ( !application?.name?.length || !application?.acronym?.length || @@ -262,11 +294,27 @@ const buildApplicationReports = async (application: ApplicationType) => { const { organization, gitUrl } = application.repo; const gitRepositoryName = gitUrl?.split('/')?.pop()?.replace('.git', ''); + AppLogger.info( + '[ApplicationManager - buildApplicationReports] gitRepositoryName: ', + gitRepositoryName, + ); const repositoryDetails = await getRepositoryDetails({ organization, gitRepositoryName, }); + AppLogger.info( + '[ApplicationManager - buildApplicationReports] repositoryDetails id: ', + repositoryDetails?.id, + ); + AppLogger.info( + '[ApplicationManager - buildApplicationReports] repositoryDetails archived: ', + repositoryDetails?.archived, + ); + AppLogger.info( + '[ApplicationManager - buildApplicationReports] repositoryDetails empty_repo: ', + repositoryDetails?.empty_repo, + ); if ( !repositoryDetails?.id || @@ -277,10 +325,18 @@ const buildApplicationReports = async (application: ApplicationType) => { } const { _links: repositoryLinks } = repositoryDetails; + AppLogger.info( + '[ApplicationManager - buildApplicationReports] repo_branches: ', + repositoryLinks?.repo_branches?.length, + ); const repositoryBranches = await getRepositoryBranches({ repoBranchesUrl: repositoryLinks?.repo_branches, }); + AppLogger.info( + '[ApplicationManager - buildApplicationReports] repositoryBranches: ', + repositoryBranches?.length, + ); if (!repositoryBranches?.length) { return false; @@ -327,6 +383,7 @@ const buildApplicationList = async () => { {}, { role: 'ADMIN' }, ); + AppLogger.info( '[ApplicationManager - buildApplicationList] applications: ', applications?.length, diff --git a/v6y-apps/bfb-main-analyzer/src/managers/KeywordEvolutionManager.ts b/v6y-apps/bfb-main-analyzer/src/managers/KeywordEvolutionManager.ts index 4e2a71e7..ed3973f5 100644 --- a/v6y-apps/bfb-main-analyzer/src/managers/KeywordEvolutionManager.ts +++ b/v6y-apps/bfb-main-analyzer/src/managers/KeywordEvolutionManager.ts @@ -6,7 +6,7 @@ import { KeywordProvider, auditStatus, codeSmellTypes, - dependencyStatus, + dependencyVersionStatus, } from '@v6y/core-logic'; /** @@ -28,18 +28,18 @@ const buildKeywordEvolutionList = async () => { // eslint-disable-next-line max-depth if ( !dependency.module || - !dependency.status || - dependency.status === dependencyStatus['up-to-date'] + !dependency.versionStatus || + dependency.versionStatus === dependencyVersionStatus['up-to-date'] ) { continue; } // add evolution according to keyword await EvolutionProvider.createEvolution({ - category: `${codeSmellTypes.Dependency}-${dependency.status}`, + category: `${codeSmellTypes.Dependency}-${dependency.versionStatus}`, module: { ...dependency.module, - status: dependency.status, + status: dependency.versionStatus, }, }); } diff --git a/v6y-apps/bfb-static-auditor/src/auditors/dependencies-auditor/DependenciesAuditor.ts b/v6y-apps/bfb-static-auditor/src/auditors/dependencies/DependenciesAuditor.ts similarity index 100% rename from v6y-apps/bfb-static-auditor/src/auditors/dependencies-auditor/DependenciesAuditor.ts rename to v6y-apps/bfb-static-auditor/src/auditors/dependencies/DependenciesAuditor.ts diff --git a/v6y-apps/bfb-static-auditor/src/auditors/dependencies-auditor/DependenciesUtils-test.ts b/v6y-apps/bfb-static-auditor/src/auditors/dependencies/DependenciesUtils-test.ts similarity index 100% rename from v6y-apps/bfb-static-auditor/src/auditors/dependencies-auditor/DependenciesUtils-test.ts rename to v6y-apps/bfb-static-auditor/src/auditors/dependencies/DependenciesUtils-test.ts diff --git a/v6y-apps/bfb-static-auditor/src/auditors/dependencies-auditor/DependenciesUtils.ts b/v6y-apps/bfb-static-auditor/src/auditors/dependencies/DependenciesUtils.ts similarity index 67% rename from v6y-apps/bfb-static-auditor/src/auditors/dependencies-auditor/DependenciesUtils.ts rename to v6y-apps/bfb-static-auditor/src/auditors/dependencies/DependenciesUtils.ts index 0e55bb42..e320dc4b 100644 --- a/v6y-apps/bfb-static-auditor/src/auditors/dependencies-auditor/DependenciesUtils.ts +++ b/v6y-apps/bfb-static-auditor/src/auditors/dependencies/DependenciesUtils.ts @@ -1,50 +1,13 @@ -import { - AppLogger, - AuditUtils, - DeprecatedDependencyProvider, - SemverUtils, - dependencyStatus, -} from '@v6y/core-logic'; +import { AppLogger, AuditUtils, sleep } from '@v6y/core-logic'; import { AuditCommonsType } from '../types/AuditCommonsType.ts'; import { DependencyAuditParamsType } from '../types/DependencyAuditType.ts'; +import DependencySecurityAdvisoriesAnalyzer from './DependencySecurityAdvisoriesAnalyzer.js'; +import DependencyVersionStatusAnalyzer from './DependencyVersionStatusAnalyzer.ts'; const { getFilesRecursively, getFileContent } = AuditUtils; - -const { compareVersions } = SemverUtils; - -const DEPENDENCIES_REFERENCE_API = 'https://skimdb.npmjs.com/registry/'; - -/** - * Get dependencies reference - * @param dependencyName - */ -const getDependenciesReference = async ({ dependencyName }: DependencyAuditParamsType) => { - try { - // https://skimdb.npmjs.com/registry/react-cookie - // https://docs.npmjs.com/cli/v8/using-npm/registry - const dependencyReferenceResponse = await fetch( - `${DEPENDENCIES_REFERENCE_API}/${encodeURIComponent(dependencyName || '')}`, - { - method: 'GET', - headers: { 'Content-Type': 'application/json' }, - }, - ); - AppLogger.info( - `[DependenciesUtils - getDependenciesReference] dependencyReferenceResponse: ${dependencyReferenceResponse}`, - ); - - const dependencyReferenceJsonResponse = await dependencyReferenceResponse.json(); - AppLogger.info( - `[DependenciesUtils - getDependenciesReference] dependencyReferenceJsonResponse: ${dependencyReferenceJsonResponse}`, - ); - - return dependencyReferenceJsonResponse; - } catch (error) { - AppLogger.info(`[DependenciesUtils - getDependenciesReference] error: ${error}`); - return {}; - } -}; +const { analyzeDependencyVersionStatus } = DependencyVersionStatusAnalyzer; +const { analyzeDependencySecurityAdvisories } = DependencySecurityAdvisoriesAnalyzer; /** * Build dependency audit report @@ -69,46 +32,30 @@ const buildDependencyAuditReport = async ({ return {}; } - const dependencyReference = await getDependenciesReference({ dependencyName }); - AppLogger.info( - `[DependenciesUtils - buildDependencyAuditReport] dependencyReference: ${dependencyReference}`, - ); - - const recommendedVersion = dependencyReference?.['dist-tags']?.latest; - AppLogger.info( - `[DependenciesUtils - buildDependencyAuditReport] recommendedVersion: ${recommendedVersion}`, - ); - - const isOutDated = compareVersions(dependencyVersion, recommendedVersion, '<'); + const dependencyVersionStatus = await analyzeDependencyVersionStatus({ + dependencyName, + dependencyVersion, + }); AppLogger.info( - `[DependenciesUtils - buildDependencyAuditReport] isOutDated: ${isOutDated}`, + `[DependenciesUtils - buildDependencyAuditReport] dependencyVersionStatus: ${dependencyVersionStatus}`, ); - const deprecatedDependency = - await DeprecatedDependencyProvider.getDeprecatedDependencyDetailsByParams({ - name: dependencyName, - }); - const isDeprecated = deprecatedDependency?._id !== undefined || false; + const dependencySecurityAdvisories = await analyzeDependencySecurityAdvisories({ + dependencyName, + dependencyVersion, + }); AppLogger.info( - `[DependenciesUtils - buildDependencyAuditReport] isDeprecated: ${isDeprecated}`, + `[DependenciesUtils - buildDependencyAuditReport] dependencySecurityAdvisories: ${dependencySecurityAdvisories?.length}`, ); - let depStatus = dependencyStatus['up-to-date']; - if (isDeprecated) { - depStatus = dependencyStatus.deprecated; - } else if (isOutDated) { - depStatus = dependencyStatus.outdated; - } - - AppLogger.info(`[DependenciesUtils - buildDependencyAuditReport] depStatus: ${depStatus}`); - return { + module, type: 'frontend', name: dependencyName, version: dependencyVersion, - recommendedVersion: recommendedVersion || dependencyVersion, - status: depStatus, - module, + recommendedVersion: dependencyVersionStatus?.recommendedVersion || dependencyVersion, + status: dependencyVersionStatus?.depStatus, + securityAdvisories: dependencySecurityAdvisories, }; } catch (error) { AppLogger.info(`[DependenciesUtils - buildDependencyAuditReport] error: ${error}`); @@ -149,6 +96,9 @@ const buildModuleDependenciesAuditReports = async ({ }); dependenciesAuditReports.push(dependencyAuditReport); + + // to avoid GitHub rate limit, we should create delay between request + await sleep(2000); } return dependenciesAuditReports; diff --git a/v6y-apps/bfb-static-auditor/src/auditors/dependencies/DependencySecurityAdvisoriesAnalyzer.ts b/v6y-apps/bfb-static-auditor/src/auditors/dependencies/DependencySecurityAdvisoriesAnalyzer.ts new file mode 100644 index 00000000..0f153d4d --- /dev/null +++ b/v6y-apps/bfb-static-auditor/src/auditors/dependencies/DependencySecurityAdvisoriesAnalyzer.ts @@ -0,0 +1,58 @@ +import { + AppLogger, + DependencySecurityAdvisoriesType, + RegistryManager, + SemverUtils, +} from '@v6y/core-logic'; + +import { DependencyAuditParamsType } from '../types/DependencyAuditType.js'; + +const { getRepositorySecurityAdvisories } = RegistryManager; +const { normalizeVersion } = SemverUtils; + +const analyzeDependencySecurityAdvisories = async ({ + dependencyName, + dependencyVersion, +}: DependencyAuditParamsType): Promise => { + try { + AppLogger.info( + `[DependencySecurityAdvisoriesAnalyzer - analyzeDependencySecurityAdvisories] dependencyName: ${dependencyName}`, + ); + AppLogger.info( + `[DependencySecurityAdvisoriesAnalyzer - analyzeDependencySecurityAdvisories] dependencyVersion: ${dependencyVersion}`, + ); + + const normalizedDependencyVersion = normalizeVersion(dependencyVersion || ''); + AppLogger.info( + `[DependencySecurityAdvisoriesAnalyzer - analyzeDependencySecurityAdvisories] normalizedDependencyVersion: ${normalizedDependencyVersion}`, + ); + + if (!normalizedDependencyVersion?.length || !dependencyName?.length) { + return []; + } + + //https://api.github.com/advisories?per_page=100&ecosystem=npm&affects=next@14.2.8 + const dependencySecurityAdvisories = await getRepositorySecurityAdvisories({ + pageSize: '100', + affectedModule: `${dependencyName}@${normalizedDependencyVersion}`, + type: 'github', + }); + + AppLogger.info( + `[DependencySecurityAdvisoriesAnalyzer - analyzeDependencySecurityAdvisories] dependencySecurityAdvisories: ${dependencySecurityAdvisories?.length}`, + ); + + return dependencySecurityAdvisories; + } catch (error) { + AppLogger.info( + `[DependencySecurityAdvisoriesAnalyzer - analyzeDependencySecurityAdvisories] error: ${error}`, + ); + return []; + } +}; + +const DependencySecurityAdvisoriesAnalyzer = { + analyzeDependencySecurityAdvisories, +}; + +export default DependencySecurityAdvisoriesAnalyzer; diff --git a/v6y-apps/bfb-static-auditor/src/auditors/dependencies/DependencyVersionStatusAnalyzer.ts b/v6y-apps/bfb-static-auditor/src/auditors/dependencies/DependencyVersionStatusAnalyzer.ts new file mode 100644 index 00000000..ec0f5c0c --- /dev/null +++ b/v6y-apps/bfb-static-auditor/src/auditors/dependencies/DependencyVersionStatusAnalyzer.ts @@ -0,0 +1,82 @@ +import { + AppLogger, + DeprecatedDependencyProvider, + RegistryManager, + SemverUtils, + dependencyVersionStatus, +} from '@v6y/core-logic'; + +import { DependencyAuditParamsType } from '../types/DependencyAuditType.ts'; + +const { compareVersions } = SemverUtils; +const { getPackageInfos } = RegistryManager; + +/** + * Analyze dependency version status + * @param dependencyName + * @param dependencyVersion + */ +const analyzeDependencyVersionStatus = async ({ + dependencyName, + dependencyVersion, +}: DependencyAuditParamsType) => { + try { + if (!dependencyVersion || !dependencyName) { + return {}; + } + + const dependencyRegistryInfos = await getPackageInfos({ + packageName: dependencyName, + type: 'npm', + }); + + AppLogger.info( + `[DependencyVersionStatusAnalyzer - buildDependencyAuditReport] dependencyRegistryInfos: ${dependencyRegistryInfos}`, + ); + + const recommendedVersion = dependencyRegistryInfos?.['dist-tags']?.latest; + AppLogger.info( + `[DependencyVersionStatusAnalyzer - buildDependencyAuditReport] recommendedVersion: ${recommendedVersion}`, + ); + + const isOutDated = compareVersions(dependencyVersion, recommendedVersion, '<'); + AppLogger.info( + `[DependencyVersionStatusAnalyzer - buildDependencyAuditReport] isOutDated: ${isOutDated}`, + ); + + const deprecatedDependency = + await DeprecatedDependencyProvider.getDeprecatedDependencyDetailsByParams({ + name: dependencyName, + }); + const isDeprecated = deprecatedDependency?._id !== undefined || false; + AppLogger.info( + `[DependencyVersionStatusAnalyzer - buildDependencyAuditReport] isDeprecated: ${isDeprecated}`, + ); + + let depStatus = dependencyVersionStatus['up-to-date']; + if (isDeprecated) { + depStatus = dependencyVersionStatus.deprecated; + } else if (isOutDated) { + depStatus = dependencyVersionStatus.outdated; + } + AppLogger.info( + `[DependencyVersionStatusAnalyzer - buildDependencyAuditReport] depStatus: ${depStatus}`, + ); + + return { + depStatus, + recommendedVersion, + }; + } catch (error) { + AppLogger.info( + `[DependencyVersionStatusAnalyzer - getDependencyRegistryInfos] error: ${error}`, + ); + return {}; + } +}; + +const DependencyVersionStatusAnalyzer = { + analyzeDependencyVersionStatus, +}; + +export default DependencyVersionStatusAnalyzer; diff --git a/v6y-apps/bfb-static-auditor/src/workers/DependenciesAnalysisWorker.ts b/v6y-apps/bfb-static-auditor/src/workers/DependenciesAnalysisWorker.ts index 55945ead..40bd17ff 100644 --- a/v6y-apps/bfb-static-auditor/src/workers/DependenciesAnalysisWorker.ts +++ b/v6y-apps/bfb-static-auditor/src/workers/DependenciesAnalysisWorker.ts @@ -1,7 +1,7 @@ import { AppLogger, DataBaseManager, PerformancesUtils } from '@v6y/core-logic'; import { parentPort, workerData } from 'worker_threads'; -import DependenciesAuditor from '../auditors/dependencies-auditor/DependenciesAuditor.ts'; +import DependenciesAuditor from '../auditors/dependencies/DependenciesAuditor.js'; AppLogger.info('******************** Starting background Audit **************************'); diff --git a/v6y-apps/bff/src/resolvers/VitalityResolvers.ts b/v6y-apps/bff/src/resolvers/VitalityResolvers.ts index 08ebc151..6f609f15 100644 --- a/v6y-apps/bff/src/resolvers/VitalityResolvers.ts +++ b/v6y-apps/bff/src/resolvers/VitalityResolvers.ts @@ -2,7 +2,7 @@ import AccountResolvers from './account/AccountResolvers.ts'; import ApplicationResolvers from './application/ApplicationResolvers.ts'; import AuditHelpResolvers from './audit/AuditHelpResolvers.ts'; import DeprecatedDependencyResolvers from './dependency/deprecated-status/DeprecatedDependencyResolvers.ts'; -import DependencyStatusHelpResolvers from './dependency/status-help/DependencyStatusHelpResolvers.ts'; +import DependencyVersionStatusHelpResolvers from './dependency/version-status-help/DependencyVersionStatusHelpResolvers.ts'; import EvolutionHelpResolvers from './evolutions/EvolutionHelpResolvers.ts'; import FaqResolvers from './faq/FaqResolvers.ts'; import NotificationsResolvers from './notifications/NotificationsResolvers.ts'; @@ -15,7 +15,7 @@ const VitalityResolvers = { ...NotificationsResolvers.Query, ...EvolutionHelpResolvers.Query, ...AuditHelpResolvers.Query, - ...DependencyStatusHelpResolvers.Query, + ...DependencyVersionStatusHelpResolvers.Query, ...DeprecatedDependencyResolvers.Query, }, Mutation: { @@ -25,7 +25,7 @@ const VitalityResolvers = { ...NotificationsResolvers.Mutation, ...EvolutionHelpResolvers.Mutation, ...AuditHelpResolvers.Mutation, - ...DependencyStatusHelpResolvers.Mutation, + ...DependencyVersionStatusHelpResolvers.Mutation, ...DeprecatedDependencyResolvers.Mutation, }, }; diff --git a/v6y-apps/bff/src/resolvers/dependency/deprecated-status/DeprecatedDependencyMutations.ts b/v6y-apps/bff/src/resolvers/dependency/deprecated-status/DeprecatedDependencyMutations.ts index 6be68681..71772ea4 100644 --- a/v6y-apps/bff/src/resolvers/dependency/deprecated-status/DeprecatedDependencyMutations.ts +++ b/v6y-apps/bff/src/resolvers/dependency/deprecated-status/DeprecatedDependencyMutations.ts @@ -46,7 +46,7 @@ const createOrEditDeprecatedDependency = async ( }); AppLogger.info( - `[DependencyStatusHelpMutations - createOrEditDependencyStatusHelp] createdDeprecatedDependency : ${createdDeprecatedDependency?._id}`, + `[DeprecatedDependencyMutations - createOrEditDeprecatedDependency] createdDeprecatedDependency : ${createdDeprecatedDependency?._id}`, ); return createdDeprecatedDependency; diff --git a/v6y-apps/bff/src/resolvers/dependency/status-help/DependencyStatusHelpMutations.ts b/v6y-apps/bff/src/resolvers/dependency/status-help/DependencyStatusHelpMutations.ts deleted file mode 100644 index ac8e2303..00000000 --- a/v6y-apps/bff/src/resolvers/dependency/status-help/DependencyStatusHelpMutations.ts +++ /dev/null @@ -1,117 +0,0 @@ -import { - AppLogger, - DependencyStatusHelpInputType, - DependencyStatusHelpProvider, - SearchQueryType, -} from '@v6y/core-logic'; - -/** - * Create or edit dependency status help - * @param _ - * @param params - */ -const createOrEditDependencyStatusHelp = async ( - _: unknown, - params: { dependencyStatusHelpInput: DependencyStatusHelpInputType }, -) => { - try { - const { _id, title, description, category, links } = - params?.dependencyStatusHelpInput || {}; - - AppLogger.info( - `[DependencyStatusHelpMutations - createOrEditDependencyStatusHelp] _id : ${_id}`, - ); - AppLogger.info( - `[DependencyStatusHelpMutations - createOrEditDependencyStatusHelp] title : ${title}`, - ); - AppLogger.info( - `[DependencyStatusHelpMutations - createOrEditDependencyStatusHelp] description : ${description}`, - ); - AppLogger.info( - `[DependencyStatusHelpMutations - createOrEditDependencyStatusHelp] links : ${links?.join( - ',', - )}`, - ); - - if (_id) { - const editedDependencyStatusHelp = - await DependencyStatusHelpProvider.editDependencyStatusHelp({ - _id, - title, - description, - category, - links, - }); - - AppLogger.info( - `[DependencyStatusHelpMutations - createOrEditDependencyStatusHelp] editedDependencyStatusHelp : ${editedDependencyStatusHelp?._id}`, - ); - - return { - _id, - }; - } - - const createdDependencyStatusHelp = - await DependencyStatusHelpProvider.createDependencyStatusHelp({ - title, - description, - category, - links, - }); - - AppLogger.info( - `[DependencyStatusHelpMutations - createOrEditDependencyStatusHelp] createdDependencyStatusHelp : ${createdDependencyStatusHelp?._id}`, - ); - - return createdDependencyStatusHelp; - } catch (error) { - AppLogger.info( - `[DependencyStatusHelpMutations - createOrEditDependencyStatusHelp] error : ${error}`, - ); - return null; - } -}; - -/** - * Delete dependency status help - * @param _ - * @param params - */ -const deleteDependencyStatusHelp = async (_: unknown, params: { input: SearchQueryType }) => { - try { - const whereClause = params?.input?.where; - if (!whereClause) { - return null; - } - - const dependencyStatusHelpId = whereClause.id; - if (!dependencyStatusHelpId) { - return null; - } - - AppLogger.info( - `[DependencyStatusHelpMutations - deleteDependencyStatusHelp] dependencyStatusHelpId : ${dependencyStatusHelpId}`, - ); - - await DependencyStatusHelpProvider.deleteDependencyStatusHelp({ - _id: parseInt(dependencyStatusHelpId, 10), - }); - - return { - _id: dependencyStatusHelpId, - }; - } catch (error) { - AppLogger.info( - `[DependencyStatusHelpMutations - deleteDependencyStatusHelp] error : ${error}`, - ); - return null; - } -}; - -const DependencyStatusHelpMutations = { - createOrEditDependencyStatusHelp, - deleteDependencyStatusHelp, -}; - -export default DependencyStatusHelpMutations; diff --git a/v6y-apps/bff/src/resolvers/dependency/status-help/DependencyStatusHelpQueries.ts b/v6y-apps/bff/src/resolvers/dependency/status-help/DependencyStatusHelpQueries.ts deleted file mode 100644 index 2038c742..00000000 --- a/v6y-apps/bff/src/resolvers/dependency/status-help/DependencyStatusHelpQueries.ts +++ /dev/null @@ -1,90 +0,0 @@ -import { - AppLogger, - DependencyStatusHelpProvider, - DependencyStatusHelpType, - SearchQueryType, -} from '@v6y/core-logic'; - -/** - * Get Dependency Status Help List By Page And Params - * @param _ - * @param args - */ -const getDependencyStatusHelpListByPageAndParams = async (_: unknown, args: SearchQueryType) => { - try { - const { start, limit, where, sort } = args || {}; - - AppLogger.info( - `[DependencyStatusHelpQueries - getDependencyStatusHelpListByPageAndParams] start : ${start}`, - ); - AppLogger.info( - `[DependencyStatusHelpQueries - getDependencyStatusHelpListByPageAndParams] limit : ${limit}`, - ); - AppLogger.info( - `[DependencyStatusHelpQueries - getDependencyStatusHelpListByPageAndParams] where : ${where}`, - ); - AppLogger.info( - `[DependencyStatusHelpQueries - getDependencyStatusHelpListByPageAndParams] sort : ${sort}`, - ); - - const dependencyStatusHelpList = - await DependencyStatusHelpProvider.getDependencyStatusHelpListByPageAndParams({ - start, - limit, - where, - sort, - }); - - AppLogger.info( - `[DependencyStatusHelpQueries - getDependencyStatusHelpListByPageAndParams] dependencyStatusHelpList : ${dependencyStatusHelpList?.length}`, - ); - - return dependencyStatusHelpList; - } catch (error) { - AppLogger.info( - `[DependencyStatusHelpQueries - getDependencyStatusHelpListByPageAndParams] error : ${error}`, - ); - return []; - } -}; - -/** - * Get Dependency Status Help Details By Params - * @param _ - * @param args - */ -const getDependencyStatusHelpDetailsByParams = async ( - _: unknown, - args: DependencyStatusHelpType, -) => { - try { - const { _id } = args || {}; - - AppLogger.info( - `[DependencyStatusHelpQueries - getDependencyStatusHelpDetailsByParams] _id : ${_id}`, - ); - - const dependencyStatusDetails = - await DependencyStatusHelpProvider.getDependencyStatusHelpDetailsByParams({ - _id, - }); - - AppLogger.info( - `[DependencyStatusHelpQueries - getDependencyStatusHelpDetailsByParams] dependencyStatusDetails : ${dependencyStatusDetails?._id}`, - ); - - return dependencyStatusDetails; - } catch (error) { - AppLogger.info( - `[DependencyStatusHelpQueries - getDependencyStatusHelpDetailsByParams] error : ${error}`, - ); - return null; - } -}; - -const DependencyStatusHelpQueries = { - getDependencyStatusHelpListByPageAndParams, - getDependencyStatusHelpDetailsByParams, -}; - -export default DependencyStatusHelpQueries; diff --git a/v6y-apps/bff/src/resolvers/dependency/status-help/DependencyStatusHelpResolvers.ts b/v6y-apps/bff/src/resolvers/dependency/status-help/DependencyStatusHelpResolvers.ts deleted file mode 100644 index 4905eff4..00000000 --- a/v6y-apps/bff/src/resolvers/dependency/status-help/DependencyStatusHelpResolvers.ts +++ /dev/null @@ -1,13 +0,0 @@ -import DependencyStatusHelpMutations from './DependencyStatusHelpMutations.ts'; -import DependencyStatusHelpQueries from './DependencyStatusHelpQueries.ts'; - -const DependencyStatusHelpResolvers = { - Query: { - ...DependencyStatusHelpQueries, - }, - Mutation: { - ...DependencyStatusHelpMutations, - }, -}; - -export default DependencyStatusHelpResolvers; diff --git a/v6y-apps/bff/src/resolvers/dependency/version-status-help/DependencyVersionStatusHelpMutations.ts b/v6y-apps/bff/src/resolvers/dependency/version-status-help/DependencyVersionStatusHelpMutations.ts new file mode 100644 index 00000000..fe13c0e3 --- /dev/null +++ b/v6y-apps/bff/src/resolvers/dependency/version-status-help/DependencyVersionStatusHelpMutations.ts @@ -0,0 +1,120 @@ +import { + AppLogger, + DependencyVersionStatusHelpInputType, + DependencyVersionStatusHelpProvider, + SearchQueryType, +} from '@v6y/core-logic'; + +/** + * Create or edit dependency version status help + * @param _ + * @param params + */ +const createOrEditDependencyVersionStatusHelp = async ( + _: unknown, + params: { dependencyVersionStatusHelpInput: DependencyVersionStatusHelpInputType }, +) => { + try { + const { _id, title, description, category, links } = + params?.dependencyVersionStatusHelpInput || {}; + + AppLogger.info( + `[DependencyVersionStatusHelpMutations - createOrEditDependencyVersionStatusHelp] _id : ${_id}`, + ); + AppLogger.info( + `[DependencyVersionStatusHelpMutations - createOrEditDependencyVersionStatusHelp] title : ${title}`, + ); + AppLogger.info( + `[DependencyVersionStatusHelpMutations - createOrEditDependencyVersionStatusHelp] description : ${description}`, + ); + AppLogger.info( + `[DependencyVersionStatusHelpMutations - createOrEditDependencyVersionStatusHelp] links : ${links?.join( + ',', + )}`, + ); + + if (_id) { + const editedDependencyVersionStatusHelp = + await DependencyVersionStatusHelpProvider.editDependencyVersionStatusHelp({ + _id, + title, + description, + category, + links, + }); + + AppLogger.info( + `[DependencyVersionStatusHelpMutations - createOrEditDependencyVersionStatusHelp] editedDependencyVersionStatusHelp : ${editedDependencyVersionStatusHelp?._id}`, + ); + + return { + _id, + }; + } + + const createdDependencyVersionStatusHelp = + await DependencyVersionStatusHelpProvider.createDependencyVersionStatusHelp({ + title, + description, + category, + links, + }); + + AppLogger.info( + `[DependencyVersionStatusHelpMutations - createOrEditDependencyVersionStatusHelp] createdDependencyVersionStatusHelp : ${createdDependencyVersionStatusHelp?._id}`, + ); + + return createdDependencyVersionStatusHelp; + } catch (error) { + AppLogger.info( + `[DependencyVersionStatusHelpMutations - createOrEditDependencyVersionStatusHelp] error : ${error}`, + ); + return null; + } +}; + +/** + * Delete dependency version status help + * @param _ + * @param params + */ +const deleteDependencyVersionStatusHelp = async ( + _: unknown, + params: { input: SearchQueryType }, +) => { + try { + const whereClause = params?.input?.where; + if (!whereClause) { + return null; + } + + const dependencyVersionStatusHelpId = whereClause.id; + if (!dependencyVersionStatusHelpId) { + return null; + } + + AppLogger.info( + `[DependencyVersionStatusHelpMutations - deleteDependencyVersionStatusHelp] dependencyVersionStatusHelpId : ${dependencyVersionStatusHelpId}`, + ); + + await DependencyVersionStatusHelpProvider.deleteDependencyVersionStatusHelp({ + _id: parseInt(dependencyVersionStatusHelpId, 10), + }); + + return { + _id: dependencyVersionStatusHelpId, + }; + } catch (error) { + AppLogger.info( + `[DependencyVersionStatusHelpMutations - deleteDependencyVersionStatusHelp] error : ${error}`, + ); + return null; + } +}; + +const DependencyVersionStatusHelpMutations = { + createOrEditDependencyVersionStatusHelp, + deleteDependencyVersionStatusHelp, +}; + +export default DependencyVersionStatusHelpMutations; diff --git a/v6y-apps/bff/src/resolvers/dependency/version-status-help/DependencyVersionStatusHelpQueries.ts b/v6y-apps/bff/src/resolvers/dependency/version-status-help/DependencyVersionStatusHelpQueries.ts new file mode 100644 index 00000000..86b1bbf5 --- /dev/null +++ b/v6y-apps/bff/src/resolvers/dependency/version-status-help/DependencyVersionStatusHelpQueries.ts @@ -0,0 +1,97 @@ +import { + AppLogger, + DependencyVersionStatusHelpProvider, + DependencyVersionStatusHelpType, + SearchQueryType, +} from '@v6y/core-logic'; + +/** + * Get Dependency Version Status Help List By Page And Params + * @param _ + * @param args + */ +const getDependencyVersionStatusHelpListByPageAndParams = async ( + _: unknown, + args: SearchQueryType, +) => { + try { + const { start, limit, where, sort } = args || {}; + + AppLogger.info( + `[DependencyVersionStatusHelpQueries - getDependencyVersionStatusHelpListByPageAndParams] start : ${start}`, + ); + AppLogger.info( + `[DependencyVersionStatusHelpQueries - getDependencyVersionStatusHelpListByPageAndParams] limit : ${limit}`, + ); + AppLogger.info( + `[DependencyVersionStatusHelpQueries - getDependencyVersionStatusHelpListByPageAndParams] where : ${where}`, + ); + AppLogger.info( + `[DependencyVersionStatusHelpQueries - getDependencyVersionStatusHelpListByPageAndParams] sort : ${sort}`, + ); + + const dependencyVersionStatusHelpList = + await DependencyVersionStatusHelpProvider.getDependencyVersionStatusHelpListByPageAndParams( + { + start, + limit, + where, + sort, + }, + ); + + AppLogger.info( + `[DependencyVersionStatusHelpQueries - getDependencyVersionStatusHelpListByPageAndParams] dependencyVersionStatusHelpList : ${dependencyVersionStatusHelpList?.length}`, + ); + + return dependencyVersionStatusHelpList; + } catch (error) { + AppLogger.info( + `[DependencyVersionStatusHelpQueries - getDependencyVersionStatusHelpListByPageAndParams] error : ${error}`, + ); + return []; + } +}; + +/** + * Get Dependency Version Status Help Details By Params + * @param _ + * @param args + */ +const getDependencyVersionStatusHelpDetailsByParams = async ( + _: unknown, + args: DependencyVersionStatusHelpType, +) => { + try { + const { _id } = args || {}; + + AppLogger.info( + `[DependencyVersionStatusHelpQueries - getDependencyVersionStatusHelpDetailsByParams] _id : ${_id}`, + ); + + const dependencyVersionStatusDetails = + await DependencyVersionStatusHelpProvider.getDependencyVersionStatusHelpDetailsByParams( + { + _id, + }, + ); + + AppLogger.info( + `[DependencyVersionStatusHelpQueries - getDependencyVersionStatusHelpDetailsByParams] dependencyVersionStatusDetails : ${dependencyVersionStatusDetails?._id}`, + ); + + return dependencyVersionStatusDetails; + } catch (error) { + AppLogger.info( + `[DependencyVersionStatusHelpQueries - getDependencyVersionStatusHelpDetailsByParams] error : ${error}`, + ); + return null; + } +}; + +const DependencyVersionStatusHelpQueries = { + getDependencyVersionStatusHelpListByPageAndParams, + getDependencyVersionStatusHelpDetailsByParams, +}; + +export default DependencyVersionStatusHelpQueries; diff --git a/v6y-apps/bff/src/resolvers/dependency/version-status-help/DependencyVersionStatusHelpResolvers.ts b/v6y-apps/bff/src/resolvers/dependency/version-status-help/DependencyVersionStatusHelpResolvers.ts new file mode 100644 index 00000000..a2bcaa48 --- /dev/null +++ b/v6y-apps/bff/src/resolvers/dependency/version-status-help/DependencyVersionStatusHelpResolvers.ts @@ -0,0 +1,13 @@ +import DependencyVersionStatusHelpMutations from './DependencyVersionStatusHelpMutations.ts'; +import DependencyVersionStatusHelpQueries from './DependencyVersionStatusHelpQueries.ts'; + +const DependencyVersionStatusHelpResolvers = { + Query: { + ...DependencyVersionStatusHelpQueries, + }, + Mutation: { + ...DependencyVersionStatusHelpMutations, + }, +}; + +export default DependencyVersionStatusHelpResolvers; diff --git a/v6y-apps/bff/src/types/VitalityTypes.ts b/v6y-apps/bff/src/types/VitalityTypes.ts index 95656661..48efda1b 100644 --- a/v6y-apps/bff/src/types/VitalityTypes.ts +++ b/v6y-apps/bff/src/types/VitalityTypes.ts @@ -34,12 +34,12 @@ import DeprecatedDependencyDeleteOutput from './dependency/deprecated-status/Dep import DeprecatedDependencyMutationsType from './dependency/deprecated-status/DeprecatedDependencyMutationsType.ts'; import DeprecatedDependencyQueriesType from './dependency/deprecated-status/DeprecatedDependencyQueriesType.ts'; import DeprecatedDependencyType from './dependency/deprecated-status/DeprecatedDependencyType.ts'; -import DependencyStatusHelpCreateOrEditInput from './dependency/status-help/DependencyStatusHelpCreateOrEditInput.ts'; -import DependencyStatusHelpDeleteInput from './dependency/status-help/DependencyStatusHelpDeleteInput.ts'; -import DependencyStatusHelpDeleteOutput from './dependency/status-help/DependencyStatusHelpDeleteOutput.ts'; -import DependencyStatusHelpMutationsType from './dependency/status-help/DependencyStatusHelpMutationsType.ts'; -import DependencyStatusHelpQueriesType from './dependency/status-help/DependencyStatusHelpQueriesType.ts'; -import DependencyStatusHelpType from './dependency/status-help/DependencyStatusHelpType.ts'; +import DependencyVersionStatusHelpCreateOrEditInput from './dependency/version-status-help/DependencyVersionStatusHelpCreateOrEditInput.ts'; +import DependencyVersionStatusHelpDeleteInput from './dependency/version-status-help/DependencyVersionStatusHelpDeleteInput.ts'; +import DependencyVersionStatusHelpDeleteOutput from './dependency/version-status-help/DependencyVersionStatusHelpDeleteOutput.ts'; +import DependencyVersionStatusHelpMutationsType from './dependency/version-status-help/DependencyVersionStatusHelpMutationsType.ts'; +import DependencyVersionStatusHelpQueriesType from './dependency/version-status-help/DependencyVersionStatusHelpQueriesType.ts'; +import DependencyVersionStatusHelpType from './dependency/version-status-help/DependencyVersionStatusHelpType.ts'; import EvolutionType from './evolution/EvolutionType.ts'; import EvolutionHelpCreateOrEditInput from './evolution/help/EvolutionHelpCreateOrEditInput.ts'; import EvolutionHelpDeleteInput from './evolution/help/EvolutionHelpDeleteInput.ts'; @@ -72,7 +72,7 @@ const VitalityTypes = gql(` ${RepositoryType} ${KeywordType} ${DeprecatedDependencyType} - ${DependencyStatusHelpType} + ${DependencyVersionStatusHelpType} ${DependencyType} ${KeywordStatsType} @@ -94,7 +94,7 @@ const VitalityTypes = gql(` ${NotificationQueriesType} ${EvolutionHelpQueriesType} ${AuditHelpQueriesType} - ${DependencyStatusHelpQueriesType} + ${DependencyVersionStatusHelpQueriesType} ${DeprecatedDependencyQueriesType} ${AccountQueriesType} @@ -124,10 +124,10 @@ const VitalityTypes = gql(` ${AuditHelpDeleteInput} ${AuditHelpMutationsType} - ${DependencyStatusHelpCreateOrEditInput} - ${DependencyStatusHelpDeleteOutput} - ${DependencyStatusHelpDeleteInput} - ${DependencyStatusHelpMutationsType} + ${DependencyVersionStatusHelpCreateOrEditInput} + ${DependencyVersionStatusHelpDeleteOutput} + ${DependencyVersionStatusHelpDeleteInput} + ${DependencyVersionStatusHelpMutationsType} ${DeprecatedDependencyCreateOrEditInput} ${DeprecatedDependencyDeleteOutput} diff --git a/v6y-apps/bff/src/types/dependency/DependencyType.ts b/v6y-apps/bff/src/types/dependency/DependencyType.ts index 86e780e4..58d7487f 100644 --- a/v6y-apps/bff/src/types/dependency/DependencyType.ts +++ b/v6y-apps/bff/src/types/dependency/DependencyType.ts @@ -16,11 +16,14 @@ const DependencyType = ` """ Dependency Recommended Version """ recommendedVersion: String - """ Dependency status (deprecated, outdated or up-to-date) """ - status: String + """ Dependency version status (deprecated, outdated or up-to-date) """ + versionStatus: String - """ Dependency Status help """ - statusHelp: DependencyStatusHelpType + """ Dependency Version Status help """ + versionStatusHelp: DependencyVersionStatusHelpType + + """ Dependency Security Advisories """ + securityAdvisories: [DependencySecurityAdvisoriesType] """ Dependency Concerned Module """ module: ModuleType diff --git a/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpCreateOrEditInput.ts b/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpCreateOrEditInput.ts deleted file mode 100644 index cbe3134b..00000000 --- a/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpCreateOrEditInput.ts +++ /dev/null @@ -1,20 +0,0 @@ -const DependencyStatusHelpCreateOrEditInput = ` - input DependencyStatusHelpCreateOrEditInput { - """ Dependency StatusHelp Unique id """ - _id: Int! - - """ Dependency Status Help Title """ - title: String! - - """ Dependency Status Help Description """ - description: String! - - """ Dependency Status Help Category """ - category: String! - - """ Dependency Status Help Extra Links """ - links: [String] - } -`; - -export default DependencyStatusHelpCreateOrEditInput; diff --git a/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpDeleteInput.ts b/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpDeleteInput.ts deleted file mode 100644 index f82cd014..00000000 --- a/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpDeleteInput.ts +++ /dev/null @@ -1,13 +0,0 @@ -const DependencyStatusHelpDeleteInput = ` - input DependencyStatusHelpDeleteInputClause { - """ DependencyStatus Help to delete id """ - _id: String! - } - - input DependencyStatusHelpDeleteInput { - """ DependencyStatus Help to delete id """ - where: DependencyStatusHelpDeleteInputClause! - } -`; - -export default DependencyStatusHelpDeleteInput; diff --git a/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpDeleteOutput.ts b/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpDeleteOutput.ts deleted file mode 100644 index 2e36191b..00000000 --- a/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpDeleteOutput.ts +++ /dev/null @@ -1,8 +0,0 @@ -const DependencyStatusHelpDeleteOutput = ` - type DependencyStatusHelpDeleteOutput { - """ DependencyStatus Help id """ - _id: Int! - } -`; - -export default DependencyStatusHelpDeleteOutput; diff --git a/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpMutationsType.ts b/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpMutationsType.ts deleted file mode 100644 index 94f91672..00000000 --- a/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpMutationsType.ts +++ /dev/null @@ -1,8 +0,0 @@ -const DependencyStatusHelpMutationsType = ` - type Mutation { - createOrEditDependencyStatusHelp(dependencyStatusHelpInput: DependencyStatusHelpCreateOrEditInput!): DependencyStatusHelpType - deleteDependencyStatusHelp(input: DependencyStatusHelpDeleteInput!): DependencyStatusHelpDeleteOutput - } -`; - -export default DependencyStatusHelpMutationsType; diff --git a/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpQueriesType.ts b/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpQueriesType.ts deleted file mode 100644 index abdffeac..00000000 --- a/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpQueriesType.ts +++ /dev/null @@ -1,8 +0,0 @@ -const DependencyStatusHelpQueriesType = ` - type Query { - getDependencyStatusHelpListByPageAndParams(start: Int, limit: Int, where: JSON, sort: String): [DependencyStatusHelpType] - getDependencyStatusHelpDetailsByParams(_id: Int!): DependencyStatusHelpType - } -`; - -export default DependencyStatusHelpQueriesType; diff --git a/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpType.ts b/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpType.ts deleted file mode 100644 index a2cec191..00000000 --- a/v6y-apps/bff/src/types/dependency/status-help/DependencyStatusHelpType.ts +++ /dev/null @@ -1,21 +0,0 @@ -const DependencyStatusHelpType = ` - """ Dependency Recommended help """ - type DependencyStatusHelpType { - """ Dependency Status Help Unique id """ - _id: Int! - - """ Dependency Status Help Title """ - title: String! - - """ Dependency Help Category """ - category: String! - - """ Dependency Status Help Description """ - description: String - - """ Dependency Status Help links """ - links: [LinkType] - } -`; - -export default DependencyStatusHelpType; diff --git a/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpCreateOrEditInput.ts b/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpCreateOrEditInput.ts new file mode 100644 index 00000000..86846f52 --- /dev/null +++ b/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpCreateOrEditInput.ts @@ -0,0 +1,20 @@ +const DependencyVersionStatusHelpCreateOrEditInput = ` + input DependencyVersionStatusHelpCreateOrEditInput { + """ Dependency Version Status Help Unique id """ + _id: Int! + + """ Dependency Version Status Help Title """ + title: String! + + """ Dependency Version Status Help Description """ + description: String! + + """ Dependency Version Status Help Category """ + category: String! + + """ Dependency Version Status Help Extra Links """ + links: [String] + } +`; + +export default DependencyVersionStatusHelpCreateOrEditInput; diff --git a/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpDeleteInput.ts b/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpDeleteInput.ts new file mode 100644 index 00000000..0571a27c --- /dev/null +++ b/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpDeleteInput.ts @@ -0,0 +1,13 @@ +const DependencyVersionStatusHelpDeleteInput = ` + input DependencyVersionStatusHelpDeleteInputClause { + """ DependencyVersionStatus Help to delete id """ + _id: String! + } + + input DependencyVersionStatusHelpDeleteInput { + """ DependencyVersionStatus Help to delete id """ + where: DependencyVersionStatusHelpDeleteInputClause! + } +`; + +export default DependencyVersionStatusHelpDeleteInput; diff --git a/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpDeleteOutput.ts b/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpDeleteOutput.ts new file mode 100644 index 00000000..f6949654 --- /dev/null +++ b/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpDeleteOutput.ts @@ -0,0 +1,8 @@ +const DependencyVersionStatusHelpDeleteOutput = ` + type DependencyVersionStatusHelpDeleteOutput { + """ DependencyVersionStatus Help id """ + _id: Int! + } +`; + +export default DependencyVersionStatusHelpDeleteOutput; diff --git a/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpMutationsType.ts b/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpMutationsType.ts new file mode 100644 index 00000000..69f3d159 --- /dev/null +++ b/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpMutationsType.ts @@ -0,0 +1,8 @@ +const DependencyVersionStatusHelpMutationsType = ` + type Mutation { + createOrEditDependencyVersionStatusHelp(dependencyVersionStatusHelpInput: DependencyVersionStatusHelpCreateOrEditInput!): DependencyVersionStatusHelpType + deleteDependencyVersionStatusHelp(input: DependencyVersionStatusHelpDeleteInput!): DependencyVersionStatusHelpDeleteOutput + } +`; + +export default DependencyVersionStatusHelpMutationsType; diff --git a/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpQueriesType.ts b/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpQueriesType.ts new file mode 100644 index 00000000..bc3eb6f7 --- /dev/null +++ b/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpQueriesType.ts @@ -0,0 +1,8 @@ +const DependencyVersionStatusHelpQueriesType = ` + type Query { + getDependencyVersionStatusHelpListByPageAndParams(start: Int, limit: Int, where: JSON, sort: String): [DependencyVersionStatusHelpType] + getDependencyVersionStatusHelpDetailsByParams(_id: Int!): DependencyVersionStatusHelpType + } +`; + +export default DependencyVersionStatusHelpQueriesType; diff --git a/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpType.ts b/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpType.ts new file mode 100644 index 00000000..fb1752a8 --- /dev/null +++ b/v6y-apps/bff/src/types/dependency/version-status-help/DependencyVersionStatusHelpType.ts @@ -0,0 +1,21 @@ +const DependencyVersionStatusHelpType = ` + """ Dependency Recommended help """ + type DependencyVersionStatusHelpType { + """ Dependency Version Status Help Unique id """ + _id: Int! + + """ Dependency Version Status Help Title """ + title: String! + + """ Dependency Help Category """ + category: String! + + """ Dependency Version Status Help Description """ + description: String + + """ Dependency Version Status Help links """ + links: [LinkType] + } +`; + +export default DependencyVersionStatusHelpType; diff --git a/v6y-apps/front-bo/public/locales/en/common.json b/v6y-apps/front-bo/public/locales/en/common.json index 7c960fa3..8a453d13 100644 --- a/v6y-apps/front-bo/public/locales/en/common.json +++ b/v6y-apps/front-bo/public/locales/en/common.json @@ -313,8 +313,8 @@ "show": "Show Faq" } }, - "v6y-evolution-helps": { - "v6y-evolution-helps": "Evolution Help List", + "v6y-evolution-help": { + "v6y-evolution-help": "Evolution Help List", "fields": { "evolution-help-infos-group": "Evolution Help Information", "evolution-help-optional-link-group": "Other Link(s)", @@ -349,8 +349,8 @@ "show": "Show Evolution Help" } }, - "v6y-audit-helps": { - "v6y-audit-helps": "Audit Help List", + "v6y-audit-help": { + "v6y-audit-help": "Audit Help List", "fields": { "audit-help-infos-group": "Audit Help Information", "audit-help-category": { @@ -379,26 +379,26 @@ "show": "Show Audit Help" } }, - "v6y-dependency-status-helps": { - "v6y-dependency-status-helps": "Dependency Status Help List", + "v6y-dependency-version-status-help": { + "v6y-dependency-version-status-help": "Dependency Version Status Help List", "fields": { - "dependency-status-help-infos-group": "Dependency Status Help Information", - "dependency-status-help-category": { - "label": "Dependency Status Help" + "dependency-version-status-help-infos-group": "Dependency Version Status Help Information", + "dependency-version-status-help-category": { + "label": "Dependency Version Status Help" }, - "dependency-status-help-title": { - "label": "Dependency Status Help Title", - "placeholder": "Enter your Dependency Status Help Title", + "dependency-version-status-help-title": { + "label": "Dependency Version Status Help Title", + "placeholder": "Enter your Dependency Version Status Help Title", "error": "" }, - "dependency-status-help-description": { - "label": "Dependency Status Help Description", - "placeholder": "Enter your Dependency Status Help Description", + "dependency-version-status-help-description": { + "label": "Dependency Version Status Help Description", + "placeholder": "Enter your Dependency Version Status Help Description", "error": "" }, - "dependency-status-help-links": { - "label": "Dependency Status Help Link", - "placeholder": "Enter your Dependency Status Help Link", + "dependency-version-status-help-links": { + "label": "Dependency Version Status Help Link", + "placeholder": "Enter your Dependency Version Status Help Link", "error": "" } }, diff --git a/v6y-apps/front-bo/public/locales/fr/common.json b/v6y-apps/front-bo/public/locales/fr/common.json index 7c960fa3..8a453d13 100644 --- a/v6y-apps/front-bo/public/locales/fr/common.json +++ b/v6y-apps/front-bo/public/locales/fr/common.json @@ -313,8 +313,8 @@ "show": "Show Faq" } }, - "v6y-evolution-helps": { - "v6y-evolution-helps": "Evolution Help List", + "v6y-evolution-help": { + "v6y-evolution-help": "Evolution Help List", "fields": { "evolution-help-infos-group": "Evolution Help Information", "evolution-help-optional-link-group": "Other Link(s)", @@ -349,8 +349,8 @@ "show": "Show Evolution Help" } }, - "v6y-audit-helps": { - "v6y-audit-helps": "Audit Help List", + "v6y-audit-help": { + "v6y-audit-help": "Audit Help List", "fields": { "audit-help-infos-group": "Audit Help Information", "audit-help-category": { @@ -379,26 +379,26 @@ "show": "Show Audit Help" } }, - "v6y-dependency-status-helps": { - "v6y-dependency-status-helps": "Dependency Status Help List", + "v6y-dependency-version-status-help": { + "v6y-dependency-version-status-help": "Dependency Version Status Help List", "fields": { - "dependency-status-help-infos-group": "Dependency Status Help Information", - "dependency-status-help-category": { - "label": "Dependency Status Help" + "dependency-version-status-help-infos-group": "Dependency Version Status Help Information", + "dependency-version-status-help-category": { + "label": "Dependency Version Status Help" }, - "dependency-status-help-title": { - "label": "Dependency Status Help Title", - "placeholder": "Enter your Dependency Status Help Title", + "dependency-version-status-help-title": { + "label": "Dependency Version Status Help Title", + "placeholder": "Enter your Dependency Version Status Help Title", "error": "" }, - "dependency-status-help-description": { - "label": "Dependency Status Help Description", - "placeholder": "Enter your Dependency Status Help Description", + "dependency-version-status-help-description": { + "label": "Dependency Version Status Help Description", + "placeholder": "Enter your Dependency Version Status Help Description", "error": "" }, - "dependency-status-help-links": { - "label": "Dependency Status Help Link", - "placeholder": "Enter your Dependency Status Help Link", + "dependency-version-status-help-links": { + "label": "Dependency Version Status Help Link", + "placeholder": "Enter your Dependency Version Status Help Link", "error": "" } }, diff --git a/v6y-apps/front-bo/src/app/v6y-audit-helps/edit/[id]/page.tsx b/v6y-apps/front-bo/src/app/v6y-audit-help/edit/[id]/page.tsx similarity index 100% rename from v6y-apps/front-bo/src/app/v6y-audit-helps/edit/[id]/page.tsx rename to v6y-apps/front-bo/src/app/v6y-audit-help/edit/[id]/page.tsx diff --git a/v6y-apps/front-bo/src/app/v6y-audit-helps/layout.tsx b/v6y-apps/front-bo/src/app/v6y-audit-help/layout.tsx similarity index 100% rename from v6y-apps/front-bo/src/app/v6y-audit-helps/layout.tsx rename to v6y-apps/front-bo/src/app/v6y-audit-help/layout.tsx diff --git a/v6y-apps/front-bo/src/app/v6y-audit-helps/page.tsx b/v6y-apps/front-bo/src/app/v6y-audit-help/page.tsx similarity index 100% rename from v6y-apps/front-bo/src/app/v6y-audit-helps/page.tsx rename to v6y-apps/front-bo/src/app/v6y-audit-help/page.tsx diff --git a/v6y-apps/front-bo/src/app/v6y-audit-helps/show/[id]/page.tsx b/v6y-apps/front-bo/src/app/v6y-audit-help/show/[id]/page.tsx similarity index 100% rename from v6y-apps/front-bo/src/app/v6y-audit-helps/show/[id]/page.tsx rename to v6y-apps/front-bo/src/app/v6y-audit-help/show/[id]/page.tsx diff --git a/v6y-apps/front-bo/src/app/v6y-dependency-status-helps/edit/[id]/page.tsx b/v6y-apps/front-bo/src/app/v6y-dependency-status-helps/edit/[id]/page.tsx deleted file mode 100644 index a48feda3..00000000 --- a/v6y-apps/front-bo/src/app/v6y-dependency-status-helps/edit/[id]/page.tsx +++ /dev/null @@ -1,9 +0,0 @@ -'use client'; - -import * as React from 'react'; - -import VitalityDependencyStatusHelpEditView from '../../../../features/v6y-dependency-status-helps/components/VitalityDependencyStatusHelpEditView'; - -export default function VitalityDependencyEditPage() { - return ; -} diff --git a/v6y-apps/front-bo/src/app/v6y-dependency-status-helps/page.tsx b/v6y-apps/front-bo/src/app/v6y-dependency-status-helps/page.tsx deleted file mode 100644 index bbcbad2f..00000000 --- a/v6y-apps/front-bo/src/app/v6y-dependency-status-helps/page.tsx +++ /dev/null @@ -1,9 +0,0 @@ -'use client'; - -import * as React from 'react'; - -import VitalityDependencyStatusHelpListView from '../../features/v6y-dependency-status-helps/components/VitalityDependencyStatusHelpListView'; - -export default function DependencyList() { - return ; -} diff --git a/v6y-apps/front-bo/src/app/v6y-dependency-status-helps/show/[id]/page.tsx b/v6y-apps/front-bo/src/app/v6y-dependency-status-helps/show/[id]/page.tsx deleted file mode 100644 index aa7fcaf6..00000000 --- a/v6y-apps/front-bo/src/app/v6y-dependency-status-helps/show/[id]/page.tsx +++ /dev/null @@ -1,9 +0,0 @@ -'use client'; - -import * as React from 'react'; - -import VitalityDependencyStatusHelpDetailsView from '../../../../features/v6y-dependency-status-helps/components/VitalityDependencyStatusHelpDetailsView'; - -export default function VitalityDependencyDetailsPage() { - return ; -} diff --git a/v6y-apps/front-bo/src/app/v6y-dependency-version-status-help/edit/[id]/page.tsx b/v6y-apps/front-bo/src/app/v6y-dependency-version-status-help/edit/[id]/page.tsx new file mode 100644 index 00000000..7bdebc15 --- /dev/null +++ b/v6y-apps/front-bo/src/app/v6y-dependency-version-status-help/edit/[id]/page.tsx @@ -0,0 +1,9 @@ +'use client'; + +import * as React from 'react'; + +import VitalityDependencyVersionStatusHelpEditView from '../../../../features/v6y-dependency-version-status-help/components/VitalityDependencyVersionStatusHelpEditView'; + +export default function VitalityDependencyEditPage() { + return ; +} diff --git a/v6y-apps/front-bo/src/app/v6y-dependency-status-helps/layout.tsx b/v6y-apps/front-bo/src/app/v6y-dependency-version-status-help/layout.tsx similarity index 100% rename from v6y-apps/front-bo/src/app/v6y-dependency-status-helps/layout.tsx rename to v6y-apps/front-bo/src/app/v6y-dependency-version-status-help/layout.tsx diff --git a/v6y-apps/front-bo/src/app/v6y-dependency-version-status-help/page.tsx b/v6y-apps/front-bo/src/app/v6y-dependency-version-status-help/page.tsx new file mode 100644 index 00000000..096042b7 --- /dev/null +++ b/v6y-apps/front-bo/src/app/v6y-dependency-version-status-help/page.tsx @@ -0,0 +1,9 @@ +'use client'; + +import * as React from 'react'; + +import VitalityDependencyVersionStatusHelpListView from '../../features/v6y-dependency-version-status-help/components/VitalityDependencyVersionStatusHelpListView'; + +export default function DependencyList() { + return ; +} diff --git a/v6y-apps/front-bo/src/app/v6y-dependency-version-status-help/show/[id]/page.tsx b/v6y-apps/front-bo/src/app/v6y-dependency-version-status-help/show/[id]/page.tsx new file mode 100644 index 00000000..5ed336e6 --- /dev/null +++ b/v6y-apps/front-bo/src/app/v6y-dependency-version-status-help/show/[id]/page.tsx @@ -0,0 +1,9 @@ +'use client'; + +import * as React from 'react'; + +import VitalityDependencyVersionStatusHelpDetailsView from '../../../../features/v6y-dependency-version-status-help/components/VitalityDependencyVersionStatusHelpDetailsView'; + +export default function VitalityDependencyDetailsPage() { + return ; +} diff --git a/v6y-apps/front-bo/src/app/v6y-evolution-helps/edit/[id]/page.tsx b/v6y-apps/front-bo/src/app/v6y-evolution-help/edit/[id]/page.tsx similarity index 77% rename from v6y-apps/front-bo/src/app/v6y-evolution-helps/edit/[id]/page.tsx rename to v6y-apps/front-bo/src/app/v6y-evolution-help/edit/[id]/page.tsx index c75141c6..5e184c0d 100644 --- a/v6y-apps/front-bo/src/app/v6y-evolution-helps/edit/[id]/page.tsx +++ b/v6y-apps/front-bo/src/app/v6y-evolution-help/edit/[id]/page.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; -import VitalityEvolutionHelpEditView from '../../../../features/v6y-evolution-helps/components/VitalityEvolutionHelpEditView'; +import VitalityEvolutionHelpEditView from '../../../../features/v6y-evolution-help/components/VitalityEvolutionHelpEditView'; export default function VitalityEvolutionEditPage() { return ; diff --git a/v6y-apps/front-bo/src/app/v6y-evolution-helps/layout.tsx b/v6y-apps/front-bo/src/app/v6y-evolution-help/layout.tsx similarity index 100% rename from v6y-apps/front-bo/src/app/v6y-evolution-helps/layout.tsx rename to v6y-apps/front-bo/src/app/v6y-evolution-help/layout.tsx diff --git a/v6y-apps/front-bo/src/app/v6y-evolution-helps/page.tsx b/v6y-apps/front-bo/src/app/v6y-evolution-help/page.tsx similarity index 78% rename from v6y-apps/front-bo/src/app/v6y-evolution-helps/page.tsx rename to v6y-apps/front-bo/src/app/v6y-evolution-help/page.tsx index 6c98d1cb..a7407621 100644 --- a/v6y-apps/front-bo/src/app/v6y-evolution-helps/page.tsx +++ b/v6y-apps/front-bo/src/app/v6y-evolution-help/page.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; -import VitalityEvolutionHelpListView from '../../features/v6y-evolution-helps/components/VitalityEvolutionHelpListView'; +import VitalityEvolutionHelpListView from '../../features/v6y-evolution-help/components/VitalityEvolutionHelpListView'; export default function EvolutionList() { return ; diff --git a/v6y-apps/front-bo/src/app/v6y-evolution-helps/show/[id]/page.tsx b/v6y-apps/front-bo/src/app/v6y-evolution-help/show/[id]/page.tsx similarity index 76% rename from v6y-apps/front-bo/src/app/v6y-evolution-helps/show/[id]/page.tsx rename to v6y-apps/front-bo/src/app/v6y-evolution-help/show/[id]/page.tsx index 0e05b5a8..0f46a3ee 100644 --- a/v6y-apps/front-bo/src/app/v6y-evolution-helps/show/[id]/page.tsx +++ b/v6y-apps/front-bo/src/app/v6y-evolution-help/show/[id]/page.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; -import VitalityEvolutionHelpDetailsView from '../../../../features/v6y-evolution-helps/components/VitalityEvolutionHelpDetailsView'; +import VitalityEvolutionHelpDetailsView from '../../../../features/v6y-evolution-help/components/VitalityEvolutionHelpDetailsView'; export default function VitalityEvolutionDetailsPage() { return ; diff --git a/v6y-apps/front-bo/src/commons/config/VitalityDetailsConfig.tsx b/v6y-apps/front-bo/src/commons/config/VitalityDetailsConfig.tsx index e49a493c..62542015 100644 --- a/v6y-apps/front-bo/src/commons/config/VitalityDetailsConfig.tsx +++ b/v6y-apps/front-bo/src/commons/config/VitalityDetailsConfig.tsx @@ -2,7 +2,7 @@ import { AccountType, ApplicationType, AuditHelpType, - DependencyStatusHelpType, + DependencyVersionStatusHelpType, DeprecatedDependencyType, EvolutionHelpType, FaqType, @@ -89,13 +89,13 @@ export const formatEvolutionHelpDetails = ( } return { - [translate('v6y-evolution-helps.fields.evolution-help-category.label') || '']: + [translate('v6y-evolution-help.fields.evolution-help-category.label') || '']: details.category, - [translate('v6y-evolution-helps.fields.evolution-help-status.label') || '']: details.status, - [translate('v6y-evolution-helps.fields.evolution-help-title.label') || '']: details.title, - [translate('v6y-evolution-helps.fields.evolution-help-description.label') || '']: + [translate('v6y-evolution-help.fields.evolution-help-status.label') || '']: details.status, + [translate('v6y-evolution-help.fields.evolution-help-title.label') || '']: details.title, + [translate('v6y-evolution-help.fields.evolution-help-description.label') || '']: details.description, - [translate('v6y-evolution-helps.fields.evolution-help-link.label') || '']: ( + [translate('v6y-evolution-help.fields.evolution-help-link.label') || '']: ( ), }; @@ -107,32 +107,36 @@ export const formatAuditHelpDetails = (translate: TranslateType, details: AuditH } return { - [translate('v6y-audit-helps.fields.audit-help-category.label') || '']: details.category, - [translate('v6y-audit-helps.fields.audit-help-title.label') || '']: details.title, - [translate('v6y-audit-helps.fields.audit-help-description.label') || '']: + [translate('v6y-audit-help.fields.audit-help-category.label') || '']: details.category, + [translate('v6y-audit-help.fields.audit-help-title.label') || '']: details.title, + [translate('v6y-audit-help.fields.audit-help-description.label') || '']: details.description, - [translate('v6y-audit-helps.fields.audit-help-explanation.label') || '']: + [translate('v6y-audit-help.fields.audit-help-explanation.label') || '']: details.explanation, }; }; -export const formatDependencyStatusHelpDetails = ( +export const formatDependencyVersionStatusHelpDetails = ( translate: TranslateType, - details: DependencyStatusHelpType, + details: DependencyVersionStatusHelpType, ) => { if (!Object.keys(details || {})?.length) { return {}; } return { - [translate('v6y-dependency-status-helps.fields.dependency-status-help-category.label') || - '']: details.category, - [translate('v6y-dependency-status-helps.fields.dependency-status-help-title.label') || '']: - details.title, - [translate('v6y-dependency-status-helps.fields.dependency-status-help-description.label') || - '']: details.description, - [translate('v6y-dependency-status-helps.fields.dependency-status-help-links.label') || '']: - , + [translate( + 'v6y-dependency-version-status-help.fields.dependency-version-status-help-category.label', + ) || '']: details.category, + [translate( + 'v6y-dependency-version-status-help.fields.dependency-version-status-help-title.label', + ) || '']: details.title, + [translate( + 'v6y-dependency-version-status-help.fields.dependency-version-status-help-description.label', + ) || '']: details.description, + [translate( + 'v6y-dependency-version-status-help.fields.dependency-version-status-help-links.label', + ) || '']: , }; }; diff --git a/v6y-apps/front-bo/src/commons/config/VitalityFormConfig.tsx b/v6y-apps/front-bo/src/commons/config/VitalityFormConfig.tsx index 74bfc01b..5e378995 100644 --- a/v6y-apps/front-bo/src/commons/config/VitalityFormConfig.tsx +++ b/v6y-apps/front-bo/src/commons/config/VitalityFormConfig.tsx @@ -430,48 +430,48 @@ export const evolutionHelpInfosFormItems = (translate: TranslateType) => { { id: 'evolution-help-category', name: 'evolution-help-category', - label: translate('v6y-evolution-helps.fields.evolution-help-category.label'), + label: translate('v6y-evolution-help.fields.evolution-help-category.label'), disabled: true, rules: [], }, { id: 'evolution-help-status', name: 'evolution-help-status', - label: translate('v6y-evolution-helps.fields.evolution-help-status.label'), - placeholder: translate('v6y-evolution-helps.fields.evolution-help-status.placeholder'), + label: translate('v6y-evolution-help.fields.evolution-help-status.label'), + placeholder: translate('v6y-evolution-help.fields.evolution-help-status.placeholder'), type: 'select', rules: [ { required: true, - message: translate('v6y-evolution-helps.fields.evolution-help-status.error'), + message: translate('v6y-evolution-help.fields.evolution-help-status.error'), }, ], }, { id: 'evolution-help-title', name: 'evolution-help-title', - label: translate('v6y-evolution-helps.fields.evolution-help-title.label'), - placeholder: translate('v6y-evolution-helps.fields.evolution-help-title.placeholder'), + label: translate('v6y-evolution-help.fields.evolution-help-title.label'), + placeholder: translate('v6y-evolution-help.fields.evolution-help-title.placeholder'), rules: [ { required: true, - message: translate('v6y-evolution-helps.fields.evolution-help-title.error'), + message: translate('v6y-evolution-help.fields.evolution-help-title.error'), }, ], }, { id: 'evolution-help-description', name: 'evolution-help-description', - label: translate('v6y-evolution-helps.fields.evolution-help-description.label'), + label: translate('v6y-evolution-help.fields.evolution-help-description.label'), placeholder: translate( - 'v6y-evolution-helps.fields.evolution-help-description.placeholder', + 'v6y-evolution-help.fields.evolution-help-description.placeholder', ), type: 'textarea', rules: [ { required: true, message: translate( - 'v6y-evolution-helps.fields.evolution-help-description.error', + 'v6y-evolution-help.fields.evolution-help-description.error', ), }, ], @@ -483,22 +483,22 @@ export const evolutionHelpOptionalLinksFormItems = (translate: TranslateType) => { id: 'evolution-help-optional-link-1', name: 'evolution-help-optional-link-1', - label: translate('v6y-evolution-helps.fields.evolution-help-link.label'), - placeholder: translate('v6y-evolution-helps.fields.evolution-help-link.placeholder'), + label: translate('v6y-evolution-help.fields.evolution-help-link.label'), + placeholder: translate('v6y-evolution-help.fields.evolution-help-link.placeholder'), rules: [], }, { id: 'evolution-help-optional-link-2', name: 'evolution-help-optional-link-2', - label: translate('v6y-evolution-helps.fields.evolution-help-link.label'), - placeholder: translate('v6y-evolution-helps.fields.evolution-help-link.placeholder'), + label: translate('v6y-evolution-help.fields.evolution-help-link.label'), + placeholder: translate('v6y-evolution-help.fields.evolution-help-link.placeholder'), rules: [], }, { id: 'evolution-help-optional-link-3', name: 'evolution-help-optional-link-3', - label: translate('v6y-evolution-helps.fields.evolution-help-link.label'), - placeholder: translate('v6y-evolution-helps.fields.evolution-help-link.placeholder'), + label: translate('v6y-evolution-help.fields.evolution-help-link.label'), + placeholder: translate('v6y-evolution-help.fields.evolution-help-link.placeholder'), rules: [], }, ]; @@ -509,14 +509,14 @@ export const evolutionHelpCreateEditItems = ( ) => { return [ , , ]; @@ -555,44 +555,44 @@ export const auditHelpInfosFormItems = (translate: TranslateType) => { { id: 'audit-help-category', name: 'audit-help-category', - label: translate('v6y-audit-helps.fields.audit-help-category.label'), + label: translate('v6y-audit-help.fields.audit-help-category.label'), disabled: true, rules: [], }, { id: 'audit-help-title', name: 'audit-help-title', - label: translate('v6y-audit-helps.fields.audit-help-title.label'), - placeholder: translate('v6y-audit-helps.fields.audit-help-title.placeholder'), + label: translate('v6y-audit-help.fields.audit-help-title.label'), + placeholder: translate('v6y-audit-help.fields.audit-help-title.placeholder'), rules: [ { required: true, - message: translate('v6y-audit-helps.fields.audit-help-title.error'), + message: translate('v6y-audit-help.fields.audit-help-title.error'), }, ], }, { id: 'audit-help-description', name: 'audit-help-description', - label: translate('v6y-audit-helps.fields.audit-help-description.label'), - placeholder: translate('v6y-audit-helps.fields.audit-help-description.placeholder'), + label: translate('v6y-audit-help.fields.audit-help-description.label'), + placeholder: translate('v6y-audit-help.fields.audit-help-description.placeholder'), type: 'textarea', rules: [ { required: true, - message: translate('v6y-audit-helps.fields.audit-help-description.error'), + message: translate('v6y-audit-help.fields.audit-help-description.error'), }, ], }, { id: 'audit-help-explanation', name: 'audit-help-explanation', - label: translate('v6y-audit-helps.fields.audit-help-explanation.label'), - placeholder: translate('v6y-audit-helps.fields.audit-help-explanation.placeholder'), + label: translate('v6y-audit-help.fields.audit-help-explanation.label'), + placeholder: translate('v6y-audit-help.fields.audit-help-explanation.placeholder'), rules: [ { required: true, - message: translate('v6y-audit-helps.fields.audit-help-explanation.error'), + message: translate('v6y-audit-help.fields.audit-help-explanation.error'), }, ], }, @@ -602,8 +602,8 @@ export const auditHelpInfosFormItems = (translate: TranslateType) => { export const auditHelpCreateEditItems = (translate: TranslateType) => { return [ , ]; @@ -627,50 +627,50 @@ export const auditHelpCreateOrEditFormOutputAdapter = (params: Record { +export const dependencyVersionStatusHelpInfosFormItems = (translate: TranslateType) => { return [ { - id: 'dependency-status-help-category', - name: 'dependency-status-help-category', + id: 'dependency-version-status-help-category', + name: 'dependency-version-status-help-category', label: translate( - 'v6y-dependency-status-helps.fields.dependency-status-help-category.label', + 'v6y-dependency-version-status-help.fields.dependency-version-status-help-category.label', ), disabled: true, rules: [], }, { - id: 'dependency-status-help-title', - name: 'dependency-status-help-title', + id: 'dependency-version-status-help-title', + name: 'dependency-version-status-help-title', label: translate( - 'v6y-dependency-status-helps.fields.dependency-status-help-title.label', + 'v6y-dependency-version-status-help.fields.dependency-version-status-help-title.label', ), placeholder: translate( - 'v6y-dependency-status-helps.fields.dependency-status-help-title.placeholder', + 'v6y-dependency-version-status-help.fields.dependency-version-status-help-title.placeholder', ), rules: [ { required: true, message: translate( - 'v6y-dependency-status-helps.fields.dependency-status-help-title.error', + 'v6y-dependency-version-status-help.fields.dependency-version-status-help-title.error', ), }, ], }, { - id: 'dependency-status-help-description', - name: 'dependency-status-help-description', + id: 'dependency-version-status-help-description', + name: 'dependency-version-status-help-description', label: translate( - 'v6y-dependency-status-helps.fields.dependency-status-help-description.label', + 'v6y-dependency-version-status-help.fields.dependency-version-status-help-description.label', ), placeholder: translate( - 'v6y-dependency-status-helps.fields.dependency-status-help-description.placeholder', + 'v6y-dependency-version-status-help.fields.dependency-version-status-help-description.placeholder', ), type: 'textarea', rules: [ { required: true, message: translate( - 'v6y-dependency-status-helps.fields.dependency-status-help-description.error', + 'v6y-dependency-version-status-help.fields.dependency-version-status-help-description.error', ), }, ], @@ -678,33 +678,37 @@ export const dependencyStatusHelpInfosFormItems = (translate: TranslateType) => ]; }; -export const dependencyStatusHelpCreateEditItems = (translate: TranslateType) => { +export const dependencyVersionStatusHelpCreateEditItems = (translate: TranslateType) => { return [ , ]; }; -export const dependencyStatusHelpCreateOrEditFormInAdapter = (params: Record) => ({ +export const dependencyVersionStatusHelpCreateOrEditFormInAdapter = ( + params: Record, +) => ({ _id: params?._id, - 'dependency-status-help-category': params?.['category'], - 'dependency-status-help-title': params?.['title'], - 'dependency-status-help-description': params?.['description'], + 'dependency-version-status-help-category': params?.['category'], + 'dependency-version-status-help-title': params?.['title'], + 'dependency-version-status-help-description': params?.['description'], }); -export const dependencyStatusHelpCreateOrEditFormOutputAdapter = ( +export const dependencyVersionStatusHelpCreateOrEditFormOutputAdapter = ( params: Record, ) => ({ - dependencyStatusHelpInput: { + dependencyVersionStatusHelpInput: { _id: params?.['_id'], - category: params?.['dependency-status-help-category'], - title: params?.['dependency-status-help-title'], - description: params?.['dependency-status-help-description'], + category: params?.['dependency-version-status-help-category'], + title: params?.['dependency-version-status-help-title'], + description: params?.['dependency-version-status-help-description'], }, }); diff --git a/v6y-apps/front-bo/src/commons/config/VitalityNavigationConfig.ts b/v6y-apps/front-bo/src/commons/config/VitalityNavigationConfig.ts index b06712f6..8bfa29f8 100644 --- a/v6y-apps/front-bo/src/commons/config/VitalityNavigationConfig.ts +++ b/v6y-apps/front-bo/src/commons/config/VitalityNavigationConfig.ts @@ -40,28 +40,28 @@ export const VitalityRoutes = [ }, }, { - name: 'v6y-evolution-helps', - list: '/v6y-evolution-helps', - edit: '/v6y-evolution-helps/edit/:id', - show: '/v6y-evolution-helps/show/:id', + name: 'v6y-evolution-help', + list: '/v6y-evolution-help', + edit: '/v6y-evolution-help/edit/:id', + show: '/v6y-evolution-help/show/:id', meta: { canDelete: true, }, }, { - name: 'v6y-audit-helps', - list: '/v6y-audit-helps', - edit: '/v6y-audit-helps/edit/:id', - show: '/v6y-audit-helps/show/:id', + name: 'v6y-audit-help', + list: '/v6y-audit-help', + edit: '/v6y-audit-help/edit/:id', + show: '/v6y-audit-help/show/:id', meta: { canDelete: true, }, }, { - name: 'v6y-dependency-status-helps', - list: '/v6y-dependency-status-helps', - edit: '/v6y-dependency-status-helps/edit/:id', - show: '/v6y-dependency-status-helps/show/:id', + name: 'v6y-dependency-version-status-help', + list: '/v6y-dependency-version-status-help', + edit: '/v6y-dependency-version-status-help/edit/:id', + show: '/v6y-dependency-version-status-help/show/:id', meta: { canDelete: true, }, diff --git a/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpDetailsView.tsx b/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpDetailsView.tsx index 0e5fb0b9..acf3ee3c 100644 --- a/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpDetailsView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpDetailsView.tsx @@ -18,7 +18,7 @@ export default function VitalityAuditHelpDetailsView() { - {translate('v6y-audit-helps.titles.show')} + {translate('v6y-audit-help.titles.show')} } queryOptions={{ diff --git a/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpEditView.tsx b/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpEditView.tsx index ad40c407..196d17f6 100644 --- a/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpEditView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpEditView.tsx @@ -20,7 +20,7 @@ export default function VitalityAuditHelpEditView() { - {translate('v6y-audit-helps.titles.edit')} + {translate('v6y-audit-help.titles.edit')} } queryOptions={{ diff --git a/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpListView.tsx b/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpListView.tsx index cee57f7d..eb40a4f9 100644 --- a/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpListView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpListView.tsx @@ -12,7 +12,7 @@ export default function VitalityAuditHelpListView() { return ( - {translate('v6y-evolution-helps.titles.edit')} - - } - queryOptions={{ - queryFormAdapter: dependencyStatusHelpCreateOrEditFormInAdapter, - query: GetDependencyStatusHelpDetailsByParams, - queryResource: 'getDependencyStatusHelpDetailsByParams', - queryParams: { - _id: parseInt(id as string, 10), - }, - }} - mutationOptions={{ - editFormAdapter: dependencyStatusHelpCreateOrEditFormOutputAdapter, - editQuery: CreateOrEditDependencyStatusHelp, - editQueryParams: { - _id: parseInt(id as string, 10), - }, - }} - formItems={dependencyStatusHelpCreateEditItems(translate)} - /> - ); -} diff --git a/v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/apis/createOrEditDependencyVersionStatusHelp.ts b/v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/apis/createOrEditDependencyVersionStatusHelp.ts new file mode 100644 index 00000000..872a9718 --- /dev/null +++ b/v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/apis/createOrEditDependencyVersionStatusHelp.ts @@ -0,0 +1,15 @@ +import { gql } from 'graphql-request'; + +const CreateOrEditDependencyVersionStatusHelp = gql` + mutation CreateOrEditDependencyVersionStatusHelp( + $dependencyVersionStatusHelpInput: DependencyVersionStatusHelpCreateOrEditInput! + ) { + createOrEditDependencyVersionStatusHelp( + dependencyVersionStatusHelpInput: $dependencyVersionStatusHelpInput + ) { + _id + } + } +`; + +export default CreateOrEditDependencyVersionStatusHelp; diff --git a/v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/apis/getDependencyVersionStatusHelpDetailsByParams.ts b/v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/apis/getDependencyVersionStatusHelpDetailsByParams.ts new file mode 100644 index 00000000..02348dc1 --- /dev/null +++ b/v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/apis/getDependencyVersionStatusHelpDetailsByParams.ts @@ -0,0 +1,19 @@ +import { gql } from 'graphql-request'; + +const GetDependencyVersionStatusHelpDetailsByParams = gql` + query GetDependencyVersionStatusHelpDetailsByParams($_id: Int!) { + getDependencyVersionStatusHelpDetailsByParams(_id: $_id) { + _id + title + category + description + links { + label + value + description + } + } + } +`; + +export default GetDependencyVersionStatusHelpDetailsByParams; diff --git a/v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/apis/getDependencyVersionStatusHelpListByPageAndParams.ts b/v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/apis/getDependencyVersionStatusHelpListByPageAndParams.ts new file mode 100644 index 00000000..08baed39 --- /dev/null +++ b/v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/apis/getDependencyVersionStatusHelpListByPageAndParams.ts @@ -0,0 +1,22 @@ +import { gql } from 'graphql-request'; + +const GetDependencyVersionStatusHelpListByPageAndParams = gql` + query GetDependencyVersionStatusHelpListByPageAndParams( + $start: Int + $limit: Int + $sort: String + ) { + getDependencyVersionStatusHelpListByPageAndParams( + start: $start + limit: $limit + sort: $sort + ) { + _id + title + description + category + } + } +`; + +export default GetDependencyVersionStatusHelpListByPageAndParams; diff --git a/v6y-apps/front-bo/src/features/v6y-dependency-status-helps/components/VitalityDependencyStatusHelpDetailsView.tsx b/v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/components/VitalityDependencyVersionStatusHelpDetailsView.tsx similarity index 57% rename from v6y-apps/front-bo/src/features/v6y-dependency-status-helps/components/VitalityDependencyStatusHelpDetailsView.tsx rename to v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/components/VitalityDependencyVersionStatusHelpDetailsView.tsx index 6b358e9c..cc0dab0c 100644 --- a/v6y-apps/front-bo/src/features/v6y-dependency-status-helps/components/VitalityDependencyStatusHelpDetailsView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/components/VitalityDependencyVersionStatusHelpDetailsView.tsx @@ -1,15 +1,15 @@ import { useParsed } from '@refinedev/core'; -import { DependencyStatusHelpType } from '@v6y/core-logic/src'; +import { DependencyVersionStatusHelpType } from '@v6y/core-logic/src'; import { Typography } from 'antd'; import * as React from 'react'; import VitalityDetailsView from '../../../commons/components/VitalityDetailsView'; -import { formatDependencyStatusHelpDetails } from '../../../commons/config/VitalityDetailsConfig'; +import { formatDependencyVersionStatusHelpDetails } from '../../../commons/config/VitalityDetailsConfig'; import { useTranslation } from '../../../infrastructure/adapters/translation/TranslationAdapter'; import RefineShowWrapper from '../../../infrastructure/components/RefineShowWrapper'; -import GetDependencyStatusHelpDetailsByParams from '../apis/getDependencyStatusHelpDetailsByParams'; +import GetDependencyVersionStatusHelpDetailsByParams from '../apis/getDependencyVersionStatusHelpDetailsByParams'; -export default function VitalityDependencyStatusHelpDetailsView() { +export default function VitalityDependencyVersionStatusHelpDetailsView() { const { translate } = useTranslation(); const { id } = useParsed(); @@ -18,21 +18,21 @@ export default function VitalityDependencyStatusHelpDetailsView() { - {translate('v6y-dependency-status-helps.titles.show')} + {translate('v6y-dependency-version-status-help.titles.show')} } queryOptions={{ - resource: 'getDependencyStatusHelpDetailsByParams', - query: GetDependencyStatusHelpDetailsByParams, + resource: 'getDependencyVersionStatusHelpDetailsByParams', + query: GetDependencyVersionStatusHelpDetailsByParams, queryParams: { _id: parseInt(id as string, 10), }, }} renderShowView={({ data, error }) => ( diff --git a/v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/components/VitalityDependencyVersionStatusHelpEditView.tsx b/v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/components/VitalityDependencyVersionStatusHelpEditView.tsx new file mode 100644 index 00000000..30635b26 --- /dev/null +++ b/v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/components/VitalityDependencyVersionStatusHelpEditView.tsx @@ -0,0 +1,44 @@ +import { useParsed } from '@refinedev/core'; +import { Typography } from 'antd'; +import * as React from 'react'; + +import { + dependencyVersionStatusHelpCreateEditItems, + dependencyVersionStatusHelpCreateOrEditFormInAdapter, + dependencyVersionStatusHelpCreateOrEditFormOutputAdapter, +} from '../../../commons/config/VitalityFormConfig'; +import { useTranslation } from '../../../infrastructure/adapters/translation/TranslationAdapter'; +import RefineEditWrapper from '../../../infrastructure/components/RefineEditWrapper'; +import CreateOrEditDependencyVersionStatusHelp from '../apis/createOrEditDependencyVersionStatusHelp'; +import GetDependencyVersionStatusHelpDetailsByParams from '../apis/getDependencyVersionStatusHelpDetailsByParams'; + +export default function VitalityDependencyVersionStatusHelpEditView() { + const { translate } = useTranslation(); + const { id } = useParsed(); + + return ( + + {translate('v6y-evolution-help.titles.edit')} + + } + queryOptions={{ + queryFormAdapter: dependencyVersionStatusHelpCreateOrEditFormInAdapter, + query: GetDependencyVersionStatusHelpDetailsByParams, + queryResource: 'getDependencyVersionStatusHelpDetailsByParams', + queryParams: { + _id: parseInt(id as string, 10), + }, + }} + mutationOptions={{ + editFormAdapter: dependencyVersionStatusHelpCreateOrEditFormOutputAdapter, + editQuery: CreateOrEditDependencyVersionStatusHelp, + editQueryParams: { + _id: parseInt(id as string, 10), + }, + }} + formItems={dependencyVersionStatusHelpCreateEditItems(translate)} + /> + ); +} diff --git a/v6y-apps/front-bo/src/features/v6y-dependency-status-helps/components/VitalityDependencyStatusHelpListView.tsx b/v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/components/VitalityDependencyVersionStatusHelpListView.tsx similarity index 73% rename from v6y-apps/front-bo/src/features/v6y-dependency-status-helps/components/VitalityDependencyStatusHelpListView.tsx rename to v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/components/VitalityDependencyVersionStatusHelpListView.tsx index 0cf3c504..4b0e3ead 100644 --- a/v6y-apps/front-bo/src/features/v6y-dependency-status-helps/components/VitalityDependencyStatusHelpListView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-dependency-version-status-help/components/VitalityDependencyVersionStatusHelpListView.tsx @@ -5,14 +5,14 @@ import { } from '../../../commons/config/VitalityTableConfig'; import { useTranslation } from '../../../infrastructure/adapters/translation/TranslationAdapter'; import RefineTableWrapper from '../../../infrastructure/components/RefineTableWrapper'; -import GetDependencyStatusHelpListByPageAndParams from '../apis/getDependencyStatusHelpListByPageAndParams'; +import GetDependencyVersionStatusHelpListByPageAndParams from '../apis/getDependencyVersionStatusHelpListByPageAndParams'; -export default function VitalityDependencyStatusHelpListView() { +export default function VitalityDependencyVersionStatusHelpListView() { const { translate } = useTranslation(); return ( ( - {translate('v6y-audit-helps.titles.show')} + {translate('v6y-audit-help.titles.show')} } queryOptions={{ diff --git a/v6y-apps/front-bo/src/features/v6y-evolution-helps/apis/createOrEditEvolutionHelp.ts b/v6y-apps/front-bo/src/features/v6y-evolution-help/apis/createOrEditEvolutionHelp.ts similarity index 100% rename from v6y-apps/front-bo/src/features/v6y-evolution-helps/apis/createOrEditEvolutionHelp.ts rename to v6y-apps/front-bo/src/features/v6y-evolution-help/apis/createOrEditEvolutionHelp.ts diff --git a/v6y-apps/front-bo/src/features/v6y-evolution-helps/apis/getEvolutionHelpDetailsByParams.ts b/v6y-apps/front-bo/src/features/v6y-evolution-help/apis/getEvolutionHelpDetailsByParams.ts similarity index 100% rename from v6y-apps/front-bo/src/features/v6y-evolution-helps/apis/getEvolutionHelpDetailsByParams.ts rename to v6y-apps/front-bo/src/features/v6y-evolution-help/apis/getEvolutionHelpDetailsByParams.ts diff --git a/v6y-apps/front-bo/src/features/v6y-evolution-helps/apis/getEvolutionHelpListByPageAndParams.ts b/v6y-apps/front-bo/src/features/v6y-evolution-help/apis/getEvolutionHelpListByPageAndParams.ts similarity index 100% rename from v6y-apps/front-bo/src/features/v6y-evolution-helps/apis/getEvolutionHelpListByPageAndParams.ts rename to v6y-apps/front-bo/src/features/v6y-evolution-help/apis/getEvolutionHelpListByPageAndParams.ts diff --git a/v6y-apps/front-bo/src/features/v6y-evolution-helps/apis/getEvolutionHelpStatus.ts b/v6y-apps/front-bo/src/features/v6y-evolution-help/apis/getEvolutionHelpStatus.ts similarity index 100% rename from v6y-apps/front-bo/src/features/v6y-evolution-helps/apis/getEvolutionHelpStatus.ts rename to v6y-apps/front-bo/src/features/v6y-evolution-help/apis/getEvolutionHelpStatus.ts diff --git a/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpDetailsView.tsx b/v6y-apps/front-bo/src/features/v6y-evolution-help/components/VitalityEvolutionHelpDetailsView.tsx similarity index 95% rename from v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpDetailsView.tsx rename to v6y-apps/front-bo/src/features/v6y-evolution-help/components/VitalityEvolutionHelpDetailsView.tsx index b7036948..1553ced0 100644 --- a/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpDetailsView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-evolution-help/components/VitalityEvolutionHelpDetailsView.tsx @@ -18,7 +18,7 @@ export default function VitalityEvolutionHelpDetailsView() { - {translate('v6y-evolution-helps.titles.show')} + {translate('v6y-evolution-help.titles.show')} } queryOptions={{ diff --git a/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpEditView.tsx b/v6y-apps/front-bo/src/features/v6y-evolution-help/components/VitalityEvolutionHelpEditView.tsx similarity index 96% rename from v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpEditView.tsx rename to v6y-apps/front-bo/src/features/v6y-evolution-help/components/VitalityEvolutionHelpEditView.tsx index 0890c45a..940c6692 100644 --- a/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpEditView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-evolution-help/components/VitalityEvolutionHelpEditView.tsx @@ -22,7 +22,7 @@ export default function VitalityEvolutionHelpEditView() { - {translate('v6y-evolution-helps.titles.edit')} + {translate('v6y-evolution-help.titles.edit')} } queryOptions={{ diff --git a/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpListView.tsx b/v6y-apps/front-bo/src/features/v6y-evolution-help/components/VitalityEvolutionHelpListView.tsx similarity index 95% rename from v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpListView.tsx rename to v6y-apps/front-bo/src/features/v6y-evolution-help/components/VitalityEvolutionHelpListView.tsx index 55dbcdb9..2f59041d 100644 --- a/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpListView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-evolution-help/components/VitalityEvolutionHelpListView.tsx @@ -12,7 +12,7 @@ export default function VitalityEvolutionHelpListView() { return ( { description: 'Default Description', explanation: 'Default Explanation', }, - statusHelp: undefined, + versionStatusHelp: undefined, evolutionHelp: undefined, }; @@ -103,11 +103,11 @@ describe('VitalityHelpView', () => { ).not.toBeInTheDocument(); }); - it('should render statusHelp if auditHelp is not available', () => { + it('should render versionStatusHelp if auditHelp is not available', () => { const mockModuleWithStatusHelp = { ...mockModule, auditHelp: undefined, - statusHelp: { + versionStatusHelp: { category: 'Status Category', title: 'Status Title', description: 'Status Description', @@ -123,11 +123,11 @@ describe('VitalityHelpView', () => { expect(screen.getByText('Status Category')).toBeInTheDocument(); }); - it('should render evolutionHelp if auditHelp and statusHelp are not available', () => { + it('should render evolutionHelp if auditHelp and versionStatusHelp are not available', () => { const mockModuleWithEvolutionHelp = { ...mockModule, auditHelp: undefined, - statusHelp: undefined, + versionStatusHelp: undefined, evolutionHelp: { category: 'Evolution Category', title: 'Evolution Title', diff --git a/v6y-apps/front/src/commons/components/__tests__/VitalityModulesView-test.tsx b/v6y-apps/front/src/commons/components/__tests__/VitalityModulesView-test.tsx index 43ad5a3d..e298a5d9 100644 --- a/v6y-apps/front/src/commons/components/__tests__/VitalityModulesView-test.tsx +++ b/v6y-apps/front/src/commons/components/__tests__/VitalityModulesView-test.tsx @@ -30,7 +30,7 @@ describe('VitalityModulesView', () => { }, branch: 'main', path: '/path/to/file1', - statusHelp: {}, + versionStatusHelp: {}, evolutionHelp: {}, }, { @@ -42,7 +42,7 @@ describe('VitalityModulesView', () => { scoreUnit: 'points', status: 'warning', auditHelp: {}, - statusHelp: { + versionStatusHelp: { category: 'Help Category 2', title: 'Help Title 2', description: 'Help Description 2', @@ -91,7 +91,7 @@ describe('VitalityModulesView', () => { auditHelp: {}, branch: '', path: '', - statusHelp: {}, + versionStatusHelp: {}, evolutionHelp: {}, }, ]; diff --git a/v6y-apps/front/src/commons/components/help/VitalityHelpView.tsx b/v6y-apps/front/src/commons/components/help/VitalityHelpView.tsx index 3eb28d32..871c0611 100644 --- a/v6y-apps/front/src/commons/components/help/VitalityHelpView.tsx +++ b/v6y-apps/front/src/commons/components/help/VitalityHelpView.tsx @@ -5,7 +5,7 @@ import VitalityTerms from '../../config/VitalityTerms'; import { VitalityModuleType } from '../../types/VitalityModulesProps'; const VitalityHelpView = ({ module }: { module: VitalityModuleType }) => { - const moduleHelp = module?.auditHelp || module?.statusHelp || module?.evolutionHelp; + const moduleHelp = module?.auditHelp || module?.versionStatusHelp || module?.evolutionHelp; return ( { ? `${itemModule.score || 0} ${itemModule.scoreUnit || ''}` : ''; const hasAuditHelp = Object.keys(itemModule.auditHelp || {}).length > 0; - const hasDependencyStatusHelp = - Object.keys(itemModule.statusHelp || {}).length > 0; + const hasDependencyVersionStatusHelp = + Object.keys(itemModule.versionStatusHelp || {}).length > 0; const hasEvolutionHelp = Object.keys(itemModule.evolutionHelp || {}).length > 0; return ( @@ -52,7 +52,7 @@ const VitalityModulesView = ({ modules }: VitalityModulesProps) => { {patternName} {(hasAuditHelp || - hasDependencyStatusHelp || + hasDependencyVersionStatusHelp || hasEvolutionHelp) && (