Skip to content

Commit

Permalink
UI Fixes (#1247)
Browse files Browse the repository at this point in the history
* fix: change retry copy on event logs

* fix: add notification for copying org id

* fix: fix number input form

* fix: fix copy issue

* fix: show correct time values
  • Loading branch information
Oluwadaminiola authored Dec 23, 2022
1 parent 41ea7b4 commit d44f86b
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ <h3 class="mt-24px mb-16px font-semibold">Disable Failing Endpoints</h3>
<convoy-radio formControlName="disable_endpoint" description="Endpoints are not automatically disabled when they are failing." label="False" _name="disable_endpoint" [value]="false" _id="false"></convoy-radio>
</div>

<h3 class="mt-48px mb-16px font-semibold">Data Rentention</h3>
<h3 class="mt-48px mb-16px font-semibold">Data Retention</h3>
<div formGroupName="retention_policy">
<convoy-input-field>
<label for="policy" convoy-label tooltip="This is the interval at which events would be reviewed and retained for this project.">Retention Period</label>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,6 @@ export class CreateProjectComponent implements OnInit {
this.projectForm.get('config.strategy')?.patchValue(response.data.config.strategy);
this.projectForm.get('config.signature')?.patchValue(response.data.config.signature);
this.projectForm.get('config.ratelimit')?.patchValue(response.data.config.ratelimit);
this.projectForm.get('config.ratelimit.duration')?.patchValue(this.getTimeString(response.data.config.ratelimit.duration));
this.projectForm.get('config.strategy.duration')?.patchValue(this.getTimeString(response.data.config.strategy.duration));

const versions = response.data.config.signature.versions;
if (!versions?.length) return;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div convoy-modal position="center" (closeModal)="closeModal.emit()">
<div convoy-modal position="center">
<div class="flex flex-col items-center justify-center py-60px px-30px" modalBody>
<img src="/assets/img/success.gif" class="h-150px w-150px" alt="success" />
<h2 class="font-semibold mt-16px">{{ title }}</h2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
<td convoy-table-cell>
<button convoy-button size="xs" texture="light" (click)="retryEvent({ e: $event, index: this.index, eventId: event.uid })">
<img src="assets/img/refresh-icon-primary.svg" alt="refresh icon" class="mr-10px" />
Force Retry
Retry
</button>
</td>
<td convoy-table-cell>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h3 class="font-semibold">Organisation Info</h3>
<label convoy-label>Organisation Id</label>
<div class="flex items-center justify-between w-full h-50px bg-[#F7F9FC] border border-grey-10 rounded-[6px] px-16px">
<span class="text-16 text-grey-60 font-normal whitespace-nowrap w-250px overflow-hidden text-ellipsis">{{ organisationId }}</span>
<convoy-copy-button [text]="organisationId"></convoy-copy-button>
<convoy-copy-button [text]="organisationId" notificationText="Organisation ID has been copied to your clipboard"></convoy-copy-button>
</div>
</form>
<hr class="border-t border-t-grey-10 mt-32px mb-20px" />
Expand Down
8 changes: 8 additions & 0 deletions web/ui/dashboard/src/scss/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,11 @@ textarea.ng-invalid.ng-touched {
@apply font-semibold text-primary-100 transition-all duration-300;
}
}
input::-webkit-outer-spin-button,
input::-webkit-inner-spin-button {
-webkit-appearance: none;
}

input[type=number] {
-moz-appearance: textfield;
}

0 comments on commit d44f86b

Please sign in to comment.