Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

(chore): version 0.14.3 #1758

Merged
merged 31 commits into from
Dec 31, 2023
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
669d311
🚧 WIP on Docker import group
ajnart Nov 17, 2023
c88cd3c
🚧 WIP on docker import feature
ajnart Nov 20, 2023
9bdd6a4
Update acceptableStatusCodes.ts
jeffersonraimon Nov 25, 2023
cca8be0
Merge pull request #1709 from jeffersonraimon/patch-1
ajnart Nov 26, 2023
e2da833
🚧 WIP on adding docker containers to boards
ajnart Nov 26, 2023
48ca535
Add client side reload of the config with the newly added apps
ajnart Nov 26, 2023
deee511
Fix unused function and enable user count check in
ajnart Dec 2, 2023
fc38f7a
✨ #1616 Recovery script in Docker container (#1726)
manuel-rw Dec 4, 2023
d6af6af
🐛 About page and manage user pages not translated (#1724)
ajnart Dec 7, 2023
51e96c0
✨ Use gravatar with user email (#1688)
SeDemal Dec 7, 2023
2170201
feat: add filter and sorting functionality to torrents table
InterN0te Dec 7, 2023
976634a
⚡️ Improve code in manage layout page (#1681)
SeDemal Dec 7, 2023
199b711
Updated entityStateSchema to handle nullables (#1744)
gfomichev Dec 17, 2023
553fa98
✨ #1616 better user management (#1748)
manuel-rw Dec 20, 2023
fd3f8f3
config: update crowdin translations
ajnart Dec 22, 2023
b6b697c
fix: umlaute in RSS (#1755)
manuel-rw Dec 29, 2023
19e65e0
config: new crowdin updates
ajnart Dec 29, 2023
f9c9f23
Update overseerr.ts
ajnart Dec 29, 2023
f20c209
Address PR comments
ajnart Dec 29, 2023
e13a4af
feat: remove location based timezone resolving (#1680)
SeDemal Dec 30, 2023
082077e
feat: import to docker form board, docker button on boards (#1714)
ajnart Dec 30, 2023
e9100fc
Update FUNDING.yml (#1768)
ajnart Dec 30, 2023
0a929a9
config; stale action (#1752)
manuel-rw Dec 30, 2023
159ba4b
config: greetings (#1753)
manuel-rw Dec 30, 2023
b9a5b5e
chore: new Crowdin updates (#1770)
ajnart Dec 30, 2023
108803a
fix: outdated config schema (#1769)
manuel-rw Dec 30, 2023
a394843
chore: increase version in package.json (#1771)
manuel-rw Dec 30, 2023
c83b04d
Refactor Docker integration in board page
ajnart Dec 31, 2023
745adb3
Merge branch 'dev' into docker-onboarding-fix
ajnart Dec 31, 2023
eba4dd3
Merge pull request #1773 from ajnart/docker-onboarding-fix
ajnart Dec 31, 2023
a68f842
Update tests
ajnart Dec 31, 2023
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
Prev Previous commit
Next Next commit
🚧 WIP on adding docker containers to boards
ajnart committed Nov 26, 2023
commit e2da8338e0e70593950e668627c3babdfb3783e5
11 changes: 6 additions & 5 deletions src/components/layout/Templates/BoardLayout.tsx
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ import { Trans, useTranslation } from 'next-i18next';
import Link from 'next/link';
import { useRouter } from 'next/router';
import { env } from 'process';
import { useEffect, useState } from 'react';
import { useState } from 'react';
import { useEditModeStore } from '~/components/Dashboard/Views/useEditModeStore';
import { useNamedWrapperColumnCount } from '~/components/Dashboard/Wrappers/gridstack/store';
import ContainerActionBar from '~/components/Manage/Tools/Docker/ContainerActionBar';
@@ -30,14 +30,15 @@ import { MainLayout } from './MainLayout';

type BoardLayoutProps = {
children: React.ReactNode;
isDockerEnabled?: boolean;
};

export const BoardLayout = ({ children }: BoardLayoutProps) => {
export const BoardLayout = ({ children, isDockerEnabled = false }: BoardLayoutProps) => {
const { config } = useConfigContext();
const { data: session } = useSession();

return (
<MainLayout autoFocusSearch={session?.user.autoFocusSearch} headerActions={<HeaderActions />}>
<MainLayout autoFocusSearch={session?.user.autoFocusSearch} headerActions={<HeaderActions isDockerEnabled={isDockerEnabled} />}>
<BoardHeadOverride />
<BackgroundImage />
{children}
@@ -46,15 +47,15 @@ export const BoardLayout = ({ children }: BoardLayoutProps) => {
);
};

export const HeaderActions = () => {
export const HeaderActions = ({isDockerEnabled = false} : { isDockerEnabled: boolean}) => {
const { data: sessionData } = useSession();

if (!sessionData?.user?.isAdmin) return null;

return (
<>
<ToggleEditModeButton />
<DockerButton />
{isDockerEnabled && <DockerButton />}
<CustomizeBoardButton />
</>
);
15 changes: 7 additions & 8 deletions src/pages/board/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import Consola from 'consola';
import { GetServerSidePropsContext, InferGetServerSidePropsType } from 'next';
import { SSRConfig } from 'next-i18next';
import { Dashboard } from '~/components/Dashboard/Dashboard';
@@ -16,19 +15,19 @@ import { api } from '~/utils/api';

export default function BoardPage({
config: initialConfig,
dockerIsConfigured,
isDockerEnabled,
initialContainers,
}: InferGetServerSidePropsType<typeof getServerSideProps>) {
useInitConfig(initialConfig);
const { data } = api.docker.containers.useQuery(undefined, {
initialData: initialContainers,
enabled: dockerIsConfigured,
initialData: initialContainers ?? undefined,
enabled: isDockerEnabled,
cacheTime: 60 * 1000 * 5,
staleTime: 60 * 1000 * 1,
});

return (
<BoardLayout>
<BoardLayout isDockerEnabled={isDockerEnabled}>
<Dashboard />
</BoardLayout>
);
@@ -68,16 +67,16 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
try {
if (session?.user.isAdmin == true) containers = await caller.containers();
} catch (error) {
Consola.error(`The docker integration failed with the following error: ${error}`);

}
return {
props: {
config,
primaryColor: config.settings.customization.colors.primary,
secondaryColor: config.settings.customization.colors.secondary,
primaryShade: config.settings.customization.colors.shade,
dockerIsConfigured: containers != undefined,
initialContainers: containers,
isDockerEnabled: containers != undefined,
initialContainers: containers ?? null,
...translations,
},
};