Skip to content

Commit 829ddf3

Browse files
committed
Renamed to "Concerning..."
1 parent 9d22cbc commit 829ddf3

8 files changed

Lines changed: 38 additions & 39 deletions

File tree

src/components/banner/VulnerablePackageBanner.vue renamed to src/components/banner/ConcerningPackageBanner.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@
22
33
import { getStore } from '@r2/providers/generic/store/StoreProvider';
44
import { State } from '@r2/store';
5+
import { useConcerningPackageComposable } from '@r2/components/composables/ConcerningPackageComposable';
56
67
const store = getStore<State>();
8+
const { hasConcerningPackages } = useConcerningPackageComposable();
79
810
function addUnlinkedFilter() {
911
store.commit('profile/scopeLocalModListToUnlinkedPackages');
1012
}
1113
</script>
1214

1315
<template>
14-
<div class="notification is-concern margin-right">
16+
<div class="notification is-concern margin-right" v-show="hasConcerningPackages">
1517
<span>You have packages that can no longer be found on Thunderstore.</span> <a href="#" @click.stop.prevent="addUnlinkedFilter">Click here to review packages.</a>
1618
</div>
1719
</template>

src/components/composables/VulnerablePackageComposable.ts renamed to src/components/composables/ConcerningPackageComposable.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ const onlineModList = computed<Map<string, ThunderstoreMod>>(() => {
1515
return new Map<string, ThunderstoreMod>(mods.map(value => [value.getFullName(), value]));
1616
});
1717

18-
const vulnerablePackages = computed<ManifestV2[]>(() => {
18+
const concerningPackages = computed<ManifestV2[]>(() => {
1919
return localModList.value.filter(value => !value.isTrustedPackage() && (value.isOnlineSource() && !onlineModList.value.has(value.getName())));
2020
});
2121

22-
export function useVulnerablePackageComposable() {
22+
export function useConcerningPackageComposable() {
2323

24-
const hasVulnerablePackages = computed<boolean>(() => vulnerablePackages.value.length > 0);
24+
const hasConcerningPackages = computed<boolean>(() => concerningPackages.value.length > 0);
2525

26-
function isVulnerablePackage(mod: ManifestV2) {
27-
return vulnerablePackages.value.findIndex(value => value.getName() === mod.getName()) >= 0;
26+
function isConcerningPackage(mod: ManifestV2) {
27+
return concerningPackages.value.findIndex(value => value.getName() === mod.getName()) >= 0;
2828
}
2929

3030
return {
31-
vulnerablePackages,
32-
hasVulnerablePackages,
33-
isVulnerablePackage
31+
concerningPackages,
32+
hasConcerningPackages,
33+
isConcerningPackage
3434
}
3535
}

src/components/modals/VulnerablePackageReviewModal.vue renamed to src/components/modals/ConcerningPackageReviewModal.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ import ModalCard from '@r2/components/ModalCard.vue';
44
import { State } from '@r2/store';
55
import { getStore } from '@r2/providers/generic/store/StoreProvider';
66
import ManifestV2 from '@r2/model/ManifestV2';
7-
import { useModManagementComposable } from 'components/composables/ModManagementComposable';
7+
import { useModManagementComposable } from '@r2/components/composables/ModManagementComposable';
88
import R2Error from '@r2/model/errors/R2Error';
99
import ProfileModList from '@r2/r2mm/mods/ProfileModList';
1010
1111
const store = getStore<State>();
1212
1313
const { uninstallMod } = useModManagementComposable();
1414
15-
const isOpen = computed(() => store.state.modals.isVulnerableModReviewModalOpen);
16-
const modToReview = computed<ManifestV2 | null>(() => store.state.modals.vulnerableModToReview);
15+
const isOpen = computed(() => store.state.modals.isConcerningModReviewModalOpen);
16+
const modToReview = computed<ManifestV2 | null>(() => store.state.modals.concerningModToReview);
1717
const profile = computed(() => store.getters['profile/activeProfile']);
1818
1919
function close() {
20-
store.commit('closeVulnerableModReviewModal');
20+
store.commit('closeConcerningModReviewModal');
2121
}
2222
2323
async function removeMod() {

src/components/views/LocalModList.vue

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AssociatedModsModal />
1010

1111
<ManagerUpdateBanner/>
12-
<VulnerablePackageBanner v-if="hasVulnerablePackages"/>
12+
<ConcerningPackageBanner/>
1313

1414
<slot name="above-list"></slot>
1515

@@ -50,13 +50,10 @@ import { State } from '../../store';
5050
import { computed, defineAsyncComponent } from 'vue';
5151
import SkeletonLocalModCard from './LocalModList/SkeletonLocalModCard.vue';
5252
import ManagerUpdateBanner from '../banner/ManagerUpdateBanner.vue';
53-
import VulnerablePackageBanner from '@r2/components/banner/VulnerablePackageBanner.vue';
54-
import { useVulnerablePackageComposable } from '@r2/components/composables/VulnerablePackageComposable';
53+
import ConcerningPackageBanner from '@r2/components/banner/ConcerningPackageBanner.vue';
5554
5655
const store = getStore<State>();
5756
58-
const { hasVulnerablePackages } = useVulnerablePackageComposable();
59-
6057
const LocalModDraggableList = defineAsyncComponent(() => import('./LocalModList/LocalModDraggableList.vue'));
6158
6259
const visibleModList = computed(() => store.getters['profile/visibleModList']);

src/components/views/LocalModList/LocalModCard.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { splitToNameAndVersion } from '../../../utils/DependencyUtils';
1212
import { computed, onMounted, ref, watch } from 'vue';
1313
import { getStore } from '../../../providers/generic/store/StoreProvider';
1414
import { State } from '../../../store';
15-
import { useVulnerablePackageComposable } from '@r2/components/composables/VulnerablePackageComposable';
15+
import { useConcerningPackageComposable } from '@r2/components/composables/ConcerningPackageComposable';
1616
import { useModManagementComposable } from '@r2/components/composables/ModManagementComposable';
1717
1818
const store = getStore<State>();
@@ -23,7 +23,7 @@ type LocalModCardProps = {
2323
2424
const props = defineProps<LocalModCardProps>();
2525
26-
const { isVulnerablePackage } = useVulnerablePackageComposable();
26+
const { isConcerningPackage } = useConcerningPackageComposable();
2727
const { uninstallMod } = useModManagementComposable();
2828
2929
const disabledDependencies = ref<ManifestV2[]>([]);
@@ -165,7 +165,7 @@ function dependencyStringToModName(x: string) {
165165
}
166166
167167
function openReviewModal() {
168-
store.commit('openVulnerableModReviewModal', props.mod);
168+
store.commit('openConcerningModReviewModal', props.mod);
169169
}
170170
</script>
171171

@@ -176,7 +176,7 @@ function openReviewModal() {
176176
:id="`${mod.getAuthorName()}-${mod.getName()}-${mod.getVersionNumber()}`"
177177
:image="mod.getIcon()"
178178
:allowSorting="true"
179-
:class="[{'card--is-concern': isVulnerablePackage(props.mod)}]"
179+
:class="[{'card--is-concern': isConcerningPackage(props.mod)}]"
180180
>
181181

182182
<template v-slot:title>
@@ -207,19 +207,19 @@ function openReviewModal() {
207207

208208
<template v-slot:description>
209209
<p class='card-timestamp' v-if="mod.getInstalledAtTime() !== 0"><strong>Installed on:</strong> {{ getReadableDate(mod.getInstalledAtTime()) }}</p>
210-
<div class="notification is-warning" v-if="isVulnerablePackage(props.mod)">
210+
<div class="notification is-warning" v-if="isConcerningPackage(props.mod)">
211211
<p>This package was originally downloaded from Thunderstore however can no longer be found.</p>
212212
<p>Mods can be removed due to the author's request or due to violating Thunderstore's package policies.</p>
213213
<p><strong>It is recommended to remove this mod.</strong></p>
214-
<button v-if="isVulnerablePackage(props.mod)" class="button" @click.stop.prevent="openReviewModal">
214+
<button v-if="isConcerningPackage(props.mod)" class="button" @click.stop.prevent="openReviewModal">
215215
Review package
216216
</button>
217217
</div>
218218
</template>
219219

220220
<!-- Show icon button row even when card is collapsed -->
221221
<template v-slot:other-icons>
222-
<span v-if="isVulnerablePackage(props.mod)"
222+
<span v-if="isConcerningPackage(props.mod)"
223223
class='card-header-icon'>
224224
<i v-tooltip.left="`This package can no longer be found on Thunderstore`"
225225
class='fas fa-unlink'

src/components/views/LocalModList/LocalModDraggableList.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import { State } from '../../../store';
2222
import ManifestV2 from '../../../model/ManifestV2';
2323
import R2Error from '../../../model/errors/R2Error';
2424
import { ImmutableProfile } from '../../../model/Profile';
25-
import { useVulnerablePackageComposable } from '@r2/components/composables/VulnerablePackageComposable';
25+
import { useConcerningPackageComposable } from '@r2/components/composables/ConcerningPackageComposable';
2626
2727
const store = getStore<State>();
2828
29-
const { isVulnerablePackage } = useVulnerablePackageComposable();
29+
const { isConcerningPackage } = useConcerningPackageComposable();
3030
3131
const profile = computed<ImmutableProfile>(() => store.getters['profile/activeProfile'].asImmutableProfile());
3232
@@ -38,7 +38,7 @@ function applyVisibleList() {
3838
const newModList = visibleModList.value;
3939
const modList = store.state.profile.modList;
4040
if (store.state.profile.filters.has('Unlinked')) {
41-
internalVisibleList.value = modList.filter(value => isVulnerablePackage(value));
41+
internalVisibleList.value = modList.filter(value => isConcerningPackage(value));
4242
} else {
4343
internalVisibleList.value = newModList;
4444
}

src/pages/Manager.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<DownloadProgressModal />
119119
<DownloadModVersionSelectModal />
120120
<UpdateAllInstalledModsModal />
121-
<VulnerablePackageReviewModal/>
121+
<ConcerningPackageReviewModal/>
122122
<LaunchTypeModal v-if="canRenderLaunchTypeModal()" />
123123

124124
<div class="router-view">
@@ -157,7 +157,7 @@ import path from '../providers/node/path/path';
157157
import LaunchTypeModal from "../components/modals/launch-type/LaunchTypeModal.vue";
158158
import appWindow from '../providers/node/app/app_window';
159159
import GameInstructionParser from "../r2mm/launching/instructions/GameInstructionParser";
160-
import VulnerablePackageReviewModal from 'components/modals/VulnerablePackageReviewModal.vue';
160+
import ConcerningPackageReviewModal from 'components/modals/ConcerningPackageReviewModal.vue';
161161
162162
const store = getStore<State>();
163163
const router = useRouter();

src/store/modules/ModalsModule.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ interface State {
2222
isProfileManagementModalOpen: boolean;
2323
isProfileCodeExportModalOpen: boolean;
2424
isLocalFileImportModalOpen: boolean;
25-
vulnerableModToReview: ManifestV2 | null;
26-
isVulnerableModReviewModalOpen: boolean;
25+
concerningModToReview: ManifestV2 | null;
26+
isConcerningModReviewModalOpen: boolean;
2727
}
2828

2929
export default {
@@ -48,8 +48,8 @@ export default {
4848
isProfileManagementModalOpen: false,
4949
isProfileCodeExportModalOpen: false,
5050
isLocalFileImportModalOpen: false,
51-
vulnerableModToReview: null,
52-
isVulnerableModReviewModalOpen: false,
51+
concerningModToReview: null,
52+
isConcerningModReviewModalOpen: false,
5353
}),
5454

5555
mutations: {
@@ -121,8 +121,8 @@ export default {
121121
state.isLocalFileImportModalOpen = false;
122122
},
123123

124-
closeVulnerableModReviewModal: function(state: State): void {
125-
state.isVulnerableModReviewModalOpen = false;
124+
closeConcerningModReviewModal: function(state: State): void {
125+
state.isConcerningModReviewModalOpen = false;
126126
},
127127

128128
openAssociatedModsModal: function(state: State, mod: ManifestV2): void {
@@ -193,9 +193,9 @@ export default {
193193
state.isLocalFileImportModalOpen = true;
194194
},
195195

196-
openVulnerableModReviewModal: function(state: State, mod: ManifestV2): void {
197-
state.vulnerableModToReview = mod;
198-
state.isVulnerableModReviewModalOpen = true;
196+
openConcerningModReviewModal: function(state: State, mod: ManifestV2): void {
197+
state.concerningModToReview = mod;
198+
state.isConcerningModReviewModalOpen = true;
199199
},
200200
}
201201
}

0 commit comments

Comments
 (0)