Revert "feat(cache): introduce cache option [EE-6293] (#10641)" (#10658)

This reverts commit 2c032f1739.
2025-08-02 20:35:25 +02:00 · 2023-11-20 15:08:19 +13:00 · 2023-11-20 15:08:19 +13:00 · ecce501cf3
commit ecce501cf3
parent 2c032f1739
70 changed files with 45 additions and 418 deletions
--- a/app/react/azure/DashboardView/DashboardView.tsx
+++ b/app/react/azure/DashboardView/DashboardView.tsx
@ -27,7 +27,7 @@ export function DashboardView() {

  return (
    <>
-      <PageHeader title="Home" breadcrumbs={[{ label: 'Dashboard' }]} reload />
+      <PageHeader title="Home" breadcrumbs={[{ label: 'Dashboard' }]} />

      <div className="mx-4">
        {subscriptionsQuery.data && (
--- a/app/react/azure/container-instances/CreateView/CreateView.tsx
+++ b/app/react/azure/container-instances/CreateView/CreateView.tsx
@ -12,7 +12,6 @@ export function CreateView() {
          { link: 'azure.containerinstances', label: 'Container instances' },
          { label: 'Add container' },
        ]}
-        reload
      />

      <div className="row">
--- a/app/react/azure/container-instances/ItemView/ItemView.tsx
+++ b/app/react/azure/container-instances/ItemView/ItemView.tsx
@ -68,7 +68,6 @@ export function ItemView() {
          { link: 'azure.containerinstances', label: 'Container instances' },
          { label: container.name },
        ]}
-        reload
      />

      <div className="row">
--- a/app/react/azure/container-instances/ListView/ListView.tsx
+++ b/app/react/azure/container-instances/ListView/ListView.tsx
@ -32,9 +32,9 @@ export function ListView() {
  return (
    <>
      <PageHeader
-        title="Container list"
        breadcrumbs="Container instances"
        reload
+        title="Container list"
      />

      <ContainersDatatable
--- a/app/react/components/PageHeader/PageHeader.stories.tsx
+++ b/app/react/components/PageHeader/PageHeader.stories.tsx
@ -31,7 +31,6 @@ function Template({ title }: StoryProps) {
          { label: 'bread3' },
          { label: 'bread4' },
        ]}
-        reload
      />
    </UserContext.Provider>
  );
--- a/app/react/components/PageHeader/PageHeader.tsx
+++ b/app/react/components/PageHeader/PageHeader.tsx
@ -1,8 +1,6 @@
 import { useRouter } from '@uirouter/react';
-import { PropsWithChildren } from 'react';
 import { RefreshCw } from 'lucide-react';
-
-import { dispatchCacheRefreshEvent } from '@/portainer/services/http-request.helper';
+import { PropsWithChildren } from 'react';

 import { Button } from '../buttons';

@ -53,7 +51,6 @@ export function PageHeader({
  );

  function onClickedRefresh() {
-    dispatchCacheRefreshEvent();
    return onReload ? onReload() : router.stateService.reload();
  }
 }
--- a/app/react/components/UsersSelector/UsersSelector.mocks.ts
+++ b/app/react/components/UsersSelector/UsersSelector.mocks.ts
@ -6,7 +6,6 @@ export function createMockUser(id: number, username: string): UserViewModel {
    Username: username,
    Role: 2,
    EndpointAuthorizations: {},
-    UseCache: false,
    PortainerAuthorizations: {
      PortainerDockerHubInspect: true,
      PortainerEndpointGroupInspect: true,
--- a/app/react/docker/containers/CreateView/CreateView.tsx
+++ b/app/react/docker/containers/CreateView/CreateView.tsx
@ -36,7 +36,6 @@ export function CreateView() {
          { label: 'Containers', link: 'docker.containers' },
          'Add container',
        ]}
-        reload
      />

      <CreateForm />
--- a/app/react/docker/networks/ItemView/ItemView.tsx
+++ b/app/react/docker/networks/ItemView/ItemView.tsx
@ -61,7 +61,6 @@ export function ItemView() {
            label: networkQuery.data.Name,
          },
        ]}
-        reload
      />
      <NetworkDetailsTable
        network={networkQuery.data}
--- a/app/react/edge/edge-devices/WaitingRoomView/WaitingRoomView.tsx
+++ b/app/react/edge/edge-devices/WaitingRoomView/WaitingRoomView.tsx
@ -19,7 +19,6 @@ function WaitingRoomView() {
      <PageHeader
        title="Waiting Room"
        breadcrumbs={[{ label: 'Waiting Room' }]}
-        reload
      />

      <InformationPanel>
--- a/app/react/kubernetes/cluster/ConfigureView/ConfigureView.tsx
+++ b/app/react/kubernetes/cluster/ConfigureView/ConfigureView.tsx
@ -27,6 +27,7 @@ export function ConfigureView() {
    <>
      <PageHeader
        title="Kubernetes features configuration"
+        reload
        breadcrumbs={[
          { label: 'Environments', link: 'portainer.endpoints' },
          {
@ -36,7 +37,6 @@ export function ConfigureView() {
          },
          'Kubernetes configuration',
        ]}
-        reload
      />
      <div className="row">
        <div className="col-sm-12">
--- a/app/react/kubernetes/ingresses/CreateIngressView/CreateIngressView.tsx
+++ b/app/react/kubernetes/ingresses/CreateIngressView/CreateIngressView.tsx
@ -573,7 +573,6 @@ export function CreateIngressView() {
            label: isEdit ? 'Edit ingress' : 'Create ingress',
          },
        ]}
-        reload
      />
      <div className="row ingress-rules">
        <div className="col-sm-12">
--- a/app/react/portainer/account/AccountView/ApplicationSettings/ApplicationSettingsForm.tsx
+++ b/app/react/portainer/account/AccountView/ApplicationSettings/ApplicationSettingsForm.tsx
@ -1,86 +0,0 @@
-import { Form, Formik } from 'formik';
-
-import { useCurrentUser } from '@/react/hooks/useUser';
-import { notifySuccess } from '@/portainer/services/notifications';
-import { updateAxiosAdapter } from '@/portainer/services/axios';
-import { withError } from '@/react-tools/react-query';
-
-import { TextTip } from '@@/Tip/TextTip';
-import { LoadingButton } from '@@/buttons';
-import { SwitchField } from '@@/form-components/SwitchField';
-
-import { useUpdateUserMutation } from '../../useUpdateUserMutation';
-
-type FormValues = {
-  useCache: boolean;
-};
-
-export function ApplicationSettingsForm() {
-  const { user } = useCurrentUser();
-  const updateSettingsMutation = useUpdateUserMutation();
-
-  const initialValues = {
-    useCache: user.UseCache,
-  };
-
-  return (
-    <Formik<FormValues>
-      initialValues={initialValues}
-      onSubmit={handleSubmit}
-      validateOnMount
-      enableReinitialize
-    >
-      {({ isValid, dirty, values, setFieldValue }) => (
-        <Form className="form-horizontal">
-          <TextTip color="orange" className="mb-3">
-            Enabling front-end data caching can mean that changes to Kubernetes
-            clusters made by other users or outside of Portainer may take up to
-            five minutes to show in your session. This caching only applies to
-            Kubernetes environments.
-          </TextTip>
-          <SwitchField
-            label="Enable front-end data caching for Kubernetes environments"
-            checked={values.useCache}
-            onChange={(value) => setFieldValue('useCache', value)}
-            labelClass="col-lg-2 col-sm-3" // match the label width of the other fields in the page
-            fieldClass="!mb-4"
-          />
-          <div className="form-group">
-            <div className="col-sm-12">
-              <LoadingButton
-                loadingText="Saving..."
-                isLoading={updateSettingsMutation.isLoading}
-                disabled={!isValid || !dirty}
-                className="!ml-0"
-                data-cy="account-applicationSettingsSaveButton"
-              >
-                Save
-              </LoadingButton>
-            </div>
-          </div>
-        </Form>
-      )}
-    </Formik>
-  );
-
-  function handleSubmit(values: FormValues) {
-    updateSettingsMutation.mutate(
-      {
-        Id: user.Id,
-        UseCache: values.useCache,
-      },
-      {
-        onSuccess() {
-          updateAxiosAdapter(values.useCache);
-          notifySuccess(
-            'Success',
-            'Successfully updated application settings.'
-          );
-          // a full reload is required to update the angular $http cache setting
-          setTimeout(() => window.location.reload(), 2000); // allow 2s to show the success notification
-        },
-        ...withError('Unable to update application settings'),
-      }
-    );
-  }
-}
--- a/app/react/portainer/account/AccountView/ApplicationSettings/ApplicationSettingsWidget.tsx
+++ b/app/react/portainer/account/AccountView/ApplicationSettings/ApplicationSettingsWidget.tsx
@ -1,20 +0,0 @@
-import { Settings } from 'lucide-react';
-
-import { Widget, WidgetBody, WidgetTitle } from '@@/Widget';
-
-import { ApplicationSettingsForm } from './ApplicationSettingsForm';
-
-export function ApplicationSettingsWidget() {
-  return (
-    <div className="row">
-      <div className="col-sm-12">
-        <Widget>
-          <WidgetTitle icon={Settings} title="Application settings" />
-          <WidgetBody>
-            <ApplicationSettingsForm />
-          </WidgetBody>
-        </Widget>
-      </div>
-    </div>
-  );
-}
--- a/app/react/portainer/account/AccountView/ApplicationSettings/index.ts
+++ b/app/react/portainer/account/AccountView/ApplicationSettings/index.ts
@ -1 +0,0 @@
-export { ApplicationSettingsWidget } from './ApplicationSettingsWidget';
--- a/app/react/portainer/account/helm-repositories/CreateHelmRepositoryView/CreateHelmRepositoriesView.tsx
+++ b/app/react/portainer/account/helm-repositories/CreateHelmRepositoryView/CreateHelmRepositoriesView.tsx
@ -12,7 +12,6 @@ export function CreateHelmRepositoriesView() {
          { label: 'My account', link: 'portainer.account' },
          { label: 'Create Helm repository' },
        ]}
-        reload
      />

      <div className="row">
--- a/app/react/portainer/account/useUpdateUserMutation.tsx
+++ b/app/react/portainer/account/useUpdateUserMutation.tsx
@ -1,32 +0,0 @@
-import { useMutation } from 'react-query';
-
-import axios, { parseAxiosError } from '@/portainer/services/axios';
-import { User } from '@/portainer/users/types';
-import {
-  mutationOptions,
-  withInvalidate,
-  queryClient,
-} from '@/react-tools/react-query';
-import { userQueryKeys } from '@/portainer/users/queries/queryKeys';
-import { useCurrentUser } from '@/react/hooks/useUser';
-
-export function useUpdateUserMutation() {
-  const {
-    user: { Id: userId },
-  } = useCurrentUser();
-
-  return useMutation(
-    (user: Partial<User>) => updateUser(user, userId),
-    mutationOptions(withInvalidate(queryClient, [userQueryKeys.base()]))
-    // error notification should be handled by the caller
-  );
-}
-
-async function updateUser(user: Partial<User>, userId: number) {
-  try {
-    const { data } = await axios.put(`/users/${userId}`, user);
-    return data;
-  } catch (error) {
-    throw parseAxiosError(error);
-  }
-}
--- a/app/react/portainer/environments/EdgeAutoCreateScriptView/EdgeAutoCreateScriptView.tsx
+++ b/app/react/portainer/environments/EdgeAutoCreateScriptView/EdgeAutoCreateScriptView.tsx
@ -17,7 +17,6 @@ function EdgeAutoCreateScriptView() {
          { label: 'Environments', link: 'portainer.endpoints' },
          'Automatic Edge Environment Creation',
        ]}
-        reload
      />

      <div className="mx-3">
--- a/app/react/portainer/environments/update-schedules/CreateView/CreateView.tsx
+++ b/app/react/portainer/environments/update-schedules/CreateView/CreateView.tsx
@ -54,7 +54,6 @@ function CreateView() {
      <PageHeader
        title="Update & Rollback"
        breadcrumbs="Edge agent update and rollback"
-        reload
      />

      <BetaAlert
--- a/app/react/portainer/environments/update-schedules/ItemView/ItemView.tsx
+++ b/app/react/portainer/environments/update-schedules/ItemView/ItemView.tsx
@ -78,7 +78,6 @@ function ItemView() {
          { label: 'Edge agent update and rollback', link: '^' },
          item.name,
        ]}
-        reload
      />

      <BetaAlert
--- a/app/react/portainer/environments/update-schedules/ListView/ListView.tsx
+++ b/app/react/portainer/environments/update-schedules/ListView/ListView.tsx
@ -56,8 +56,8 @@ export function ListView() {
    <>
      <PageHeader
        title="Update & Rollback"
-        breadcrumbs="Update and rollback"
        reload
+        breadcrumbs="Update and rollback"
      />

      <BetaAlert
--- a/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/EndpointTypeView.tsx
+++ b/app/react/portainer/environments/wizard/EnvironmentTypeSelectView/EndpointTypeView.tsx
@ -27,7 +27,6 @@ export function EnvironmentTypeSelectView() {
      <PageHeader
        title="Quick Setup"
        breadcrumbs={[{ label: 'Environment Wizard' }]}
-        reload
      />

      <div className="row">
--- a/app/react/portainer/environments/wizard/EnvironmentsCreationView/EnvironmentsCreationView.tsx
+++ b/app/react/portainer/environments/wizard/EnvironmentsCreationView/EnvironmentsCreationView.tsx
@ -71,7 +71,6 @@ export function EnvironmentCreationView() {
      <PageHeader
        title="Quick Setup"
        breadcrumbs={[{ label: 'Environment Wizard' }]}
-        reload
      />

      <div className={styles.wizardWrapper}>
--- a/app/react/portainer/environments/wizard/HomeView/HomeView.tsx
+++ b/app/react/portainer/environments/wizard/HomeView/HomeView.tsx
@ -22,7 +22,6 @@ export function HomeView() {
      <PageHeader
        title="Quick Setup"
        breadcrumbs={[{ label: 'Environment Wizard' }]}
-        reload
      />

      <div className="row">
--- a/app/react/portainer/settings/SettingsView/SettingsView.tsx
+++ b/app/react/portainer/settings/SettingsView/SettingsView.tsx
@ -18,7 +18,7 @@ import { ExperimentalFeatures } from './ExperimentalFeatures';
 export function SettingsView() {
  return (
    <>
-      <PageHeader title="Settings" breadcrumbs="Settings" reload />
+      <PageHeader title="Settings" breadcrumbs="Settings" />

      <div className="mx-4 space-y-4">
        <ApplicationSettingsPanel onSuccess={handleSuccess} />
--- a/app/react/portainer/users/teams/ItemView/ItemView.tsx
+++ b/app/react/portainer/users/teams/ItemView/ItemView.tsx
@ -38,7 +38,6 @@ export function ItemView() {
      <PageHeader
        title="Team details"
        breadcrumbs={[{ label: 'Teams' }, { label: team.Name }]}
-        reload
      />

      {membershipsQuery.data && (
--- a/app/react/portainer/users/teams/ListView/CreateTeamForm/CreateTeamForm.mocks.ts
+++ b/app/react/portainer/users/teams/ListView/CreateTeamForm/CreateTeamForm.mocks.ts
@ -42,7 +42,6 @@ export function mockExampleData() {
      RoleName: 'user',
      Checked: false,
      AuthenticationMethod: '',
-      UseCache: false,
    },
    {
      Id: 13,
@ -70,7 +69,6 @@ export function mockExampleData() {
      RoleName: 'user',
      Checked: false,
      AuthenticationMethod: '',
-      UseCache: false,
    },
  ];

--- a/app/react/portainer/users/teams/ListView/ListView.tsx
+++ b/app/react/portainer/users/teams/ListView/ListView.tsx
@ -16,11 +16,7 @@ export function ListView() {

  return (
    <>
-      <PageHeader
-        title="Teams"
-        breadcrumbs={[{ label: 'Teams management' }]}
-        reload
-      />
+      <PageHeader title="Teams" breadcrumbs={[{ label: 'Teams management' }]} />

      {isAdmin && usersQuery.data && teamsQuery.data && (
        <CreateTeamForm users={usersQuery.data} teams={teamsQuery.data} />
--- a/app/react/test-utils/withUserProvider.tsx
+++ b/app/react/test-utils/withUserProvider.tsx
@ -8,7 +8,6 @@ const mockUser: User = {
  Id: 1,
  Role: 1,
  Username: 'mock',
-  UseCache: false,
  ThemeSettings: {
    color: 'auto',
  },
				`@ -1 +0,0 @@`
				`export { ApplicationSettingsWidget } from './ApplicationSettingsWidget';`