mirror of
https://github.com/foss42/apidash.git
synced 2025-05-22 00:36:43 +08:00
Resolves #2 Double click to rename requests
This commit is contained in:
@ -10,6 +10,8 @@ class RequestModel {
|
||||
required this.id,
|
||||
this.method = kDefaultHttpMethod,
|
||||
this.url = "",
|
||||
this.name = "",
|
||||
this.description = "",
|
||||
this.requestTabIndex = 0,
|
||||
this.requestHeaders,
|
||||
this.requestParams,
|
||||
@ -23,6 +25,8 @@ class RequestModel {
|
||||
final String id;
|
||||
final HTTPVerb method;
|
||||
final String url;
|
||||
final String name;
|
||||
final String description;
|
||||
final int requestTabIndex;
|
||||
final List<KVRow>? requestHeaders;
|
||||
final List<KVRow>? requestParams;
|
||||
@ -39,6 +43,8 @@ class RequestModel {
|
||||
id: id,
|
||||
method: method,
|
||||
url: url,
|
||||
name: name,
|
||||
description: description,
|
||||
requestHeaders: requestHeaders,
|
||||
requestParams: requestParams,
|
||||
requestBodyContentType: requestBodyContentType,
|
||||
@ -50,6 +56,8 @@ class RequestModel {
|
||||
String? id,
|
||||
HTTPVerb? method,
|
||||
String? url,
|
||||
String? name,
|
||||
String? description,
|
||||
int? requestTabIndex,
|
||||
List<KVRow>? requestHeaders,
|
||||
List<KVRow>? requestParams,
|
||||
@ -63,6 +71,8 @@ class RequestModel {
|
||||
id: id ?? this.id,
|
||||
method: method ?? this.method,
|
||||
url: url ?? this.url,
|
||||
name: name ?? this.name,
|
||||
description: description ?? this.description,
|
||||
requestTabIndex: requestTabIndex ?? this.requestTabIndex,
|
||||
requestHeaders: requestHeaders ?? this.requestHeaders,
|
||||
requestParams: requestParams ?? this.requestParams,
|
||||
@ -87,6 +97,8 @@ class RequestModel {
|
||||
method = kDefaultHttpMethod;
|
||||
}
|
||||
final url = data["url"] as String;
|
||||
final name = data["name"] as String?;
|
||||
final description = data["description"] as String?;
|
||||
final requestHeaders = data["requestHeaders"];
|
||||
final requestParams = data["requestParams"];
|
||||
try {
|
||||
@ -110,6 +122,8 @@ class RequestModel {
|
||||
id: id,
|
||||
method: method,
|
||||
url: url,
|
||||
name: name ?? "",
|
||||
description: description ?? "",
|
||||
requestTabIndex: 0,
|
||||
requestHeaders: requestHeaders != null
|
||||
? mapToRows(Map<String, String>.from(requestHeaders))
|
||||
@ -130,6 +144,8 @@ class RequestModel {
|
||||
"id": id,
|
||||
"method": method.name,
|
||||
"url": url,
|
||||
"name": name,
|
||||
"description": description,
|
||||
"requestHeaders": rowsToMap(requestHeaders),
|
||||
"requestParams": rowsToMap(requestParams),
|
||||
"requestBodyContentType": requestBodyContentType.name,
|
||||
@ -146,6 +162,8 @@ class RequestModel {
|
||||
"Request Id: $id",
|
||||
"Request Method: ${method.name}",
|
||||
"Request URL: $url",
|
||||
"Request Name: $name",
|
||||
"Request Description: $description",
|
||||
"Request Tab Index: ${requestTabIndex.toString()}",
|
||||
"Request Headers: ${requestHeaders.toString()}",
|
||||
"Request Params: ${requestParams.toString()}",
|
||||
|
@ -24,6 +24,7 @@ class ThemeStateNotifier extends StateNotifier<bool> {
|
||||
}
|
||||
|
||||
final activeIdStateProvider = StateProvider<String?>((ref) => null);
|
||||
final activeIdEditStateProvider = StateProvider<String?>((ref) => null);
|
||||
final sentRequestIdStateProvider = StateProvider<String?>((ref) => null);
|
||||
final codePaneVisibleStateProvider = StateProvider<bool>((ref) => false);
|
||||
final saveDataStateProvider = StateProvider<bool>((ref) => false);
|
||||
@ -102,6 +103,8 @@ class CollectionStateNotifier extends StateNotifier<List<RequestModel>?> {
|
||||
String id, {
|
||||
HTTPVerb? method,
|
||||
String? url,
|
||||
String? name,
|
||||
String? description,
|
||||
int? requestTabIndex,
|
||||
List<KVRow>? requestHeaders,
|
||||
List<KVRow>? requestParams,
|
||||
@ -115,6 +118,8 @@ class CollectionStateNotifier extends StateNotifier<List<RequestModel>?> {
|
||||
final newModel = state![idx].copyWith(
|
||||
method: method,
|
||||
url: url,
|
||||
name: name,
|
||||
description: description,
|
||||
requestTabIndex: requestTabIndex,
|
||||
requestHeaders: requestHeaders,
|
||||
requestParams: requestParams,
|
||||
|
@ -175,15 +175,33 @@ class _RequestItemState extends ConsumerState<RequestItem> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final activeRequestId = ref.watch(activeIdStateProvider);
|
||||
final editRequestId = ref.watch(activeIdEditStateProvider);
|
||||
|
||||
return SidebarRequestCard(
|
||||
id: widget.id,
|
||||
activeRequestId: activeRequestId,
|
||||
url: widget.requestModel.url,
|
||||
method: widget.requestModel.method,
|
||||
name: widget.requestModel.name,
|
||||
url: widget.requestModel.url,
|
||||
activeRequestId: activeRequestId,
|
||||
editRequestId: editRequestId,
|
||||
onTap: () {
|
||||
ref.read(activeIdStateProvider.notifier).update((state) => widget.id);
|
||||
},
|
||||
onDoubleTap: () {
|
||||
ref.read(activeIdStateProvider.notifier).update((state) => widget.id);
|
||||
ref
|
||||
.read(activeIdEditStateProvider.notifier)
|
||||
.update((state) => widget.id);
|
||||
},
|
||||
onChangedNameEditor: (value) {
|
||||
value = value.trim();
|
||||
ref
|
||||
.read(collectionStateNotifierProvider.notifier)
|
||||
.update(editRequestId!, name: value);
|
||||
},
|
||||
onTapOutsideNameEditor: () {
|
||||
ref.read(activeIdEditStateProvider.notifier).update((state) => null);
|
||||
},
|
||||
onMenuSelected: (RequestItemMenuOption item) {
|
||||
if (item == RequestItemMenuOption.delete) {
|
||||
ref.read(activeIdStateProvider.notifier).update((state) => null);
|
||||
|
@ -8,18 +8,28 @@ class SidebarRequestCard extends StatefulWidget {
|
||||
const SidebarRequestCard({
|
||||
super.key,
|
||||
required this.id,
|
||||
required this.activeRequestId,
|
||||
required this.url,
|
||||
required this.method,
|
||||
this.name,
|
||||
this.url,
|
||||
this.activeRequestId,
|
||||
this.editRequestId,
|
||||
this.onTap,
|
||||
this.onDoubleTap,
|
||||
this.onChangedNameEditor,
|
||||
this.onTapOutsideNameEditor,
|
||||
this.onMenuSelected,
|
||||
});
|
||||
|
||||
final String id;
|
||||
final String? activeRequestId;
|
||||
final String url;
|
||||
final String? name;
|
||||
final String? url;
|
||||
final HTTPVerb method;
|
||||
final String? activeRequestId;
|
||||
final String? editRequestId;
|
||||
final void Function()? onTap;
|
||||
final void Function()? onDoubleTap;
|
||||
final Function(String)? onChangedNameEditor;
|
||||
final Function()? onTapOutsideNameEditor;
|
||||
final Function(RequestItemMenuOption)? onMenuSelected;
|
||||
|
||||
@override
|
||||
@ -30,17 +40,29 @@ class _SidebarRequestCardState extends State<SidebarRequestCard> {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final Color color = Theme.of(context).colorScheme.surface;
|
||||
final Color colorVariant =
|
||||
Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.5);
|
||||
final Color surfaceTint = Theme.of(context).colorScheme.primary;
|
||||
bool isActiveId = widget.activeRequestId == widget.id;
|
||||
return Material(
|
||||
borderRadius: kBorderRadius12,
|
||||
bool inEditMode = widget.editRequestId == widget.id;
|
||||
return Card(
|
||||
shape: const RoundedRectangleBorder(
|
||||
borderRadius: kBorderRadius12,
|
||||
),
|
||||
elevation: isActiveId ? 1 : 0,
|
||||
surfaceTintColor: isActiveId ? surfaceTint : null,
|
||||
color: color,
|
||||
type: MaterialType.card,
|
||||
color: isActiveId
|
||||
? Theme.of(context).colorScheme.brightness == Brightness.dark
|
||||
? colorVariant
|
||||
: color
|
||||
: color,
|
||||
margin: EdgeInsets.zero,
|
||||
child: InkWell(
|
||||
borderRadius: kBorderRadius12,
|
||||
onTap: widget.onTap,
|
||||
hoverColor: colorVariant,
|
||||
focusColor: colorVariant.withOpacity(0.5),
|
||||
onTap: inEditMode ? null : widget.onTap,
|
||||
onDoubleTap: inEditMode ? null : widget.onDoubleTap,
|
||||
child: Padding(
|
||||
padding: EdgeInsets.only(
|
||||
left: 10,
|
||||
@ -55,14 +77,33 @@ class _SidebarRequestCardState extends State<SidebarRequestCard> {
|
||||
MethodBox(method: widget.method),
|
||||
kHSpacer5,
|
||||
Expanded(
|
||||
child: Text(
|
||||
getRequestTitleFromUrl(widget.url),
|
||||
softWrap: false,
|
||||
overflow: TextOverflow.fade,
|
||||
),
|
||||
child: inEditMode
|
||||
? TextFormField(
|
||||
initialValue: widget.name,
|
||||
autofocus: true,
|
||||
style: Theme.of(context).textTheme.bodyMedium,
|
||||
onTapOutside: (_) {
|
||||
widget.onTapOutsideNameEditor?.call();
|
||||
FocusScope.of(context).unfocus();
|
||||
},
|
||||
onChanged: widget.onChangedNameEditor,
|
||||
decoration: const InputDecoration(
|
||||
isCollapsed: true,
|
||||
contentPadding: EdgeInsets.zero,
|
||||
border: InputBorder.none,
|
||||
),
|
||||
)
|
||||
: Text(
|
||||
(widget.name != null &&
|
||||
widget.name!.trim().isNotEmpty)
|
||||
? widget.name!
|
||||
: getRequestTitleFromUrl(widget.url),
|
||||
softWrap: false,
|
||||
overflow: TextOverflow.fade,
|
||||
),
|
||||
),
|
||||
Visibility(
|
||||
visible: isActiveId,
|
||||
visible: isActiveId && !inEditMode,
|
||||
child: RequestCardMenu(
|
||||
onSelected: widget.onMenuSelected,
|
||||
),
|
||||
|
Reference in New Issue
Block a user