diff --git a/src/main/style/atom/button/_button.scss b/src/main/style/atom/button/_button.scss index f7ef2456424..8ee9f107163 100644 --- a/src/main/style/atom/button/_button.scss +++ b/src/main/style/atom/button/_button.scss @@ -1,2 +1,3 @@ @use 'button-main/button-main'; @use 'button-switch/button-switch'; +@use 'button-toggle/button-toggle'; diff --git a/src/main/style/atom/button/button-toggle/_button-toggle.scss b/src/main/style/atom/button/button-toggle/_button-toggle.scss new file mode 100644 index 00000000000..886b2c0df49 --- /dev/null +++ b/src/main/style/atom/button/button-toggle/_button-toggle.scss @@ -0,0 +1,42 @@ +@use 'sass:math'; +@use '../../../token/colors' as colors; +@use '../../../token/color/brand' as brand; +@use '../button-main/button-main' as button-main; + +$jhlite-button-toggle-padding: math.div(5, 16) * 1rem math.div(15, 16) * 1rem; +$jhlite-button-toggle-border: 1px solid brand.$jhlite-color-brand-600; +$jhlite-button-toggle-font-size: math.div(13, 16) * 1rem; +$jhlite-button-toggle-hover-color-background: rgba(button-main.$jhlite-button-color-background, 0.1); +$jhlite-button-toggle-disabled-color-background: button-main.$jhlite-button-disabled-color-background; +$jhlite-button-toggle-active-color-background: button-main.$jhlite-button-color-background; +$jhlite-button-toggle-active-hover-color-background: button-main.$jhlite-button-hover-color-background; + +.jhlite-button-toggle { + @extend %jhlite-button-main; + + border: $jhlite-button-toggle-border; + background-color: transparent; + padding: $jhlite-button-toggle-padding; + text-transform: none; + color: var(--jhlite-global-color-text); + font-size: $jhlite-button-toggle-font-size; + + &:hover { + background-color: $jhlite-button-toggle-hover-color-background; + } + + &:disabled { + &:hover { + background-color: $jhlite-button-toggle-disabled-color-background; + } + } + + &.-active { + background-color: $jhlite-button-toggle-active-color-background; + color: colors.$jhlite-global-color-text-light; + + &:hover { + background-color: $jhlite-button-toggle-active-hover-color-background; + } + } +} diff --git a/src/main/style/atom/button/button-toggle/button-toggle.code.pug b/src/main/style/atom/button/button-toggle/button-toggle.code.pug new file mode 100644 index 00000000000..19a1b78f671 --- /dev/null +++ b/src/main/style/atom/button/button-toggle/button-toggle.code.pug @@ -0,0 +1,5 @@ +include button-toggle.mixin.pug + ++jhlite-button-toggle Toggle ++jhlite-button-toggle({active: true}) Toggle active ++jhlite-button-toggle({disabled: true}) Toggle disabled diff --git a/src/main/style/atom/button/button-toggle/button-toggle.md b/src/main/style/atom/button/button-toggle/button-toggle.md new file mode 100644 index 00000000000..e9f22293c67 --- /dev/null +++ b/src/main/style/atom/button/button-toggle/button-toggle.md @@ -0,0 +1 @@ +### Button toggle diff --git a/src/main/style/atom/button/button-toggle/button-toggle.mixin.pug b/src/main/style/atom/button/button-toggle/button-toggle.mixin.pug new file mode 100644 index 00000000000..152208ce93f --- /dev/null +++ b/src/main/style/atom/button/button-toggle/button-toggle.mixin.pug @@ -0,0 +1,5 @@ +mixin jhlite-button-toggle(opts) + - const { active, disabled } = opts || {}; + - const activeClass = active ? '-active' : null; + button.jhlite-button-toggle(class=activeClass, disabled=disabled) + block diff --git a/src/main/style/atom/button/button-toggle/button-toggle.render.pug b/src/main/style/atom/button/button-toggle/button-toggle.render.pug new file mode 100644 index 00000000000..2b53d2a1636 --- /dev/null +++ b/src/main/style/atom/button/button-toggle/button-toggle.render.pug @@ -0,0 +1,4 @@ +extends /layout + +block body + include button-toggle.code.pug diff --git a/src/main/style/atom/button/button.pug b/src/main/style/atom/button/button.pug index 0b246723d39..e6e7beba2a1 100644 --- a/src/main/style/atom/button/button.pug +++ b/src/main/style/atom/button/button.pug @@ -5,3 +5,5 @@ include:componentDoc(height=150) button-main/button-main.md .tikui-vertical-spacing--line include:componentDoc(height=150) button-switch/button-switch.md + .tikui-vertical-spacing--line + include:componentDoc(height=150) button-toggle/button-toggle.md diff --git a/src/main/style/organism/_organism.scss b/src/main/style/organism/_organism.scss index 99a46441d9c..b5c61cb5a6f 100644 --- a/src/main/style/organism/_organism.scss +++ b/src/main/style/organism/_organism.scss @@ -9,3 +9,4 @@ @use 'landscape-loader/landscape-loader'; @use 'landscape-minimap/landscape-minimap'; @use 'landscape-preset-configuration/landscape-preset-configuration'; +@use 'landscape-rank-module-filter/landscape-rank-module-filter'; diff --git a/src/main/style/organism/landscape-rank-module-filter/_landscape-rank-module-filter.scss b/src/main/style/organism/landscape-rank-module-filter/_landscape-rank-module-filter.scss new file mode 100644 index 00000000000..ec9600ebd4d --- /dev/null +++ b/src/main/style/organism/landscape-rank-module-filter/_landscape-rank-module-filter.scss @@ -0,0 +1,9 @@ +@use '../../token/size'; + +.jhlite-landscape-rank-module-filter { + &--ranks { + display: flex; + gap: size.$jhlite-global-size-field-padding; + align-items: center; + } +} diff --git a/src/main/style/organism/landscape-rank-module-filter/landscape-rank-module-filter.code.pug b/src/main/style/organism/landscape-rank-module-filter/landscape-rank-module-filter.code.pug new file mode 100644 index 00000000000..8e1b90b5c0e --- /dev/null +++ b/src/main/style/organism/landscape-rank-module-filter/landscape-rank-module-filter.code.pug @@ -0,0 +1,3 @@ +include landscape-rank-module-filter.mixin.pug + ++jhlite-landscape-rank-module-filter diff --git a/src/main/style/organism/landscape-rank-module-filter/landscape-rank-module-filter.md b/src/main/style/organism/landscape-rank-module-filter/landscape-rank-module-filter.md new file mode 100644 index 00000000000..3474467def7 --- /dev/null +++ b/src/main/style/organism/landscape-rank-module-filter/landscape-rank-module-filter.md @@ -0,0 +1 @@ +## Landscape rank module filter diff --git a/src/main/style/organism/landscape-rank-module-filter/landscape-rank-module-filter.mixin.pug b/src/main/style/organism/landscape-rank-module-filter/landscape-rank-module-filter.mixin.pug new file mode 100644 index 00000000000..973b52c00f0 --- /dev/null +++ b/src/main/style/organism/landscape-rank-module-filter/landscape-rank-module-filter.mixin.pug @@ -0,0 +1,10 @@ +include /atom/button/button-toggle/button-toggle.mixin.pug + +mixin jhlite-landscape-rank-module-filter + .jhlite-landscape-rank-module-filter + .jhlite-landscape-rank-module-filter--ranks + +jhlite-button-toggle D + +jhlite-button-toggle({ disabled: true }) C + +jhlite-button-toggle({ disabled: true }) B + +jhlite-button-toggle({ disabled: true }) A + +jhlite-button-toggle({ active: true }) S diff --git a/src/main/style/organism/landscape-rank-module-filter/landscape-rank-module-filter.render.pug b/src/main/style/organism/landscape-rank-module-filter/landscape-rank-module-filter.render.pug new file mode 100644 index 00000000000..f944ccb27d7 --- /dev/null +++ b/src/main/style/organism/landscape-rank-module-filter/landscape-rank-module-filter.render.pug @@ -0,0 +1,4 @@ +extends /layout + +block body + include landscape-rank-module-filter.code.pug diff --git a/src/main/style/organism/landscape/_landscape.scss b/src/main/style/organism/landscape/_landscape.scss index 7993f9cee17..9e720a524a3 100644 --- a/src/main/style/organism/landscape/_landscape.scss +++ b/src/main/style/organism/landscape/_landscape.scss @@ -3,7 +3,10 @@ @use '../../token/size'; $jhlite-landscape-padding: 20px; +$jhipster-landscape-modes-selection-top-position: $jhlite-landscape-padding; $jhipster-landscape-preset-selection-top-position: 85px; +$jhipster-landscape-modes-selection-top-position-large-screen: 85px; +$jhipster-landscape-preset-selection-top-position-large-screen: 150px; $jhipster-landscape-preset-selection-left-position: $jhlite-landscape-padding; $jhlite-landscape-line-color: colors.$jhlite-global-line-color; $jhlite-landscape-box-radius: colors.$jhlite-global-box-radius; @@ -23,7 +26,7 @@ $jhlite-landscape-primary-alternative-color: colors.$jhlite-global-primary-alter .jhipster-landscape-modes-selection { position: absolute; - top: $jhlite-landscape-padding; + top: $jhipster-landscape-modes-selection-top-position; left: $jhlite-landscape-padding; z-index: 3; border: 1px dotted $jhlite-landscape-line-color; @@ -40,6 +43,13 @@ $jhlite-landscape-primary-alternative-color: colors.$jhlite-global-primary-alter background: var(--jhlite-chip-bg-color); } + .jhipster-landscape-rank-module-selection { + display: flex; + justify-content: center; + margin-left: $jhlite-landscape-padding; + background: var(--jhlite-chip-bg-color); + } + .jhipster-landscape-content { &--header { display: none; @@ -184,6 +194,11 @@ $jhlite-landscape-primary-alternative-color: colors.$jhlite-global-primary-alter border-radius: size.$jhlite-global-size-field-radius; box-shadow: 0 0 0 size.$jhlite-global-size-field-border-focus colors.$jhlite-attention-highlight-color; } + + .-diff-rank-minimal-emphasis { + opacity: 0.5; + border: 1px dotted $jhlite-landscape-line-color; + } } .jhipster-landscape { @@ -192,6 +207,14 @@ $jhlite-landscape-primary-alternative-color: colors.$jhlite-global-primary-alter @media screen and (min-width: breakpoint.$jhlite-global-breakpoint-small-medium) { .jhipster-landscape { + .jhipster-landscape-modes-selection { + top: $jhipster-landscape-modes-selection-top-position-large-screen; + } + + .jhipster-landscape-preset-selection { + top: $jhipster-landscape-preset-selection-top-position-large-screen; + } + .jhipster-landscape-content { display: flex; flex-direction: column; diff --git a/src/main/style/organism/organism.pug b/src/main/style/organism/organism.pug index b772faf30ea..9648434611b 100644 --- a/src/main/style/organism/organism.pug +++ b/src/main/style/organism/organism.pug @@ -22,6 +22,8 @@ block content include:componentDoc(height=160) landscape-minimap/landscape-minimap.md .tikui-vertical-spacing--line include:componentDoc(height=160) landscape-preset-configuration/landscape-preset-configuration.md + .tikui-vertical-spacing--line + include:componentDoc(height=160) landscape-rank-module-filter/landscape-rank-module-filter.md .tikui-vertical-spacing--line include:componentDoc(height=230) module-parameters/module-parameters.md .tikui-vertical-spacing--line diff --git a/src/main/webapp/app/module/domain/ModuleRankCount.ts b/src/main/webapp/app/module/domain/ModuleRankCount.ts new file mode 100644 index 00000000000..c7b224fb984 --- /dev/null +++ b/src/main/webapp/app/module/domain/ModuleRankCount.ts @@ -0,0 +1,8 @@ +import { ModuleRank } from '@/module/domain/landscape/ModuleRank'; + +type ModuleRankCountQuantity = number; + +export type ModuleRankCount = { + rank: ModuleRank; + quantity: ModuleRankCountQuantity; +}; diff --git a/src/main/webapp/app/module/domain/ModuleRankStatistics.ts b/src/main/webapp/app/module/domain/ModuleRankStatistics.ts new file mode 100644 index 00000000000..84446b8f90b --- /dev/null +++ b/src/main/webapp/app/module/domain/ModuleRankStatistics.ts @@ -0,0 +1,25 @@ +import { ModuleRankCount } from '@/module/domain/ModuleRankCount'; +import { Landscape } from '@/module/domain/landscape/Landscape'; +import { ModuleRank, RANKS } from '@/module/domain/landscape/ModuleRank'; + +export type ModuleRankStatistics = ModuleRankCount[]; + +export const toModuleRankStatistics = (landscape: Landscape): ModuleRankStatistics => { + const rankCounts = landscape + .standaloneLevels() + .flatMap(level => level.elements) + .flatMap(element => element.allModules()) + .reduce( + (counts, module) => { + const currentCount = counts.get(module.rank())!; + counts.set(module.rank(), currentCount + 1); + return counts; + }, + new Map(RANKS.map(rank => [rank, 0])), + ); + + return RANKS.map(rank => ({ + rank, + quantity: rankCounts.get(rank)!, + })); +}; diff --git a/src/main/webapp/app/module/domain/RankDescription.ts b/src/main/webapp/app/module/domain/RankDescription.ts new file mode 100644 index 00000000000..5aedeecfca1 --- /dev/null +++ b/src/main/webapp/app/module/domain/RankDescription.ts @@ -0,0 +1,3 @@ +export type RankDescription = { + [key: string]: string; +}; diff --git a/src/main/webapp/app/module/domain/landscape/Landscape.ts b/src/main/webapp/app/module/domain/landscape/Landscape.ts index f06d90a2a9b..1f2dc01f215 100644 --- a/src/main/webapp/app/module/domain/landscape/Landscape.ts +++ b/src/main/webapp/app/module/domain/landscape/Landscape.ts @@ -1,3 +1,5 @@ +import { LandscapeElement } from '@/module/domain/landscape/LandscapeElement'; +import { ModuleRank } from '@/module/domain/landscape/ModuleRank'; import { Memoizer } from '@/shared/memoizer/domain/Memoizer'; import { Optional } from '@/shared/optional/domain/Optional'; import { ModulePropertyDefinition } from '../ModulePropertyDefinition'; @@ -404,6 +406,66 @@ export class Landscape { selectedModulesProperties(): ModulePropertyDefinition[] { return this.properties; } + + public hasModuleDifferentRank(module: ModuleSlug, rank: ModuleRank): boolean { + return this.getModule(module) + .map(currentModule => currentModule.rank() !== rank) + .orElse(false); + } + + public filterByRank(rank: Optional): Landscape { + return rank.map(currentRank => this.createFilteredLandscape(currentRank)).orElse(this); + } + + private createFilteredLandscape(rank: ModuleRank): Landscape { + const filteredLevels = this.projections.levels.map(level => this.filterLevel(level, rank)).filter(level => level.elements.length > 0); + + return new Landscape(this.state, new LevelsProjections(filteredLevels)); + } + + private filterLevel(level: LandscapeLevel, rank: ModuleRank): { elements: LandscapeElement[] } { + return { + elements: level.elements.map(element => this.filterElementByRank(element, rank)).flatMap(optional => optional.toArray()), + }; + } + + private filterElementByRank(element: LandscapeElement, rank: ModuleRank): Optional { + return element instanceof LandscapeFeature ? this.filterFeature(element, rank) : this.filterModule(element, rank); + } + + private filterFeature(feature: LandscapeFeature, rank: ModuleRank): Optional { + if (this.dependencyFeatureOfRankedModule(feature.slug(), rank)) { + return Optional.of(feature); + } + + return Optional.of(feature.modules) + .filter(modules => modules.some(module => this.moduleMatchingRank(module, rank))) + .map(modules => modules.filter(module => this.moduleMatchingRank(module, rank))) + .map(filteredModules => new LandscapeFeature(feature.slug(), filteredModules)); + } + + private dependencyFeatureOfRankedModule(featureSlug: LandscapeFeatureSlug, rank: ModuleRank): boolean { + return Array.from(this.modules.values()) + .filter(module => module.rank() === rank) + .some(rankedModule => rankedModule.dependencies().some(dep => dep.get() === featureSlug.get())); + } + + private moduleMatchingRank(module: LandscapeModule, rank: ModuleRank): boolean { + return module.rank() === rank || this.dependencyOfRankedModule(module, rank); + } + + private dependencyOfRankedModule(module: LandscapeModule, rank: ModuleRank): boolean { + return Optional.of(Array.from(this.modules.values())) + .map(modules => modules.filter(m => m.rank() === rank)) + .map(rankedModules => rankedModules.some(rankedModule => rankedModule.dependencies().some(dep => dep.get() === module.slug().get()))) + .orElse(false); + } + + private filterModule(element: LandscapeElement, rank: ModuleRank): Optional { + return Optional.of(element.allModules()[0]) + .filter(module => this.moduleMatchingRank(module, rank)) + .map(() => element); + } } class LandscapeState { diff --git a/src/main/webapp/app/module/domain/landscape/LandscapeModule.ts b/src/main/webapp/app/module/domain/landscape/LandscapeModule.ts index 1795cc8f6d0..0f52f6fd199 100644 --- a/src/main/webapp/app/module/domain/landscape/LandscapeModule.ts +++ b/src/main/webapp/app/module/domain/landscape/LandscapeModule.ts @@ -1,3 +1,4 @@ +import { ModuleRank } from '@/module/domain/landscape/ModuleRank'; import { ModulePropertyDefinition } from '../ModulePropertyDefinition'; import { ModuleSlug } from '../ModuleSlug'; import { LandscapeElement } from './LandscapeElement'; @@ -11,6 +12,7 @@ export interface LandscapeModuleInformation { operation: ModuleOperation; properties: ModulePropertyDefinition[]; dependencies: LandscapeElementId[]; + rank: ModuleRank; } export interface LandscapeModuleContext { @@ -49,6 +51,10 @@ export class LandscapeModule implements LandscapeElement { return this.information.dependencies; } + rank(): ModuleRank { + return this.information.rank; + } + operation(): string { return this.information.operation; } diff --git a/src/main/webapp/app/module/domain/landscape/ModuleRank.ts b/src/main/webapp/app/module/domain/landscape/ModuleRank.ts new file mode 100644 index 00000000000..749b4638ec1 --- /dev/null +++ b/src/main/webapp/app/module/domain/landscape/ModuleRank.ts @@ -0,0 +1,2 @@ +export const RANKS = ['RANK_D', 'RANK_C', 'RANK_B', 'RANK_A', 'RANK_S'] as const; +export type ModuleRank = (typeof RANKS)[number]; diff --git a/src/main/webapp/app/module/primary/landscape-rank-module-filter/LandscapeRankModuleFilter.component.ts b/src/main/webapp/app/module/primary/landscape-rank-module-filter/LandscapeRankModuleFilter.component.ts new file mode 100644 index 00000000000..262e2ffd922 --- /dev/null +++ b/src/main/webapp/app/module/primary/landscape-rank-module-filter/LandscapeRankModuleFilter.component.ts @@ -0,0 +1,54 @@ +import type { ModuleRank } from '@/module/domain/landscape/ModuleRank'; +import { RANKS } from '@/module/domain/landscape/ModuleRank'; +import type { ModuleRankStatistics } from '@/module/domain/ModuleRankStatistics'; +import type { RankDescription } from '@/module/domain/RankDescription'; +import { PropType, defineComponent, ref } from 'vue'; + +export default defineComponent({ + name: 'LandscapeRankModuleFilterVue', + props: { + moduleRankStatistics: { + type: Array as PropType, + required: true, + }, + }, + emits: ['selected'], + setup(props, { emit }) { + const ranks = RANKS; + const selectedRank = ref(undefined); + + const rankDescriptions: RankDescription = { + RANK_D: 'Experimental or advanced module requiring specific expertise', + RANK_C: 'Module without known production usage', + RANK_B: 'Module with at least one confirmed production usage', + RANK_A: 'Module with multiple production usages across different projects and documented through talks, books or blog posts', + RANK_S: 'Production-proven module providing unique features, validated by community feedback (10+ endorsements)', + }; + + const isRankSelected = (rank: ModuleRank): boolean => selectedRank.value === rank; + + const toggleRank = (rank: ModuleRank): void => { + if (selectedRank.value === rank) { + selectedRank.value = undefined; + } else { + selectedRank.value = rank; + } + emit('selected', selectedRank.value); + }; + + const formatRank = (rank: ModuleRank): string => rank.replace('RANK_', ''); + + const getRankDescription = (rank: ModuleRank): string => rankDescriptions[rank]; + + const isRankDisabled = (rank: ModuleRank): boolean => props.moduleRankStatistics.find(ru => ru.rank === rank)?.quantity === 0; + + return { + ranks, + isRankSelected, + toggleRank, + formatRank, + getRankDescription, + isRankDisabled, + }; + }, +}); diff --git a/src/main/webapp/app/module/primary/landscape-rank-module-filter/LandscapeRankModuleFilter.html b/src/main/webapp/app/module/primary/landscape-rank-module-filter/LandscapeRankModuleFilter.html new file mode 100644 index 00000000000..259a3fd9abc --- /dev/null +++ b/src/main/webapp/app/module/primary/landscape-rank-module-filter/LandscapeRankModuleFilter.html @@ -0,0 +1,16 @@ +
+
+ +
+
diff --git a/src/main/webapp/app/module/primary/landscape-rank-module-filter/LandscapeRankModuleFilter.vue b/src/main/webapp/app/module/primary/landscape-rank-module-filter/LandscapeRankModuleFilter.vue new file mode 100644 index 00000000000..2bb55a48920 --- /dev/null +++ b/src/main/webapp/app/module/primary/landscape-rank-module-filter/LandscapeRankModuleFilter.vue @@ -0,0 +1,3 @@ + + + diff --git a/src/main/webapp/app/module/primary/landscape-rank-module-filter/index.ts b/src/main/webapp/app/module/primary/landscape-rank-module-filter/index.ts new file mode 100644 index 00000000000..55a0d7b7b2e --- /dev/null +++ b/src/main/webapp/app/module/primary/landscape-rank-module-filter/index.ts @@ -0,0 +1,3 @@ +import LandscapeRankModuleFilterVue from './LandscapeRankModuleFilter.vue'; + +export { LandscapeRankModuleFilterVue }; diff --git a/src/main/webapp/app/module/primary/landscape/Landscape.component.ts b/src/main/webapp/app/module/primary/landscape/Landscape.component.ts index 48b13eaa701..1ef1b32b71d 100644 --- a/src/main/webapp/app/module/primary/landscape/Landscape.component.ts +++ b/src/main/webapp/app/module/primary/landscape/Landscape.component.ts @@ -8,6 +8,8 @@ import { import { AnchorPointState } from '@/module/domain/AnchorPointState'; import { ModuleParameter } from '@/module/domain/ModuleParameter'; import { ModulePropertyDefinition } from '@/module/domain/ModulePropertyDefinition'; +import type { ModuleRankStatistics } from '@/module/domain/ModuleRankStatistics'; +import { toModuleRankStatistics } from '@/module/domain/ModuleRankStatistics'; import { ModuleSlug } from '@/module/domain/ModuleSlug'; import { Preset } from '@/module/domain/Preset'; import { ProjectHistory } from '@/module/domain/ProjectHistory'; @@ -19,6 +21,8 @@ import { LandscapeFeatureSlug } from '@/module/domain/landscape/LandscapeFeature import { LandscapeLevel } from '@/module/domain/landscape/LandscapeLevel'; import { LandscapeModule } from '@/module/domain/landscape/LandscapeModule'; import { LandscapeSelectionElement } from '@/module/domain/landscape/LandscapeSelectionElement'; +import { ModuleRank } from '@/module/domain/landscape/ModuleRank'; +import { LandscapeRankModuleFilterVue } from '@/module/primary/landscape-rank-module-filter'; import { ALERT_BUS } from '@/shared/alert/application/AlertProvider'; import { IconVue } from '@/shared/icon/infrastructure/primary'; import { Loader } from '@/shared/loader/infrastructure/primary/Loader'; @@ -46,6 +50,7 @@ export default defineComponent({ LandscapeLoaderVue, LandscapeMiniMapVue, LandscapePresetConfigurationVue, + LandscapeRankModuleFilterVue, }, setup() { const applicationListener = inject(APPLICATION_LISTENER); @@ -58,6 +63,7 @@ export default defineComponent({ const selectedMode = ref('COMPACTED'); const landscape = ref(Loader.loading()); + const originalLandscape = ref(Loader.loading()); const levels = ref(Loader.loading()); const canLoadMiniMap = ref(false); @@ -90,6 +96,9 @@ export default defineComponent({ const highlightedModule = ref>(Optional.empty()); + const selectedRank = ref>(Optional.empty()); + const moduleRankStatistics = ref([]); + onMounted(() => { modules .landscape() @@ -142,6 +151,8 @@ export default defineComponent({ }; const loadLandscape = async (response: Landscape): Promise => { + originalLandscape.value.loaded(response); + landscape.value.loaded(response); levels.value.loaded(response.standaloneLevels()); @@ -152,6 +163,7 @@ export default defineComponent({ canLoadMiniMap.value = true; loadAnchorPointModulesMap(); + loadLandscapeRankModuleFilterProperty(); }; const loadAnchorPointModulesMap = (): void => { @@ -178,6 +190,10 @@ export default defineComponent({ }); }; + const loadLandscapeRankModuleFilterProperty = (): void => { + moduleRankStatistics.value = toModuleRankStatistics(landscapeValue()); + }; + type Navigation = 'ArrowLeft' | 'ArrowRight' | 'ArrowUp' | 'ArrowDown' | 'Space'; type NavigationAction = { [key in Navigation]: keyof LandscapeNavigation; @@ -311,6 +327,7 @@ export default defineComponent({ + flavorClass() + anchorPointClass(module) + searchHighlightClass(module) + + diffRankMinimalEmphasisClass(module) ); }; @@ -391,6 +408,17 @@ export default defineComponent({ .orElse(''); }; + const diffRankMinimalEmphasisClass = (module: LandscapeElementId): string => { + if (module instanceof LandscapeFeatureSlug) { + return ''; + } + + return selectedRank.value + .map(rank => landscapeValue().hasModuleDifferentRank(module, rank)) + .map(hasDifferentRank => (hasDifferentRank ? ' -diff-rank-minimal-emphasis' : '')) + .orElse(''); + }; + const modeClass = (): string => { switch (selectedMode.value) { case 'COMPACTED': @@ -620,6 +648,30 @@ export default defineComponent({ } }; + const handleRankFilter = (rank: ModuleRank | undefined): void => { + clearPresetSelection(); + + selectedRank.value = Optional.ofNullable(rank); + void reloadLandscape(originalLandscape.value.value().filterByRank(selectedRank.value)); + }; + + const reloadLandscape = async (response: Landscape): Promise => { + landscape.value.loaded(response); + levels.value.loaded(response.standaloneLevels()); + + await rebuildLandscapeElements(); + + await nextTick().then(updateConnectors); + landscapeNavigation.value.loaded(new LandscapeNavigation(landscapeElements.value, levels.value.value())); + loadAnchorPointModulesMap(); + }; + + const rebuildLandscapeElements = async (): Promise => { + // Wait for DOM update before clearing and rebuilding refs + await nextTick(); + landscapeElements.value = new Map(); + }; + return { levels, isFeature, @@ -662,6 +714,8 @@ export default defineComponent({ canLoadMiniMap, selectedPresetName, performSearch, + handleRankFilter, + moduleRankStatistics, }; }, }); diff --git a/src/main/webapp/app/module/primary/landscape/Landscape.html b/src/main/webapp/app/module/primary/landscape/Landscape.html index 7a26fd98163..f243cfaaef0 100644 --- a/src/main/webapp/app/module/primary/landscape/Landscape.html +++ b/src/main/webapp/app/module/primary/landscape/Landscape.html @@ -28,6 +28,9 @@
+
+ +
diff --git a/src/main/webapp/app/module/secondary/RestLandscapeModule.ts b/src/main/webapp/app/module/secondary/RestLandscapeModule.ts index aed1e5c30f2..7602a031b4f 100644 --- a/src/main/webapp/app/module/secondary/RestLandscapeModule.ts +++ b/src/main/webapp/app/module/secondary/RestLandscapeModule.ts @@ -1,3 +1,4 @@ +import { ModuleRank } from '@/module/domain/landscape/ModuleRank'; import { LandscapeElementId } from '../domain/landscape/LandscapeElementId'; import { LandscapeElementType } from '../domain/landscape/LandscapeElementType'; import { LandscapeFeatureSlug } from '../domain/landscape/LandscapeFeatureSlug'; @@ -11,6 +12,7 @@ export interface RestLandscapeModule { operation: string; properties: RestModulePropertiesDefinitions; dependencies?: RestLandscapeDependency[]; + rank: ModuleRank; } export interface RestLandscapeDependency { @@ -24,6 +26,7 @@ export const toLandscapeModule = (module: RestLandscapeModule): LandscapeModule operation: module.operation, properties: toPropertiesDefinitions(module.properties), dependencies: toModuleDependencies(module.dependencies), + rank: module.rank, }); const toModuleDependencies = (dependencies: RestLandscapeDependency[] | undefined): LandscapeElementId[] => { diff --git a/src/test/webapp/unit/module/domain/landscape/Landscape.fixture.ts b/src/test/webapp/unit/module/domain/landscape/Landscape.fixture.ts index 97c7dcf9cd8..ea31761ff78 100644 --- a/src/test/webapp/unit/module/domain/landscape/Landscape.fixture.ts +++ b/src/test/webapp/unit/module/domain/landscape/Landscape.fixture.ts @@ -3,6 +3,7 @@ import { LandscapeElementId } from '@/module/domain/landscape/LandscapeElementId import { LandscapeFeature } from '@/module/domain/landscape/LandscapeFeature'; import { LandscapeFeatureSlug } from '@/module/domain/landscape/LandscapeFeatureSlug'; import { LandscapeModule } from '@/module/domain/landscape/LandscapeModule'; +import { ModuleRank } from '@/module/domain/landscape/ModuleRank'; import { ModulePropertyDefinition } from '@/module/domain/ModulePropertyDefinition'; import { ModuleSlug } from '@/module/domain/ModuleSlug'; import { @@ -18,8 +19,8 @@ export const defaultLandscape = (): Landscape => Landscape.initialState([ { elements: [ - initialModule('infinitest', 'Add infinitest filters', [applicationBaseNamePropertyDefinition()], []), - initialModule('init', 'Add some initial tools', [applicationBaseNamePropertyDefinition()], []), + initialModule('infinitest', 'Add infinitest filters', [applicationBaseNamePropertyDefinition()], [], 'RANK_S'), + initialModule('init', 'Add some initial tools', [applicationBaseNamePropertyDefinition()], [], 'RANK_S'), initialModule( 'init-props', 'Add some initial tools with extra properties', @@ -37,7 +38,7 @@ export const defaultLandscape = (): Landscape => { elements: [ new LandscapeFeature(featureSlug('client'), [ - initialModule('vue', 'Add vue', [], moduleSlugs('init')), + initialModule('vue', 'Add vue', [], moduleSlugs('init'), 'RANK_S'), initialModule('react', 'Add react', [], moduleSlugs('init')), initialModule('angular', 'Add angular', [], moduleSlugs('init')), ]), @@ -46,11 +47,11 @@ export const defaultLandscape = (): Landscape => }, { elements: [ - initialModule('java-base', 'Add base java classes', [], featureSlugs('java-build-tools')), + initialModule('java-base', 'Add base java classes', [], featureSlugs('java-build-tools'), 'RANK_S'), initialModule('spring-boot', 'Add spring boot core', [], featureSlugs('java-build-tools')), new LandscapeFeature(featureSlug('ci'), [ - initialModule('gitlab-maven', 'Add simple gitlab ci for maven', [], moduleSlugs('maven')), - initialModule('gitlab-gradle', 'Add simple gitlab ci for gradle', [], moduleSlugs('gradle')), + initialModule('gitlab-maven', 'Add simple gitlab ci for maven', [], moduleSlugs('maven'), 'RANK_S'), + initialModule('gitlab-gradle', 'Add simple gitlab ci for gradle', [], moduleSlugs('gradle'), 'RANK_S'), ]), ], }, @@ -84,12 +85,14 @@ const initialModule = ( operation: string, properties: ModulePropertyDefinition[], dependencies: LandscapeElementId[], + rank: ModuleRank = 'RANK_D', ): LandscapeModule => LandscapeModule.initialState({ slug: moduleSlug(slug), operation, properties, dependencies, + rank, }); const featureSlugs = (...slugs: string[]): LandscapeFeatureSlug[] => slugs.map(featureSlug); diff --git a/src/test/webapp/unit/module/domain/landscape/Landscape.spec.ts b/src/test/webapp/unit/module/domain/landscape/Landscape.spec.ts index 915f17ae412..ad19e0bd506 100644 --- a/src/test/webapp/unit/module/domain/landscape/Landscape.spec.ts +++ b/src/test/webapp/unit/module/domain/landscape/Landscape.spec.ts @@ -1,5 +1,7 @@ +import { LandscapeFeature } from '@/module/domain/landscape/LandscapeFeature'; import { LandscapeSelectionElement } from '@/module/domain/landscape/LandscapeSelectionElement'; import { LandscapeSelectionTree } from '@/module/domain/landscape/LandscapeSelectionTree'; +import { Optional } from '@/shared/optional/domain/Optional'; import { describe, expect, it } from 'vitest'; import { applicationBaseNamePropertyDefinition, moduleSlug, optionalBooleanPropertyDefinition } from '../Modules.fixture'; import { defaultLandscape, featureSlug } from './Landscape.fixture'; @@ -286,6 +288,133 @@ describe('Landscape', () => { expect(properties).toEqual([applicationBaseNamePropertyDefinition(), optionalBooleanPropertyDefinition()]); }); }); + + describe('Has module different rank', () => { + it('should not detect different ranks when checking an unknown module', () => { + const landscape = defaultLandscape(); + + expect(landscape.hasModuleDifferentRank(moduleSlug('unknown'), 'RANK_S')).toBe(false); + }); + + it('should not detect different ranks when module has same rank as checked', () => { + const landscape = defaultLandscape(); + + expect(landscape.hasModuleDifferentRank(moduleSlug('init'), 'RANK_S')).toBe(false); + }); + + it('should detect different ranks when module has different rank from checked', () => { + const landscape = defaultLandscape(); + + expect(landscape.hasModuleDifferentRank(moduleSlug('react'), 'RANK_S')).toBe(true); + }); + }); + + describe('Filter by rank', () => { + it('should return same landscape when no rank filter is applied', () => { + const landscape = defaultLandscape(); + + const filteredLandscape = landscape.filterByRank(Optional.empty()); + + expect(filteredLandscape).toEqual(landscape); + }); + + it('should filter modules by rank', () => { + const landscape = defaultLandscape(); + + const filteredLandscape = landscape.filterByRank(Optional.of('RANK_S')); + + const levels = filteredLandscape.standaloneLevels(); + expect(levels).toHaveLength(3); + const rootModules = levels[0].elements.flatMap(element => element.allModules()); + expect(rootModules).toHaveLength(2); + expect(rootModules).toEqual( + expect.arrayContaining([ + expect.objectContaining({ + information: expect.objectContaining({ + slug: moduleSlug('infinitest'), + rank: 'RANK_S', + }), + }), + expect.objectContaining({ + information: expect.objectContaining({ + slug: moduleSlug('init'), + rank: 'RANK_S', + }), + }), + ]), + ); + const clientFeatureModules = levels[1].elements[0].allModules(); + expect(clientFeatureModules).toHaveLength(1); + expect(clientFeatureModules[0]).toEqual( + expect.objectContaining({ + information: expect.objectContaining({ + slug: moduleSlug('vue'), + rank: 'RANK_S', + }), + }), + ); + }); + + it('should filter modules in feature keeping only modules with specified rank', () => { + const landscape = defaultLandscape(); + + const filteredLandscape = landscape.filterByRank(Optional.of('RANK_S')); + + const clientFeature = filteredLandscape + .standaloneLevels()[1] + .elements.find(element => element instanceof LandscapeFeature && element.slugString() === 'client'); + expect(clientFeature).toBeDefined(); + expect(clientFeature?.allModules()).toEqual([ + expect.objectContaining({ + information: expect.objectContaining({ + slug: moduleSlug('vue'), + rank: 'RANK_S', + }), + }), + ]); + }); + + it('should keep dependency modules with different ranks than the rank filter applied', () => { + const landscape = defaultLandscape(); + + const filteredLandscape = landscape.filterByRank(Optional.of('RANK_D')); + + const levels = filteredLandscape.standaloneLevels(); + const initModule = levels[0].elements[0].allModules()[0]; + expect(initModule).toEqual( + expect.objectContaining({ + information: expect.objectContaining({ + slug: moduleSlug('init'), + rank: 'RANK_S', + }), + }), + ); + const reactModule = levels[1].elements[0].allModules()[0]; + expect(reactModule).toEqual( + expect.objectContaining({ + information: expect.objectContaining({ + slug: moduleSlug('react'), + rank: 'RANK_D', + }), + }), + ); + }); + + it('should keep features with different ranks modules than the rank filter applied', () => { + const landscape = defaultLandscape(); + + const filteredLandscape = landscape.filterByRank(Optional.of('RANK_D')); + + const ciFeature = filteredLandscape + .standaloneLevels()[2] + .elements.find(element => element instanceof LandscapeFeature && element.slugString() === 'ci'); + expect(ciFeature).toEqual( + expect.objectContaining({ + featureSlug: featureSlug('ci'), + }), + ); + }); + }); }); const selectableModule = (slug: string): LandscapeSelectionElement => ({ slug: moduleSlug(slug), selectable: true }); diff --git a/src/test/webapp/unit/module/primary/landscape/LandscapeComponent.spec.ts b/src/test/webapp/unit/module/primary/landscape/LandscapeComponent.spec.ts index ca467bb26ce..b82c1762b0c 100644 --- a/src/test/webapp/unit/module/primary/landscape/LandscapeComponent.spec.ts +++ b/src/test/webapp/unit/module/primary/landscape/LandscapeComponent.spec.ts @@ -11,6 +11,7 @@ import { ModulesRepository } from '@/module/domain/ModulesRepository'; import { ModulesToApply } from '@/module/domain/ModulesToApply'; import { LandscapeVue } from '@/module/primary/landscape'; import { LandscapePresetConfigurationVue } from '@/module/primary/landscape-preset-configuration'; +import { LandscapeRankModuleFilterVue } from '@/module/primary/landscape-rank-module-filter'; import { BodyCursorUpdater } from '@/module/primary/landscape/BodyCursorUpdater'; import { LandscapeScroller } from '@/module/primary/landscape/LandscapeScroller'; import { ALERT_BUS } from '@/shared/alert/application/AlertProvider'; @@ -1179,6 +1180,19 @@ describe('Landscape', () => { expect(presetDropdown.element.value).toBe(''); }); + it('should deselect preset option when a rank button is clicked', async () => { + const { wrapper, presetComponent } = await setupAndSelectPreset('init-maven'); + const rankComponent = wrapper.findComponent(LandscapeRankModuleFilterVue); + + const rankButton = rankComponent.find(wrappedElement('rank-RANK_S-filter')); + await rankButton.trigger('click'); + await flushPromises(); + await wrapper.vm.$nextTick(); + + const presetDropdown = presetComponent.find('select'); + expect(presetDropdown.element.value).toBe(''); + }); + const setupAndSelectPreset = async (presetValue: string) => { const { wrapper, presetComponent } = await setupPresetTest(); @@ -1373,6 +1387,75 @@ describe('Landscape', () => { return { mockModuleRect, mockContainerRect, landscapeContainer }; }; }); + + describe('Rank module filter', () => { + it('should render the rank module filter', async () => { + const { rankComponent } = await setupRankTest(); + + expect(rankComponent.exists()).toBe(true); + }); + + it('should filter modules from selected rank', async () => { + const { wrapper, rankComponent } = await setupRankTest(); + + await triggerRankFilter(wrapper, rankComponent, 'RANK_S'); + + await expectModulesVisibility(wrapper, { + infinitest: true, + init: true, + vue: true, + 'java-base': true, + }); + expect(wrapper.find(wrappedElement('spring-boot-module')).exists()).toBe(false); + }); + + it('should show all modules when deselect rank', async () => { + const { wrapper, rankComponent } = await setupRankTest(); + await triggerRankFilter(wrapper, rankComponent, 'RANK_S'); + + await triggerRankFilter(wrapper, rankComponent, 'RANK_S'); + + await expectModulesVisibility(wrapper, { + infinitest: true, + init: true, + vue: true, + 'java-base': true, + }); + expect(wrapper.find(wrappedElement('spring-boot-module')).exists()).toBe(true); + }); + + it('should present distinctly with minimal emphasis on dependency modules of different ranks than the selected one', async () => { + const { wrapper, rankComponent } = await setupRankTest(); + + await triggerRankFilter(wrapper, rankComponent, 'RANK_D'); + + expect(wrapper.find(wrappedElement('init-module')).exists()).toBe(true); + expect(wrapper.find(wrappedElement('init-module')).classes()).toContain('-diff-rank-minimal-emphasis'); + }); + + const setupRankTest = async () => { + const wrapper = await componentWithLandscape(); + const rankComponent = wrapper.findComponent(LandscapeRankModuleFilterVue); + + return { wrapper, rankComponent }; + }; + + const triggerRankFilter = async (wrapper: VueWrapper, rankComponent: VueWrapper, rank: string): Promise => { + const rankButton = rankComponent.find(wrappedElement(`rank-${rank}-filter`)); + await rankButton.trigger('click'); + await flushPromises(); + await wrapper.vm.$nextTick(); + }; + + const expectModulesVisibility = async (wrapper: VueWrapper, expectations: Record) => { + await flushPromises(); + await wrapper.vm.$nextTick(); + + Object.entries(expectations).forEach(([module, shouldExist]) => { + expect(wrapper.find(wrappedElement(`${module}-module`)).exists()).toBe(shouldExist); + }); + }; + }); }); const assertSelectableHighlightedConnectorsCount = (wrapper: VueWrapper, count: number): void => { diff --git a/src/test/webapp/unit/module/primary/landscape/LandscapeRankModuleFilterComponent.spec.ts b/src/test/webapp/unit/module/primary/landscape/LandscapeRankModuleFilterComponent.spec.ts new file mode 100644 index 00000000000..9d09d79346b --- /dev/null +++ b/src/test/webapp/unit/module/primary/landscape/LandscapeRankModuleFilterComponent.spec.ts @@ -0,0 +1,117 @@ +import { RANKS } from '@/module/domain/landscape/ModuleRank'; +import { ModuleRankStatistics, toModuleRankStatistics } from '@/module/domain/ModuleRankStatistics'; +import { LandscapeRankModuleFilterVue } from '@/module/primary/landscape-rank-module-filter'; +import { VueWrapper, mount } from '@vue/test-utils'; +import { describe, expect, it } from 'vitest'; +import { wrappedElement } from '../../../WrappedElement'; +import { defaultLandscape } from '../../domain/landscape/Landscape.fixture'; + +const wrap = (props?: { moduleRankStatistics: ModuleRankStatistics }): VueWrapper => { + return mount(LandscapeRankModuleFilterVue, { + props: props || { + moduleRankStatistics: RANKS.map(rank => ({ rank, quantity: 1 })), // Force enable all ranks + }, + }); +}; + +describe('LandscapeRankModuleFilterComponent', () => { + it('should display all rank filters', () => { + const wrapper = wrap(); + + const buttons = wrapper.findAll('[data-testid^="rank-"]'); + expect(buttons).toHaveLength(RANKS.length); + }); + + it('should select rank when clicking on filter button', async () => { + const wrapper = wrap(); + + const rankDButton = wrapper.find(wrappedElement('rank-RANK_D-filter')); + await rankDButton.trigger('click'); + + expect(wrapper.emitted('selected')).toEqual([[RANKS[0]]]); + }); + + it('should deselect rank when clicking on selected filter button', async () => { + const wrapper = wrap(); + + const rankDButton = wrapper.find(wrappedElement('rank-RANK_D-filter')); + await rankDButton.trigger('click'); + await rankDButton.trigger('click'); + + expect(wrapper.emitted('selected')).toEqual([[RANKS[0]], [undefined]]); + }); + + it('should format rank labels correctly', () => { + const wrapper = wrap(); + + const buttons = wrapper.findAll('[data-testid^="rank-"]'); + RANKS.forEach((rank, index) => { + expect(buttons[index].text()).toBe(rank.replace('RANK_', '')); + }); + }); + + it('should apply selected style to active filter', async () => { + const wrapper = wrap(); + + const rankDButton = wrapper.find(wrappedElement('rank-RANK_D-filter')); + await rankDButton.trigger('click'); + + expect(rankDButton.classes()).toContain('-active'); + }); + + it('should emit selected rank when clicking a filter button', async () => { + const wrapper = wrap(); + + const rankAButton = wrapper.find(wrappedElement('rank-RANK_A-filter')); + await rankAButton.trigger('click'); + await wrapper.vm.$nextTick(); + + expect(wrapper.emitted('selected')).toEqual([[RANKS[3]]]); + }); + + it('should emit undefined when deselecting a rank', async () => { + const wrapper = wrap(); + + const rankSButton = wrapper.find(wrappedElement('rank-RANK_S-filter')); + await rankSButton.trigger('click'); + await rankSButton.trigger('click'); + + expect(wrapper.emitted('selected')).toEqual([[RANKS[4]], [undefined]]); + }); + + it('should only emit one rank at a time', async () => { + const wrapper = wrap(); + + const rankBButton = wrapper.find(wrappedElement('rank-RANK_B-filter')); + const rankCButton = wrapper.find(wrappedElement('rank-RANK_C-filter')); + await rankBButton.trigger('click'); + await rankCButton.trigger('click'); + + expect(wrapper.emitted('selected')).toEqual([[RANKS[2]], [RANKS[1]]]); + }); + + it('should display correct description for rank button', () => { + const wrapper = wrap(); + + const rankDButton = wrapper.find(wrappedElement('rank-RANK_D-filter')); + + expect(rankDButton.attributes('title')).toBe('Experimental or advanced module requiring specific expertise'); + }); + + it('should disable rank button without module rank associated', () => { + const moduleRankStatistics = toModuleRankStatistics(defaultLandscape()); + const wrapper = wrap({ moduleRankStatistics }); + + const rankSButton = wrapper.find(wrappedElement('rank-RANK_S-filter')); + const rankAButton = wrapper.find(wrappedElement('rank-RANK_A-filter')); + const rankBButton = wrapper.find(wrappedElement('rank-RANK_B-filter')); + const rankCButton = wrapper.find(wrappedElement('rank-RANK_C-filter')); + const rankDButton = wrapper.find(wrappedElement('rank-RANK_D-filter')); + + expect(rankSButton.attributes('disabled')).toBeUndefined(); + expect(rankDButton.attributes('disabled')).toBeUndefined(); + expect(rankAButton.attributes('disabled')).toBeDefined(); + expect(rankBButton.attributes('disabled')).toBeDefined(); + expect(rankCButton.attributes('disabled')).toBeDefined(); + }); +}); diff --git a/src/test/webapp/unit/module/secondary/RestModulesRepository.spec.ts b/src/test/webapp/unit/module/secondary/RestModulesRepository.spec.ts index a202535a546..77b7a57512c 100644 --- a/src/test/webapp/unit/module/secondary/RestModulesRepository.spec.ts +++ b/src/test/webapp/unit/module/secondary/RestModulesRepository.spec.ts @@ -1,3 +1,4 @@ +import { ModuleRank } from '@/module/domain/landscape/ModuleRank'; import { ModuleSlug } from '@/module/domain/ModuleSlug'; import { Presets } from '@/module/domain/Presets'; import { RestLandscape } from '@/module/secondary/RestLandscape'; @@ -175,8 +176,8 @@ const restLandscape = (): RestLandscape => ({ levels: [ { elements: [ - landscapeModule('infinitest', 'Add infinitest filters', applicationBaseNameProperties()), - landscapeModule('init', 'Add some initial tools', applicationBaseNameProperties()), + landscapeModule('infinitest', 'Add infinitest filters', applicationBaseNameProperties(), [], 'RANK_S'), + landscapeModule('init', 'Add some initial tools', applicationBaseNameProperties(), [], 'RANK_S'), landscapeModule('init-props', 'Add some initial tools with extra properties', initPropsProperties()), landscapeModule('prettier', 'Add prettier', applicationBaseNameProperties()), ], @@ -184,7 +185,7 @@ const restLandscape = (): RestLandscape => ({ { elements: [ landscapeFeature('client', [ - landscapeModule('vue', 'Add vue', emptyProperties(), [moduleDependency('init')]), + landscapeModule('vue', 'Add vue', emptyProperties(), [moduleDependency('init')], 'RANK_S'), landscapeModule('react', 'Add react', emptyProperties(), [moduleDependency('init')]), landscapeModule('angular', 'Add angular', emptyProperties(), [moduleDependency('init')]), ]), @@ -196,11 +197,11 @@ const restLandscape = (): RestLandscape => ({ }, { elements: [ - landscapeModule('java-base', 'Add base java classes', emptyProperties(), [featureDependency('java-build-tools')]), + landscapeModule('java-base', 'Add base java classes', emptyProperties(), [featureDependency('java-build-tools')], 'RANK_S'), landscapeModule('spring-boot', 'Add spring boot core', emptyProperties(), [featureDependency('java-build-tools')]), landscapeFeature('ci', [ - landscapeModule('gitlab-maven', 'Add simple gitlab ci for maven', emptyProperties(), [moduleDependency('maven')]), - landscapeModule('gitlab-gradle', 'Add simple gitlab ci for gradle', emptyProperties(), [moduleDependency('gradle')]), + landscapeModule('gitlab-maven', 'Add simple gitlab ci for maven', emptyProperties(), [moduleDependency('maven')], 'RANK_S'), + landscapeModule('gitlab-gradle', 'Add simple gitlab ci for gradle', emptyProperties(), [moduleDependency('gradle')], 'RANK_S'), ]), ], }, @@ -234,12 +235,14 @@ const landscapeModule = ( operation: string, properties: RestModulePropertiesDefinitions, dependencies?: RestLandscapeDependency[], + rank: ModuleRank = 'RANK_D', ): RestLandscapeModule => ({ type: 'MODULE', slug, operation, properties, dependencies, + rank, }); const landscapeFeature = (slug: string, modules: RestLandscapeModule[]): RestLandscapeFeature => ({