diff options
Diffstat (limited to 'packages/main/src/reactions/loadServices.ts')
-rw-r--r-- | packages/main/src/reactions/loadServices.ts | 51 |
1 files changed, 22 insertions, 29 deletions
diff --git a/packages/main/src/reactions/loadServices.ts b/packages/main/src/reactions/loadServices.ts index 533ef95..4ef6131 100644 --- a/packages/main/src/reactions/loadServices.ts +++ b/packages/main/src/reactions/loadServices.ts | |||
@@ -78,36 +78,29 @@ export default function loadServices( | |||
78 | 78 | ||
79 | const viewsToDispose = new Map(servicesToViews); | 79 | const viewsToDispose = new Map(servicesToViews); |
80 | servicesById.forEach((service, serviceId) => { | 80 | servicesById.forEach((service, serviceId) => { |
81 | if (service.shouldBeLoaded) { | 81 | if (!service.shouldBeLoaded) { |
82 | let view = servicesToViews.get(serviceId); | 82 | return; |
83 | const { | 83 | } |
84 | settings: { | 84 | let view = servicesToViews.get(serviceId); |
85 | profile: { id: profileId }, | 85 | const { |
86 | }, | 86 | settings: { |
87 | } = service; | 87 | profile: { id: profileId }, |
88 | if (view === undefined || view.partitionId !== profileId) { | 88 | }, |
89 | log.debug('Creating view for service', serviceId); | 89 | } = service; |
90 | const partition = profilesToPartitions.get(profileId); | 90 | if (view === undefined || view.partitionId !== profileId) { |
91 | if (partition === undefined) { | 91 | log.debug('Creating view for service', serviceId); |
92 | throw new Error(`Missing Partition ${profileId}`); | 92 | const partition = profilesToPartitions.get(profileId); |
93 | } | 93 | if (partition === undefined) { |
94 | view = viewFactory.createServiceView(service, partition); | 94 | throw new Error(`Missing Partition ${profileId}`); |
95 | view.setBounds(store.browserViewBounds); | ||
96 | servicesToViews.set(serviceId, view); | ||
97 | service.setServiceView(view); | ||
98 | const { urlToLoad } = service; | ||
99 | view.loadURL(urlToLoad).catch((error) => { | ||
100 | log.warn( | ||
101 | 'Cannot URL', | ||
102 | urlToLoad, | ||
103 | 'for service', | ||
104 | serviceId, | ||
105 | error, | ||
106 | ); | ||
107 | }); | ||
108 | } else { | ||
109 | viewsToDispose.delete(serviceId); | ||
110 | } | 95 | } |
96 | view = viewFactory.createServiceView(service, partition); | ||
97 | view.setBounds(store.browserViewBounds); | ||
98 | servicesToViews.set(serviceId, view); | ||
99 | service.setServiceView(view); | ||
100 | const { urlToLoad } = service; | ||
101 | view.loadURL(urlToLoad); | ||
102 | } else { | ||
103 | viewsToDispose.delete(serviceId); | ||
111 | } | 104 | } |
112 | }); | 105 | }); |
113 | 106 | ||