Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-03 04:45:21 +02:00
Code Issues Releases Activity

refactor(ui): remove global providers [EE-4128] (#7578)

Browse source
This commit is contained in:
Chaim Lev-Ari 2022-09-20 21:14:24 +03:00 • committed by GitHub
parent d3f094cb18
commit fad376b415
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 372 additions and 214 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/edge/EdgeDevices/EdgeDevicesView/EdgeDevicesView.tsx
View file

@ -2,7 +2,6 @@ import { useState } from 'react';
import { useSettings } from '@/portainer/settings/queries';
import { useGroups } from '@/portainer/environment-groups/queries';
import { r2a } from '@/react-tools/react2angular';
import { PageHeader } from '@@/PageHeader';
import { ViewLoading } from '@@/ViewLoading';
@ -55,5 +54,3 @@ export function EdgeDevicesView() {
</>
);
}
export const EdgeDevicesViewAngular = r2a(EdgeDevicesView, []);

2
app/edge/EdgeDevices/EdgeDevicesView/index.ts
View file

@ -1 +1 @@
export { EdgeDevicesView, EdgeDevicesViewAngular } from './EdgeDevicesView';
export { EdgeDevicesView } from './EdgeDevicesView';

3
app/edge/EdgeDevices/WaitingRoomView/WaitingRoomView.tsx
View file

@ -1,7 +1,6 @@
import { useRouter } from '@uirouter/react';
import { useEnvironmentList } from '@/portainer/environments/queries/useEnvironmentList';
import { r2a } from '@/react-tools/react2angular';
import { EdgeTypes } from '@/portainer/environments/types';
import { InformationPanel } from '@@/InformationPanel';
@ -58,5 +57,3 @@ export function WaitingRoomView() {
</>
);
}
export const WaitingRoomViewAngular = r2a(WaitingRoomView, []);

2
app/edge/EdgeDevices/WaitingRoomView/index.ts
View file

@ -1 +1 @@
export { WaitingRoomView, WaitingRoomViewAngular } from './WaitingRoomView';
export { WaitingRoomView } from './WaitingRoomView';

10
app/edge/__module.js
View file

@ -1,15 +1,17 @@
import angular from 'angular';
import { withCurrentUser } from '@/react-tools/withCurrentUser';
import { r2a } from '@/react-tools/react2angular';
import { withReactQuery } from '@/react-tools/withReactQuery';
import { withUIRouter } from '@/react-tools/withUIRouter';
import edgeStackModule from './views/edge-stacks';
import { componentsModule } from './components';
import { WaitingRoomViewAngular } from './EdgeDevices/WaitingRoomView';
import { WaitingRoomView } from './EdgeDevices/WaitingRoomView';
import { reactModule } from './react';
import { EdgeDevicesViewAngular } from './EdgeDevices/EdgeDevicesView';
angular
.module('portainer.edge', [edgeStackModule, componentsModule, reactModule])
.component('waitingRoomView', WaitingRoomViewAngular)
.component('edgeDevicesView', EdgeDevicesViewAngular)
.component('waitingRoomView', r2a(withUIRouter(withReactQuery(withCurrentUser(WaitingRoomView))), []))
.config(function config($stateRegistryProvider) {
const edge = {
name: 'edge',

13
app/edge/components/EdgeCheckInIntervalField.tsx
View file

@ -2,6 +2,7 @@ import { useEffect, useState } from 'react';
import { useSettings } from '@/portainer/settings/queries';
import { r2a } from '@/react-tools/react2angular';
import { withReactQuery } from '@/react-tools/withReactQuery';
import { FormControl } from '@@/form-components/FormControl';
import { Select } from '@@/form-components/Input';
@ -58,14 +59,10 @@ export function EdgeCheckinIntervalField({
);
}
export const EdgeCheckinIntervalFieldAngular = r2a(EdgeCheckinIntervalField, [
'value',
'onChange',
'isDefaultHidden',
'tooltip',
'label',
'readonly',
]);
export const EdgeCheckinIntervalFieldAngular = r2a(
withReactQuery(EdgeCheckinIntervalField),
['value', 'onChange', 'isDefaultHidden', 'tooltip', 'label', 'readonly']
);
function useOptions(isDefaultHidden: boolean) {
const [options, setOptions] = useState(checkinIntervalOptions);

7
app/edge/components/index.ts
View file

@ -2,6 +2,7 @@ import angular from 'angular';
import { r2a } from '@/react-tools/react2angular';
import { EdgeScriptForm } from '@/react/edge/components/EdgeScriptForm';
import { withReactQuery } from '@/react-tools/withReactQuery';
import { EdgeCheckinIntervalFieldAngular } from './EdgeCheckInIntervalField';
@ -9,6 +10,10 @@ export const componentsModule = angular
.module('app.edge.components', [])
.component(
'edgeScriptForm',
r2a(EdgeScriptForm, ['edgeInfo', 'commands', 'isNomadTokenVisible'])
r2a(withReactQuery(EdgeScriptForm), [
'edgeInfo',
'commands',
'isNomadTokenVisible',
])
)
.component('edgeCheckinIntervalField', EdgeCheckinIntervalFieldAngular).name;

16
app/edge/react/views/index.ts
View file

@ -1,6 +1,14 @@
import angular from 'angular';
export const viewsModule = angular.module(
'portainer.edge.react.views',
[]
).name;
import { EdgeDevicesView } from '@/edge/EdgeDevices/EdgeDevicesView';
import { withCurrentUser } from '@/react-tools/withCurrentUser';
import { r2a } from '@/react-tools/react2angular';
import { withReactQuery } from '@/react-tools/withReactQuery';
import { withUIRouter } from '@/react-tools/withUIRouter';
export const viewsModule = angular
.module('portainer.edge.react.views', [])
.component(
'edgeDevicesView',
r2a(withUIRouter(withReactQuery(withCurrentUser(EdgeDevicesView))), [])
).name;