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.

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

Closes #818 and #819 - Branches of which a Mapping originated now displayed in UI. #869

Merged

Conversation

MariusBrill
Copy link
Member

@MariusBrill MariusBrill commented Jul 28, 2020

This change is Reviewable

Copy link
Member

@JonasKunz JonasKunz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 4 of 4 files at r1.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @mbrill-nt)


components/inspectit-ocelot-configurationserver-ui/src/components/views/status/StatusTable.js, line 207 at r1 (raw file):

  branchUsedTemplate = (rowData) => {
    if (rowData.branchUsed) {
      return rowData.branchUsed;

Have a look at the "Mappings" view. There the table also shows an icon for the branch, can you do the same here?


components/inspectit-ocelot-configurationserver-ui/src/components/views/status/StatusTable.js, line 281 at r1 (raw file):

          />
          <Column header="Agent Mapping" field="mappingFilter" body={this.agentMappingTemplate} sortable />
          <Column header="Branch Used" field="branchUsed" body={this.branchUsedTemplate} style={{ width: '150px' }} sortable />

Name this "Source Branch"

Copy link
Member

@JonasKunz JonasKunz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 4 of 4 files at r2.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @mbrill-nt)


components/inspectit-ocelot-configurationserver-ui/src/components/views/status/StatusTable.js, line 211 at r2 (raw file):

      branch = rowData.sourceBranch;
    }
    const isLiveBranch = branch === 'LIVE';

This does not work. In you view, the branch is named live, therefore the icon never changes.


components/inspectit-ocelot-configurationserver-ui/src/components/views/status/StatusTable.js, line 271 at r2 (raw file):

        <style jsx>{`
          .this :global(.p-datatable) {
            min-width: 1280px;

You need to add the width of your column to this value.

Try reducing the size of the window with the ui: The columns start overflowing into each other.

Copy link
Member

@JonasKunz JonasKunz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r3.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

Copy link
Member

@JonasKunz JonasKunz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@JonasKunz JonasKunz merged commit a1f9961 into inspectIT:master Aug 3, 2020
@MariusBrill MariusBrill deleted the Extend_agent_status_by_branch_used branch May 25, 2021 10:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants