Fields for Provision Watcher Tab don't match the Provision Watcher DTO

[lenny-goodell]

🐞 Bug Report

Affected Services [REQUIRED]

The issue is located in: UI Provision Watcher Tab

Is this a regression?

No, this is new capability

Description and Minimal Reproduction [REQUIRED]

Fields for the provision watcher tab should match those in the DTO here:

type ProvisionWatcher struct {
	DBTimestamp         `json:",inline"`
	Id                  string              `json:"id,omitempty" yaml:"id,omitempty" validate:"omitempty,uuid"`
	Name                string              `json:"name" yaml:"name" validate:"required,edgex-dto-none-empty-string"`
	ServiceName         string              `json:"serviceName" yaml:"serviceName" validate:"required,edgex-dto-none-empty-string"`
	Labels              []string            `json:"labels,omitempty" yaml:"labels,omitempty"`
	Identifiers         map[string]string   `json:"identifiers" yaml:"identifiers" validate:"gt=0,dive,keys,required,endkeys,required"`
	BlockingIdentifiers map[string][]string `json:"blockingIdentifiers,omitempty" yaml:"blockingIdentifiers,omitempty"`
	AdminState          string              `json:"adminState" yaml:"adminState" validate:"oneof='LOCKED' 'UNLOCKED'"`
	DiscoveredDevice    DiscoveredDevice    `json:"discoveredDevice" yaml:"discoveredDevice"`
}

What we see are

Also, Blocking Identifiers is not getting populated when set in the DTO.

from compose builder run make run no-secty ds-onvif-camera ds-llrp and verify the Provision Watchers in the UI match the Provision Watchers here:

• https://github.com/edgexfoundry/device-onvif-camera/tree/main/cmd/res/provisionwatchers
• https://github.com/edgexfoundry/device-rfid-llrp-go/tree/main/cmd/res/provision_watchers

🌍 Your Environment

Deployment Environment:

EdgeX Version [REQUIRED]:

Anything else relevant?

[jumpingliu]

assign this issue to @jiekechoo

[jiekechoo]

I have fixed this issue yiqisoft/edgex-ui-go/ , but I can't submit a new pr. Anyone can help me?

[cloudxxx8]

@jiekechoo you should create a new branch called issue-642 to fix this issue, and open a PR against it.
https://wiki.edgexfoundry.org/display/FA/Committing+Code+Guidelines#CommittingCodeGuidelines-BranchingConventions
you can't create a new PR because there is an existing PR against your main branch #654

[lenny-goodell]

@jiekechoo , I have merged you PRs for the Provision Watcher fix for this issue, but not seeing what is expect from the latest built image.

Here is how I tested:

From compose builder

• make pull (to make sure all the images I have are the latest
• make run ds-onvif-camera ds-usb-camera ds-llrp ui-dev
• make get-token

From UI

• Enter token when prompted
• Navigate to Provision Watcher tab (this is what I see)
  
• Edit the first one and this is what I see:
  

Here is the Provision Watcher that should be displayed.
https://github.com/edgexfoundry/device-usb-camera/blob/main/cmd/res/provisionwatchers/generic.provision.watcher.yaml

I feel like you changes are not being reflected in the latest build, but even in the images on your PR #657, the field names are incorrect.

IdenifiersAddress => Identifiers
IdentifiersPort should be removed.

Note that:

• Identifiers is a collection of key/value pairs (ie. map[string]string)
• BlockingIdentifiers is a collection of key/value pairs where the values are a list of strings (i.e. map[string][]string)

Also not that if I select the 2nd empty item in the initial list I get this which has the Device Service and Device profiles properly listed and selected.