Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions plugin/plugins/dynamix.unraid.net.plg
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ done
# Handle the unraid-components directory
DIR=/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components
if [ -d "$DIR" ] && [ ! -d "$DIR-" ]; then
cp -rp "$DIR" "$DIR-"
echo "Backed up directory: $DIR"
mv "$DIR" "$DIR-"
echo "Moved directory: $DIR to $DIR-"
fi

echo "Backup complete."
Expand Down Expand Up @@ -204,12 +204,13 @@ exit 0

# Handle the unraid-components directory
DIR=/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components
# certain instances where the directory is not present and others where it is, ensure we delete it before we restore it
# Remove the archive's contents before restoring
if [ -d "$DIR" ]; then
rm -rf "$DIR"
fi
if [ -d "$DIR-" ]; then
mv -f "$DIR-" "$DIR"
mv "$DIR-" "$DIR"
echo "Restored directory: $DIR- to $DIR"
fi
]]>
</INLINE>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@ private function initializeTranslations()
'Your license key is not eligible for Unraid OS {0}' => sprintf(_('Your license key is not eligible for Unraid OS %s'), '{0}'),
'Your Trial has expired' => _('Your Trial has expired'),
'Your Trial key has been extended!' => _('Your Trial key has been extended!'),
'Unraid OS {0} Changelog' => sprintf(_('Unraid OS %s Changelog'), '{0}'),
];
}

Expand Down
8 changes: 4 additions & 4 deletions web/__test__/store/updateOs.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ describe('UpdateOs Store', () => {
describe('State and Getters', () => {
it('should initialize with correct default values', () => {
expect(store.checkForUpdatesLoading).toBe(false);
expect(store.modalOpen).toBe(false);
expect(store.updateOsModalVisible).toBe(false);
});

it('should have computed properties with the right types', () => {
Expand Down Expand Up @@ -86,15 +86,15 @@ describe('UpdateOs Store', () => {
await store.localCheckForUpdate();

expect(WebguiCheckForUpdate).toHaveBeenCalled();
expect(store.modalOpen).toBe(true);
expect(store.updateOsModalVisible).toBe(true);
});

it('should set modal open state', () => {
store.setModalOpen(true);
expect(store.modalOpen).toBe(true);
expect(store.updateOsModalVisible).toBe(true);

store.setModalOpen(false);
expect(store.modalOpen).toBe(false);
expect(store.updateOsModalVisible).toBe(false);
});

it('should handle errors when checking for updates', async () => {
Expand Down
197 changes: 0 additions & 197 deletions web/__test__/store/updateOsChangelog.test.ts

This file was deleted.

2 changes: 1 addition & 1 deletion web/_data/serverState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import type {
// EBLACKLISTED2
// ENOCONN

const state: ServerState = 'ENOKEYFILE' as ServerState;
const state: ServerState = 'BASIC' as ServerState;
const currentFlashGuid = '1111-1111-YIJD-ZACK1234TEST'; // this is the flash drive that's been booted from
const regGuid = '1111-1111-YIJD-ZACK1234TEST'; // this guid is registered in key server
const keyfileBase64 = '';
Expand Down
2 changes: 1 addition & 1 deletion web/components/Modal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ const computedVerticalCenter = computed<string>(() => {
]"
class="text-16px text-foreground bg-background text-left relative z-10 mx-auto flex flex-col justify-around border-2 border-solid transform overflow-hidden rounded-lg transition-all"
>
<div v-if="showCloseX" class="absolute z-20 right-0 top-0 pt-4px pr-4px hidden sm:block">
<div v-if="showCloseX" class="absolute z-20 right-0 top-0 pt-4px pr-4px sm:block">
<button
class="rounded-md text-foreground bg-transparent p-2 hover:text-white focus:text-white hover:bg-unraid-red focus:bg-unraid-red focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"
type="button"
Expand Down
6 changes: 2 additions & 4 deletions web/components/Modals.ce.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,20 @@ import { storeToRefs } from 'pinia';
import { useCallbackActionsStore } from '~/store/callbackActions';
import { useTrialStore } from '~/store/trial';
import { useUpdateOsStore } from '~/store/updateOs';
import { useUpdateOsChangelogStore } from '~/store/updateOsChangelog';

const { t } = useI18n();

const { callbackStatus } = storeToRefs(useCallbackActionsStore());
const { trialModalVisible } = storeToRefs(useTrialStore());
const { modalOpen: updateOsModalVisible } = storeToRefs(useUpdateOsStore());
const { releaseForUpdate: updateOsChangelogModalVisible } = storeToRefs(useUpdateOsChangelogStore());
const { updateOsModalVisible, changelogModalVisible } = storeToRefs(useUpdateOsStore());
</script>

<template>
<div id="modals" ref="modals" class="relative z-[99999]">
<UpcCallbackFeedback :t="t" :open="callbackStatus !== 'ready'" />
<UpcTrial :t="t" :open="trialModalVisible" />
<UpdateOsCheckUpdateResponseModal :t="t" :open="updateOsModalVisible" />
<UpdateOsChangelogModal :t="t" :open="!!updateOsChangelogModalVisible" />
<UpdateOsChangelogModal :t="t" :open="changelogModalVisible" />
<ActivationModal :t="t" />
</div>
</template>
Expand Down
Loading
Loading