public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
* [pve-devel] [PATCH manager] ui: reorder Makefile entries
@ 2020-07-29  6:51 Dominik Csapak
  2020-07-29 10:14 ` Fabian Grünbichler
  0 siblings, 1 reply; 4+ messages in thread
From: Dominik Csapak @ 2020-07-29  6:51 UTC (permalink / raw)
  To: pve-devel

most of the time alphabetically is ok, but some classes have to defined
earlier, else extjs does not find the class and tries to dynamically
load it via a http request. that fails, and in the end it still
finds the right classes (after loading the complete js file) but
we still get ugly error messages and http requests that are not necessary

so we move some essential classes to the top

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
has someone a better suggestion except manually managing the order?
 www/manager6/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/manager6/Makefile b/www/manager6/Makefile
index 4288acdd..bccd8c32 100644
--- a/www/manager6/Makefile
+++ b/www/manager6/Makefile
@@ -1,6 +1,9 @@
 include ../../defines.mk
 
 JSSRC= 							\
+	panel/ConfigPanel.js				\
+	panel/StatusView.js				\
+	window/Wizard.js				\
 	Parser.js					\
 	StateProvider.js				\
 	Toolkit.js					\
@@ -29,8 +32,8 @@ JSSRC= 							\
 	dc/ACLView.js					\
 	dc/ACMEClusterView.js				\
 	dc/ACMEPluginEdit.js				\
-	dc/AuthEditAD.js				\
 	dc/AuthEditBase.js				\
+	dc/AuthEditAD.js				\
 	dc/AuthEditLDAP.js				\
 	dc/AuthView.js					\
 	dc/Backup.js					\
@@ -154,7 +157,6 @@ JSSRC= 							\
 	node/Subscription.js				\
 	node/Summary.js					\
 	node/ZFS.js					\
-	panel/ConfigPanel.js				\
 	panel/GuestStatusView.js			\
 	panel/GuestSummary.js				\
 	panel/HealthWidget.js				\
@@ -163,7 +165,6 @@ JSSRC= 							\
 	panel/NotesView.js				\
 	panel/RunningChart.js				\
 	panel/StatusPanel.js				\
-	panel/StatusView.js				\
 	panel/TemplateStatusView.js			\
 	pool/Config.js					\
 	pool/StatusView.js				\
@@ -251,7 +252,6 @@ JSSRC= 							\
 	window/Settings.js				\
 	window/Snapshot.js				\
 	window/StartupEdit.js				\
-	window/Wizard.js				\
 # end of JSSRC list
 
 all: pvemanagerlib.js
-- 
2.20.1





^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [pve-devel] [PATCH manager] ui: reorder Makefile entries
  2020-07-29  6:51 [pve-devel] [PATCH manager] ui: reorder Makefile entries Dominik Csapak
@ 2020-07-29 10:14 ` Fabian Grünbichler
  2020-07-29 11:37   ` Dominik Csapak
  0 siblings, 1 reply; 4+ messages in thread
From: Fabian Grünbichler @ 2020-07-29 10:14 UTC (permalink / raw)
  To: Proxmox VE development discussion

On July 29, 2020 8:51 am, Dominik Csapak wrote:
> most of the time alphabetically is ok, but some classes have to defined
> earlier, else extjs does not find the class and tries to dynamically
> load it via a http request. that fails, and in the end it still
> finds the right classes (after loading the complete js file) but
> we still get ugly error messages and http requests that are not necessary
> 
> so we move some essential classes to the top
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
> has someone a better suggestion except manually managing the order?

split the list into two variables? one for the essential stuff with a 
comment, one for the sorted everything else..

>  www/manager6/Makefile | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/www/manager6/Makefile b/www/manager6/Makefile
> index 4288acdd..bccd8c32 100644
> --- a/www/manager6/Makefile
> +++ b/www/manager6/Makefile
> @@ -1,6 +1,9 @@
>  include ../../defines.mk
>  
>  JSSRC= 							\
> +	panel/ConfigPanel.js				\
> +	panel/StatusView.js				\
> +	window/Wizard.js				\
>  	Parser.js					\
>  	StateProvider.js				\
>  	Toolkit.js					\
> @@ -29,8 +32,8 @@ JSSRC= 							\
>  	dc/ACLView.js					\
>  	dc/ACMEClusterView.js				\
>  	dc/ACMEPluginEdit.js				\
> -	dc/AuthEditAD.js				\
>  	dc/AuthEditBase.js				\
> +	dc/AuthEditAD.js				\
>  	dc/AuthEditLDAP.js				\
>  	dc/AuthView.js					\
>  	dc/Backup.js					\
> @@ -154,7 +157,6 @@ JSSRC= 							\
>  	node/Subscription.js				\
>  	node/Summary.js					\
>  	node/ZFS.js					\
> -	panel/ConfigPanel.js				\
>  	panel/GuestStatusView.js			\
>  	panel/GuestSummary.js				\
>  	panel/HealthWidget.js				\
> @@ -163,7 +165,6 @@ JSSRC= 							\
>  	panel/NotesView.js				\
>  	panel/RunningChart.js				\
>  	panel/StatusPanel.js				\
> -	panel/StatusView.js				\
>  	panel/TemplateStatusView.js			\
>  	pool/Config.js					\
>  	pool/StatusView.js				\
> @@ -251,7 +252,6 @@ JSSRC= 							\
>  	window/Settings.js				\
>  	window/Snapshot.js				\
>  	window/StartupEdit.js				\
> -	window/Wizard.js				\
>  # end of JSSRC list
>  
>  all: pvemanagerlib.js
> -- 
> 2.20.1
> 
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 
> 
> 




^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [pve-devel] [PATCH manager] ui: reorder Makefile entries
  2020-07-29 10:14 ` Fabian Grünbichler
@ 2020-07-29 11:37   ` Dominik Csapak
  2020-07-29 12:04     ` Fabian Grünbichler
  0 siblings, 1 reply; 4+ messages in thread
From: Dominik Csapak @ 2020-07-29 11:37 UTC (permalink / raw)
  To: pve-devel

On 7/29/20 12:14 PM, Fabian Grünbichler wrote:
> On July 29, 2020 8:51 am, Dominik Csapak wrote:
>> most of the time alphabetically is ok, but some classes have to defined
>> earlier, else extjs does not find the class and tries to dynamically
>> load it via a http request. that fails, and in the end it still
>> finds the right classes (after loading the complete js file) but
>> we still get ugly error messages and http requests that are not necessary
>>
>> so we move some essential classes to the top
>>
>> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
>> ---
>> has someone a better suggestion except manually managing the order?
> 
> split the list into two variables? one for the essential stuff with a
> comment, one for the sorted everything else..

well they all depend on each other, the rest just works
by accident, so adding a new one could mean we have to
move a bunch to the other variable...

> 
>>   www/manager6/Makefile | 8 ++++----
>>   1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/www/manager6/Makefile b/www/manager6/Makefile
>> index 4288acdd..bccd8c32 100644
>> --- a/www/manager6/Makefile
>> +++ b/www/manager6/Makefile
>> @@ -1,6 +1,9 @@
>>   include ../../defines.mk
>>   
>>   JSSRC= 							\
>> +	panel/ConfigPanel.js				\
>> +	panel/StatusView.js				\
>> +	window/Wizard.js				\
>>   	Parser.js					\
>>   	StateProvider.js				\
>>   	Toolkit.js					\
>> @@ -29,8 +32,8 @@ JSSRC= 							\
>>   	dc/ACLView.js					\
>>   	dc/ACMEClusterView.js				\
>>   	dc/ACMEPluginEdit.js				\
>> -	dc/AuthEditAD.js				\
>>   	dc/AuthEditBase.js				\
>> +	dc/AuthEditAD.js				\
>>   	dc/AuthEditLDAP.js				\
>>   	dc/AuthView.js					\
>>   	dc/Backup.js					\
>> @@ -154,7 +157,6 @@ JSSRC= 							\
>>   	node/Subscription.js				\
>>   	node/Summary.js					\
>>   	node/ZFS.js					\
>> -	panel/ConfigPanel.js				\
>>   	panel/GuestStatusView.js			\
>>   	panel/GuestSummary.js				\
>>   	panel/HealthWidget.js				\
>> @@ -163,7 +165,6 @@ JSSRC= 							\
>>   	panel/NotesView.js				\
>>   	panel/RunningChart.js				\
>>   	panel/StatusPanel.js				\
>> -	panel/StatusView.js				\
>>   	panel/TemplateStatusView.js			\
>>   	pool/Config.js					\
>>   	pool/StatusView.js				\
>> @@ -251,7 +252,6 @@ JSSRC= 							\
>>   	window/Settings.js				\
>>   	window/Snapshot.js				\
>>   	window/StartupEdit.js				\
>> -	window/Wizard.js				\
>>   # end of JSSRC list
>>   
>>   all: pvemanagerlib.js
>> -- 
>> 2.20.1
>>
>>
>>
>> _______________________________________________
>> pve-devel mailing list
>> pve-devel@lists.proxmox.com
>> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>>
>>
>>
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 
> 





^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [pve-devel] [PATCH manager] ui: reorder Makefile entries
  2020-07-29 11:37   ` Dominik Csapak
@ 2020-07-29 12:04     ` Fabian Grünbichler
  0 siblings, 0 replies; 4+ messages in thread
From: Fabian Grünbichler @ 2020-07-29 12:04 UTC (permalink / raw)
  To: Proxmox VE development discussion

On July 29, 2020 1:37 pm, Dominik Csapak wrote:
> On 7/29/20 12:14 PM, Fabian Grünbichler wrote:
>> On July 29, 2020 8:51 am, Dominik Csapak wrote:
>>> most of the time alphabetically is ok, but some classes have to defined
>>> earlier, else extjs does not find the class and tries to dynamically
>>> load it via a http request. that fails, and in the end it still
>>> finds the right classes (after loading the complete js file) but
>>> we still get ugly error messages and http requests that are not necessary
>>>
>>> so we move some essential classes to the top
>>>
>>> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
>>> ---
>>> has someone a better suggestion except manually managing the order?
>> 
>> split the list into two variables? one for the essential stuff with a
>> comment, one for the sorted everything else..
> 
> well they all depend on each other, the rest just works
> by accident, so adding a new one could mean we have to
> move a bunch to the other variable...

write a script that concats them in the right order, keep the list 
sorted in Makefile? ;)

> 
>> 
>>>   www/manager6/Makefile | 8 ++++----
>>>   1 file changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/www/manager6/Makefile b/www/manager6/Makefile
>>> index 4288acdd..bccd8c32 100644
>>> --- a/www/manager6/Makefile
>>> +++ b/www/manager6/Makefile
>>> @@ -1,6 +1,9 @@
>>>   include ../../defines.mk
>>>   
>>>   JSSRC= 							\
>>> +	panel/ConfigPanel.js				\
>>> +	panel/StatusView.js				\
>>> +	window/Wizard.js				\
>>>   	Parser.js					\
>>>   	StateProvider.js				\
>>>   	Toolkit.js					\
>>> @@ -29,8 +32,8 @@ JSSRC= 							\
>>>   	dc/ACLView.js					\
>>>   	dc/ACMEClusterView.js				\
>>>   	dc/ACMEPluginEdit.js				\
>>> -	dc/AuthEditAD.js				\
>>>   	dc/AuthEditBase.js				\
>>> +	dc/AuthEditAD.js				\
>>>   	dc/AuthEditLDAP.js				\
>>>   	dc/AuthView.js					\
>>>   	dc/Backup.js					\
>>> @@ -154,7 +157,6 @@ JSSRC= 							\
>>>   	node/Subscription.js				\
>>>   	node/Summary.js					\
>>>   	node/ZFS.js					\
>>> -	panel/ConfigPanel.js				\
>>>   	panel/GuestStatusView.js			\
>>>   	panel/GuestSummary.js				\
>>>   	panel/HealthWidget.js				\
>>> @@ -163,7 +165,6 @@ JSSRC= 							\
>>>   	panel/NotesView.js				\
>>>   	panel/RunningChart.js				\
>>>   	panel/StatusPanel.js				\
>>> -	panel/StatusView.js				\
>>>   	panel/TemplateStatusView.js			\
>>>   	pool/Config.js					\
>>>   	pool/StatusView.js				\
>>> @@ -251,7 +252,6 @@ JSSRC= 							\
>>>   	window/Settings.js				\
>>>   	window/Snapshot.js				\
>>>   	window/StartupEdit.js				\
>>> -	window/Wizard.js				\
>>>   # end of JSSRC list
>>>   
>>>   all: pvemanagerlib.js
>>> -- 
>>> 2.20.1
>>>
>>>
>>>
>>> _______________________________________________
>>> pve-devel mailing list
>>> pve-devel@lists.proxmox.com
>>> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>>>
>>>
>>>
>> 
>> 
>> _______________________________________________
>> pve-devel mailing list
>> pve-devel@lists.proxmox.com
>> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>> 
>> 
> 
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
> 




^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-07-29 12:04 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-29  6:51 [pve-devel] [PATCH manager] ui: reorder Makefile entries Dominik Csapak
2020-07-29 10:14 ` Fabian Grünbichler
2020-07-29 11:37   ` Dominik Csapak
2020-07-29 12:04     ` Fabian Grünbichler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal