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.

Sign up for GitHub

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

Jump to bottom

regression: Cloud_Workspace_AirGapped_Restrictions_Remaining_Days visible in admin settings page #33798

Open
wants to merge 1 commit into
base: release-7.0.0
Choose a base branch
from
+10 −3
Open

regression: Cloud_Workspace_AirGapped_Restrictions_Remaining_Days visible in admin settings page #33798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 2 deletions apps/meteor/client/views/admin/settings/EditableSettingsProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@ import type { EditableSetting, EditableSettingsContextValue } from '../EditableS
import { EditableSettingsContext } from '../EditableSettingsContext';

const defaultQuery: SettingsContextQuery = {};
const defaultOmit: Array<ISetting['_id']> = [];

type EditableSettingsProviderProps = {
children?: ReactNode;
query?: SettingsContextQuery;
omit?: Array<ISetting['_id']>;
};

const EditableSettingsProvider = ({ children, query = defaultQuery }: EditableSettingsProviderProps) => {
const EditableSettingsProvider = ({ children, query = defaultQuery, omit = defaultOmit }: EditableSettingsProviderProps) => {
const settingsCollectionRef = useRef<Mongo.Collection<EditableSetting>>(null) as MutableRefObject<Mongo.Collection<EditableSetting>>;
const persistedSettings = useSettings(query);

Expand All @@ -39,7 +41,10 @@ const EditableSettingsProvider = ({ children, query = defaultQuery }: EditableSe
for (const { _id, ...fields } of persistedSettings) {
settingsCollection.upsert(_id, { $set: { ...fields }, $unset: { changed: true } });
}
}, [getSettingsCollection, persistedSettings]);
if (omit.length > 0) {
settingsCollection.remove({ _id: { $in: omit } });
}
}, [getSettingsCollection, persistedSettings, omit]);

const queryEditableSetting = useMemo(() => {
const validateSettingQueries = (
Expand Down
4 changes: 3 additions & 1 deletion apps/meteor/client/views/admin/settings/SettingsRoute.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import EditableSettingsProvider from './EditableSettingsProvider';
import SettingsGroupSelector from './SettingsGroupSelector';
import SettingsPage from './SettingsPage';

const omittedSettings = ['Cloud_Workspace_AirGapped_Restrictions_Remaining_Days'];

export const SettingsRoute = (): ReactElement => {
const hasPermission = useIsPrivilegedSettingsContext();
const groupId = useRouteParameter('group');
Expand All @@ -21,7 +23,7 @@ export const SettingsRoute = (): ReactElement => {
}

return (
<EditableSettingsProvider>
<EditableSettingsProvider omit={omittedSettings}>
<SettingsGroupSelector groupId={groupId} onClickBack={() => router.navigate('/admin/settings')} />
</EditableSettingsProvider>
);
Expand Down
Loading